From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 1 Apr 2007 16:35:27 +0000 (+0000)
Subject: removing obsolete contribs (partly moved to wxCode)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/969e35994d86c8a90914e3a3d2a403b4c6723ad3

removing obsolete contribs (partly moved to wxCode)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
deleted file mode 100644
index 625f75b77a..0000000000
--- a/contrib/build/deprecated/deprecated.bkl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="DEPRECATED_SRC" hints="files">
-        prop.cpp
-        propform.cpp
-        proplist.cpp
-        resource.cpp
-        tbarsmpl.cpp
-        treelay.cpp        
-        wxexpr.cpp
-        
-        <!--
-        these should be generated from lexer.l and parser.y, but
-        since this is deprecated anyway, why bother?
-        -->
-        dosyacc.c
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/deprecated/expr.h
-            wx/deprecated/prop.h
-            wx/deprecated/propform.h
-            wx/deprecated/proplist.h
-            wx/deprecated/resource.h
-            wx/deprecated/setup.h
-            wx/deprecated/tbarsmpl.h
-            wx/deprecated/treelay.h
-            wx/deprecated/wxexpr.h
-        </files>
-    </headers>
-
-    <dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_DEPRECATED</define>
-        <include>$(SRCDIR)</include>
-        <sources>$(DEPRECATED_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <precomp-headers-exclude>dosyacc.c</precomp-headers-exclude>
-    </dll>
-    
-    <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <include>$(SRCDIR)</include>
-        <sources>$(DEPRECATED_SRC)</sources>
-        <precomp-headers-exclude>dosyacc.c</precomp-headers-exclude>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecatedlib+deprecateddll</set>
-
-</makefile>
-
diff --git a/contrib/build/deprecated/deprecated.dsp b/contrib/build/deprecated/deprecated.dsp
deleted file mode 100644
index 36cd6beaa3..0000000000
--- a/contrib/build/deprecated/deprecated.dsp
+++ /dev/null
@@ -1,558 +0,0 @@
-# Microsoft Developer Studio Project File - Name="deprecated" - 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=deprecated - 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 "deprecated.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 "deprecated.mak" CFG="deprecated - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "deprecated - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "deprecated - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "deprecated - Win32 Debug" (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)" == "deprecated - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29u_deprecated.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29u_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /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_DEPRECATED" /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_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29ud_deprecated.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29ud_deprecated.lib" /debug
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29_deprecated.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29d_deprecated.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv290d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv29d_deprecated.lib" /debug
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290u_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290u_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29u_deprecated.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29u_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290ud_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290ud_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29ud_deprecated.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29ud_deprecated.lib" /debug
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29_deprecated.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290d_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\..\include" /d WXDLLNAME=wxmsw290d_deprecated_vc_custom /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29d_deprecated.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw290d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_dll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw29d_deprecated.lib" /debug
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29u_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29u_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29ud_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29ud_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29d_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv29d_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29u_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29u_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29ud_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29ud_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /I "..\..\src\deprecated\..\..\..\include" /W4 /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29_deprecated.lib"
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\deprecated"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\deprecated"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /I "..\..\src\deprecated\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29d_deprecated.lib"
-# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw29d_deprecated.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "deprecated - Win32 DLL Universal Unicode Release"
-# Name "deprecated - Win32 DLL Universal Unicode Debug"
-# Name "deprecated - Win32 DLL Universal Release"
-# Name "deprecated - Win32 DLL Universal Debug"
-# Name "deprecated - Win32 DLL Unicode Release"
-# Name "deprecated - Win32 DLL Unicode Debug"
-# Name "deprecated - Win32 DLL Release"
-# Name "deprecated - Win32 DLL Debug"
-# Name "deprecated - Win32 Universal Unicode Release"
-# Name "deprecated - Win32 Universal Unicode Debug"
-# Name "deprecated - Win32 Universal Release"
-# Name "deprecated - Win32 Universal Debug"
-# Name "deprecated - Win32 Unicode Release"
-# Name "deprecated - Win32 Unicode Debug"
-# Name "deprecated - Win32 Release"
-# Name "deprecated - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/deprecated\dosyacc.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\prop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\propform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\proplist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\resource.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\treelay.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "deprecated - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/deprecated\wxexpr.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/deprecated/deprecated.dsw b/contrib/build/deprecated/deprecated.dsw
deleted file mode 100644
index 69b4fe9eb1..0000000000
--- a/contrib/build/deprecated/deprecated.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "deprecated"=deprecated.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc
deleted file mode 100644
index c168fc30d2..0000000000
--- a/contrib/build/deprecated/makefile.bcc
+++ /dev/null
@@ -1,352 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DEPRECATEDDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\deprecated\..\..\..\include \
-	-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-	-I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\deprecated\..\..\..\include \
-	-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-	-I..\..\src\deprecated -Hu -H=$(OBJS)\wxprec_deprecateddll.csm $(CPPFLAGS) \
-	$(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS =  \
-	$(OBJS)\deprecateddll_dummy.obj \
-	$(OBJS)\deprecateddll_prop.obj \
-	$(OBJS)\deprecateddll_propform.obj \
-	$(OBJS)\deprecateddll_proplist.obj \
-	$(OBJS)\deprecateddll_resource.obj \
-	$(OBJS)\deprecateddll_tbarsmpl.obj \
-	$(OBJS)\deprecateddll_treelay.obj \
-	$(OBJS)\deprecateddll_wxexpr.obj \
-	$(OBJS)\deprecateddll_dosyacc.obj
-DEPRECATEDLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\deprecated\..\..\..\include \
-	-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CPPFLAGS) \
-	$(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\deprecated\..\..\..\include \
-	-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated -Hu \
-	-H=$(OBJS)\wxprec_deprecatedlib.csm $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS =  \
-	$(OBJS)\deprecatedlib_dummy.obj \
-	$(OBJS)\deprecatedlib_prop.obj \
-	$(OBJS)\deprecatedlib_propform.obj \
-	$(OBJS)\deprecatedlib_proplist.obj \
-	$(OBJS)\deprecatedlib_resource.obj \
-	$(OBJS)\deprecatedlib_tbarsmpl.obj \
-	$(OBJS)\deprecatedlib_treelay.obj \
-	$(OBJS)\deprecatedlib_wxexpr.obj \
-	$(OBJS)\deprecatedlib_dosyacc.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__deprecateddll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__deprecatedlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj  $(DEPRECATEDDLL_OBJECTS)  $(OBJS)\deprecateddll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\deprecateddll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj  $(DEPRECATEDLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(DEPRECATEDLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
-
-$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.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..\..\src\deprecated\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG) $**
-
-$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
-	$(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_CFLAGS) $**
-
-$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) -H $**
-
-$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
-	$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
-	$(CC) -q -c -P- -o$@ $(DEPRECATEDLIB_CFLAGS) $**
-
diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
deleted file mode 100644
index ffa834da9e..0000000000
--- a/contrib/build/deprecated/makefile.gcc
+++ /dev/null
@@ -1,347 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DEPRECATEDDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include -W -Wall \
-	-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-	-I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include -W -Wall \
-	-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-	-I..\..\src\deprecated $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS =  \
-	$(OBJS)\deprecateddll_dummy.o \
-	$(OBJS)\deprecateddll_version_rc.o \
-	$(OBJS)\deprecateddll_prop.o \
-	$(OBJS)\deprecateddll_propform.o \
-	$(OBJS)\deprecateddll_proplist.o \
-	$(OBJS)\deprecateddll_resource.o \
-	$(OBJS)\deprecateddll_tbarsmpl.o \
-	$(OBJS)\deprecateddll_treelay.o \
-	$(OBJS)\deprecateddll_wxexpr.o \
-	$(OBJS)\deprecateddll_dosyacc.o
-DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include -W -Wall \
-	-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CPPFLAGS) \
-	$(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include -W -Wall \
-	-I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(__RTTIFLAG) \
-	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS =  \
-	$(OBJS)\deprecatedlib_dummy.o \
-	$(OBJS)\deprecatedlib_prop.o \
-	$(OBJS)\deprecatedlib_propform.o \
-	$(OBJS)\deprecatedlib_proplist.o \
-	$(OBJS)\deprecatedlib_resource.o \
-	$(OBJS)\deprecatedlib_tbarsmpl.o \
-	$(OBJS)\deprecatedlib_treelay.o \
-	$(OBJS)\deprecatedlib_wxexpr.o \
-	$(OBJS)\deprecatedlib_dosyacc.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__deprecateddll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__deprecatedlib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a: $(DEPRECATEDLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(DEPRECATEDLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_version_rc.o: ../../src/deprecated/../../../src/msw/version.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 ../../src/deprecated/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG)
-
-$(OBJS)\deprecateddll_prop.o: ../../src/deprecated/prop.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_propform.o: ../../src/deprecated/propform.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated/proplist.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_resource.o: ../../src/deprecated/resource.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated/treelay.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
-	$(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated/propform.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated/proplist.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated/resource.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated/treelay.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated/wxexpr.cpp
-	$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated/dosyacc.c
-	$(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc
deleted file mode 100644
index 32bdae18ce..0000000000
--- a/contrib/build/deprecated/makefile.vc
+++ /dev/null
@@ -1,440 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\deprecated\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DEPRECATEDDLL_CFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include /W4 \
-	/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
-	/I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include /W4 \
-	/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
-	/I..\..\src\deprecated $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_deprecateddll.pch" $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS =  \
-	$(OBJS)\deprecateddll_dummy.obj \
-	$(OBJS)\deprecateddll_version.res \
-	$(OBJS)\deprecateddll_prop.obj \
-	$(OBJS)\deprecateddll_propform.obj \
-	$(OBJS)\deprecateddll_proplist.obj \
-	$(OBJS)\deprecateddll_resource.obj \
-	$(OBJS)\deprecateddll_tbarsmpl.obj \
-	$(OBJS)\deprecateddll_treelay.obj \
-	$(OBJS)\deprecateddll_wxexpr.obj \
-	$(OBJS)\deprecateddll_dosyacc.obj
-DEPRECATEDLIB_CFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include /W4 \
-	/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CPPFLAGS) \
-	$(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\deprecated\..\..\..\include /W4 \
-	/I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(__RTTIFLAG) \
-	$(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecatedlib.pch" \
-	$(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS =  \
-	$(OBJS)\deprecatedlib_dummy.obj \
-	$(OBJS)\deprecatedlib_prop.obj \
-	$(OBJS)\deprecatedlib_propform.obj \
-	$(OBJS)\deprecatedlib_proplist.obj \
-	$(OBJS)\deprecatedlib_resource.obj \
-	$(OBJS)\deprecatedlib_tbarsmpl.obj \
-	$(OBJS)\deprecatedlib_treelay.obj \
-	$(OBJS)\deprecatedlib_wxexpr.obj \
-	$(OBJS)\deprecatedlib_dosyacc.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__deprecateddll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__deprecatedlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj  $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(DEPRECATEDDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj  $(DEPRECATEDLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(DEPRECATEDLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\deprecated\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG) $**
-
-$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
-
-$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
-	$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_CFLAGS) $**
-
-$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-
-$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c
-	$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDLIB_CFLAGS) $**
-
diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
deleted file mode 100644
index a246e65df1..0000000000
--- a/contrib/build/deprecated/makefile.wat
+++ /dev/null
@@ -1,381 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__deprecateddll___depname =
-!ifeq SHARED 1
-__deprecateddll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__deprecatedlib___depname =
-!ifeq SHARED 0
-__deprecatedlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\deprecated\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 &
-	-wcd=667 -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-	-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) &
-	$(__THREADSFLAG) $(__RUNTIME_LIBS) -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=..\..\src\deprecated\..\..\..\include -wx -wcd=549 &
-	-wcd=656 -wcd=657 -wcd=667 -i=..\..\src\deprecated\..\..\include &
-	-dWXUSINGDLL -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated &
-	/fh=$(OBJS)\wxprec_deprecateddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS =  &
-	$(OBJS)\deprecateddll_dummy.obj &
-	$(OBJS)\deprecateddll_prop.obj &
-	$(OBJS)\deprecateddll_propform.obj &
-	$(OBJS)\deprecateddll_proplist.obj &
-	$(OBJS)\deprecateddll_resource.obj &
-	$(OBJS)\deprecateddll_tbarsmpl.obj &
-	$(OBJS)\deprecateddll_treelay.obj &
-	$(OBJS)\deprecateddll_wxexpr.obj &
-	$(OBJS)\deprecateddll_dosyacc.obj
-DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\deprecated\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 &
-	-wcd=667 -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
-	$(CPPFLAGS) $(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\deprecated\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 &
-	-wcd=667 -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
-	/fh=$(OBJS)\wxprec_deprecatedlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS =  &
-	$(OBJS)\deprecatedlib_dummy.obj &
-	$(OBJS)\deprecatedlib_prop.obj &
-	$(OBJS)\deprecatedlib_propform.obj &
-	$(OBJS)\deprecatedlib_proplist.obj &
-	$(OBJS)\deprecatedlib_resource.obj &
-	$(OBJS)\deprecatedlib_tbarsmpl.obj &
-	$(OBJS)\deprecatedlib_treelay.obj &
-	$(OBJS)\deprecatedlib_wxexpr.obj &
-	$(OBJS)\deprecatedlib_dosyacc.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll :  $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
-	@%create $(OBJS)\deprecateddll.lbc
-	@%append $(OBJS)\deprecateddll.lbc option quiet
-	@%append $(OBJS)\deprecateddll.lbc name $^@
-	@%append $(OBJS)\deprecateddll.lbc option caseexact
-	@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
-	@%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res
-	@%append $(OBJS)\deprecateddll.lbc system nt_dll
-	wlink @$(OBJS)\deprecateddll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib :  $(DEPRECATEDLIB_OBJECTS)
-	@%create $(OBJS)\deprecatedlib.lbc
-	@for %i in ($(DEPRECATEDLIB_OBJECTS)) do @%append $(OBJS)\deprecatedlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\deprecatedlib.lbc
-!endif
-
-$(OBJS)\deprecateddll_dummy.obj :  .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_version.res :  .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\version.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=..\..\src\deprecated\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG) $<
-
-$(OBJS)\deprecateddll_prop.obj :  .AUTODEPEND ../../src/deprecated\prop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_propform.obj :  .AUTODEPEND ../../src/deprecated\propform.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_wxexpr.obj :  .AUTODEPEND ../../src/deprecated\wxexpr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
-
-$(OBJS)\deprecateddll_dosyacc.obj :  .AUTODEPEND ../../src/deprecated\dosyacc.c
-	$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
-
-$(OBJS)\deprecatedlib_dummy.obj :  .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_prop.obj :  .AUTODEPEND ../../src/deprecated\prop.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_propform.obj :  .AUTODEPEND ../../src/deprecated\propform.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_wxexpr.obj :  .AUTODEPEND ../../src/deprecated\wxexpr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
-
-$(OBJS)\deprecatedlib_dosyacc.obj :  .AUTODEPEND ../../src/deprecated\dosyacc.c
-	$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<
-
diff --git a/contrib/build/fl/fl.bkl b/contrib/build/fl/fl.bkl
deleted file mode 100644
index 9504cd959b..0000000000
--- a/contrib/build/fl/fl.bkl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="FL_SRC">
-        antiflickpl.cpp
-        bardragpl.cpp
-        barhintspl.cpp
-        cbcustom.cpp
-        controlbar.cpp
-        dyntbar.cpp
-        dyntbarhnd.cpp
-        frmview.cpp
-        garbagec.cpp
-        gcupdatesmgr.cpp
-        hintanimpl.cpp
-        newbmpbtn.cpp
-        panedrawpl.cpp
-        rowdragpl.cpp
-        rowlayoutpl.cpp
-        toolwnd.cpp
-        updatesmgr.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/fl/antiflickpl.h
-            wx/fl/bardragpl.h
-            wx/fl/barhintspl.h
-            wx/fl/cbcustom.h
-            wx/fl/controlbar.h
-            wx/fl/dynbarhnd.h
-            wx/fl/dyntbar.h
-            wx/fl/dyntbarhnd.h
-            wx/fl/fldefs.h
-            wx/fl/frmview.h
-            wx/fl/garbagec.h
-            wx/fl/gcupdatesmgr.h
-            wx/fl/hintanimpl.h
-            wx/fl/newbmpbtn.h
-            wx/fl/panedrawpl.h
-            wx/fl/rowdragpl.h
-            wx/fl/rowlayoutpl.h
-            wx/fl/toolwnd.h
-            wx/fl/updatesmgr.h
-        </files>
-    </headers>
-
-    <dll id="fldll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_FL</define>
-        <sources>$(FL_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-    
-    <lib id="fllib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(FL_SRC)</sources>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fllib+fldll</set>
-
-</makefile>
-
diff --git a/contrib/build/fl/fl.dsp b/contrib/build/fl/fl.dsp
deleted file mode 100644
index 5f8abcb151..0000000000
--- a/contrib/build/fl/fl.dsp
+++ /dev/null
@@ -1,593 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl" - 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=fl - 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 "fl.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.mak" CFG="fl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fl - Win32 Debug" (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)" == "fl - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_fl_vc_custom /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 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29u_fl.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_fl_vc_custom /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 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29ud_fl.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29ud_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290_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 /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290_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 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290_fl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290d_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 /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_fl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv290d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmswuniv29d_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290u_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290u_fl_vc_custom /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 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29u_fl.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290ud_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290ud_fl_vc_custom /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 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29ud_fl.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29ud_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290_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 /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\msw" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290_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 0x409 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\lib\vc_dll\msw" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\lib\vc_dll\msw" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290_fl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290d_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 /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /I "..\..\src\fl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290d_fl_vc_custom /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\fl\..\..\..\include" /d WXDLLNAME=wxmsw290d_fl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw290d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_dll" /implib:"..\..\src\fl\..\..\..\lib\vc_dll\wxmsw29d_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29u_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29u_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29ud_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29ud_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29ud_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29_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 /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29d_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 /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmswuniv29d_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswu" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29ud_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswud" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29ud_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29ud_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29_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 /MD /O2 /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\msw" /I "..\..\src\fl\..\..\..\include" /W4 /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\fl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\fl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29d_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 /MDd /Od /GR /EHsc /I "..\..\src\fl\..\..\..\lib\vc_lib\mswd" /I "..\..\src\fl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_lib\wxmsw29d_fl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl - Win32 DLL Universal Unicode Release"
-# Name "fl - Win32 DLL Universal Unicode Debug"
-# Name "fl - Win32 DLL Universal Release"
-# Name "fl - Win32 DLL Universal Debug"
-# Name "fl - Win32 DLL Unicode Release"
-# Name "fl - Win32 DLL Unicode Debug"
-# Name "fl - Win32 DLL Release"
-# Name "fl - Win32 DLL Debug"
-# Name "fl - Win32 Universal Unicode Release"
-# Name "fl - Win32 Universal Unicode Debug"
-# Name "fl - Win32 Universal Release"
-# Name "fl - Win32 Universal Debug"
-# Name "fl - Win32 Unicode Release"
-# Name "fl - Win32 Unicode Debug"
-# Name "fl - Win32 Release"
-# Name "fl - Win32 Debug"
-# 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\common\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
-# Begin Source File
-
-SOURCE=../../src/fl\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "fl - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "fl - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/fl/fl.dsw b/contrib/build/fl/fl.dsw
deleted file mode 100644
index 1eeadeeea1..0000000000
--- a/contrib/build/fl/fl.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "fl"=fl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc
deleted file mode 100644
index 7d5a9f636c..0000000000
--- a/contrib/build/fl/makefile.bcc
+++ /dev/null
@@ -1,405 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\fl\..\..\..\include \
-	-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL -Hu \
-	-H=$(OBJS)\wxprec_fldll.csm $(CPPFLAGS) $(CXXFLAGS)
-FLDLL_OBJECTS =  \
-	$(OBJS)\fldll_dummy.obj \
-	$(OBJS)\fldll_antiflickpl.obj \
-	$(OBJS)\fldll_bardragpl.obj \
-	$(OBJS)\fldll_barhintspl.obj \
-	$(OBJS)\fldll_cbcustom.obj \
-	$(OBJS)\fldll_controlbar.obj \
-	$(OBJS)\fldll_dyntbar.obj \
-	$(OBJS)\fldll_dyntbarhnd.obj \
-	$(OBJS)\fldll_frmview.obj \
-	$(OBJS)\fldll_garbagec.obj \
-	$(OBJS)\fldll_gcupdatesmgr.obj \
-	$(OBJS)\fldll_hintanimpl.obj \
-	$(OBJS)\fldll_newbmpbtn.obj \
-	$(OBJS)\fldll_panedrawpl.obj \
-	$(OBJS)\fldll_rowdragpl.obj \
-	$(OBJS)\fldll_rowlayoutpl.obj \
-	$(OBJS)\fldll_toolwnd.obj \
-	$(OBJS)\fldll_updatesmgr.obj
-FLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\fl\..\..\..\include \
-	-I..\..\src\fl\..\..\include -Hu -H=$(OBJS)\wxprec_fllib.csm $(CPPFLAGS) \
-	$(CXXFLAGS)
-FLLIB_OBJECTS =  \
-	$(OBJS)\fllib_dummy.obj \
-	$(OBJS)\fllib_antiflickpl.obj \
-	$(OBJS)\fllib_bardragpl.obj \
-	$(OBJS)\fllib_barhintspl.obj \
-	$(OBJS)\fllib_cbcustom.obj \
-	$(OBJS)\fllib_controlbar.obj \
-	$(OBJS)\fllib_dyntbar.obj \
-	$(OBJS)\fllib_dyntbarhnd.obj \
-	$(OBJS)\fllib_frmview.obj \
-	$(OBJS)\fllib_garbagec.obj \
-	$(OBJS)\fllib_gcupdatesmgr.obj \
-	$(OBJS)\fllib_hintanimpl.obj \
-	$(OBJS)\fllib_newbmpbtn.obj \
-	$(OBJS)\fllib_panedrawpl.obj \
-	$(OBJS)\fllib_rowdragpl.obj \
-	$(OBJS)\fllib_rowlayoutpl.obj \
-	$(OBJS)\fllib_toolwnd.obj \
-	$(OBJS)\fllib_updatesmgr.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__fldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__fllib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__fldll___depname) $(__fllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj  $(FLDLL_OBJECTS)  $(OBJS)\fldll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(FLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\fldll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib: $(OBJS)\fllib_dummy.obj  $(FLLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(FLLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
-
-$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.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..\..\src\fl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG) $**
-
-$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
-	$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
-
-$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
-	$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
deleted file mode 100644
index e136c5369b..0000000000
--- a/contrib/build/fl/makefile.gcc
+++ /dev/null
@@ -1,400 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include -W -Wall \
-	-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(__RTTIFLAG) \
-	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FLDLL_OBJECTS =  \
-	$(OBJS)\fldll_dummy.o \
-	$(OBJS)\fldll_version_rc.o \
-	$(OBJS)\fldll_antiflickpl.o \
-	$(OBJS)\fldll_bardragpl.o \
-	$(OBJS)\fldll_barhintspl.o \
-	$(OBJS)\fldll_cbcustom.o \
-	$(OBJS)\fldll_controlbar.o \
-	$(OBJS)\fldll_dyntbar.o \
-	$(OBJS)\fldll_dyntbarhnd.o \
-	$(OBJS)\fldll_frmview.o \
-	$(OBJS)\fldll_garbagec.o \
-	$(OBJS)\fldll_gcupdatesmgr.o \
-	$(OBJS)\fldll_hintanimpl.o \
-	$(OBJS)\fldll_newbmpbtn.o \
-	$(OBJS)\fldll_panedrawpl.o \
-	$(OBJS)\fldll_rowdragpl.o \
-	$(OBJS)\fldll_rowlayoutpl.o \
-	$(OBJS)\fldll_toolwnd.o \
-	$(OBJS)\fldll_updatesmgr.o
-FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include -W -Wall \
-	-I..\..\src\fl\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FLLIB_OBJECTS =  \
-	$(OBJS)\fllib_dummy.o \
-	$(OBJS)\fllib_antiflickpl.o \
-	$(OBJS)\fllib_bardragpl.o \
-	$(OBJS)\fllib_barhintspl.o \
-	$(OBJS)\fllib_cbcustom.o \
-	$(OBJS)\fllib_controlbar.o \
-	$(OBJS)\fllib_dyntbar.o \
-	$(OBJS)\fllib_dyntbarhnd.o \
-	$(OBJS)\fllib_frmview.o \
-	$(OBJS)\fllib_garbagec.o \
-	$(OBJS)\fllib_gcupdatesmgr.o \
-	$(OBJS)\fllib_hintanimpl.o \
-	$(OBJS)\fllib_newbmpbtn.o \
-	$(OBJS)\fllib_panedrawpl.o \
-	$(OBJS)\fllib_rowdragpl.o \
-	$(OBJS)\fllib_rowlayoutpl.o \
-	$(OBJS)\fllib_toolwnd.o \
-	$(OBJS)\fllib_updatesmgr.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__fldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__fllib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__fldll___depname) $(__fllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a: $(FLLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(FLLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.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 ../../src/fl/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG)
-
-$(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_bardragpl.o: ../../src/fl/bardragpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_barhintspl.o: ../../src/fl/barhintspl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_cbcustom.o: ../../src/fl/cbcustom.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_controlbar.o: ../../src/fl/controlbar.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_dyntbar.o: ../../src/fl/dyntbar.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_frmview.o: ../../src/fl/frmview.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_garbagec.o: ../../src/fl/garbagec.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_hintanimpl.o: ../../src/fl/hintanimpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_panedrawpl.o: ../../src/fl/panedrawpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_rowdragpl.o: ../../src/fl/rowdragpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_bardragpl.o: ../../src/fl/bardragpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_barhintspl.o: ../../src/fl/barhintspl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_cbcustom.o: ../../src/fl/cbcustom.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_controlbar.o: ../../src/fl/controlbar.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_dyntbar.o: ../../src/fl/dyntbar.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_frmview.o: ../../src/fl/frmview.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_garbagec.o: ../../src/fl/garbagec.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_hintanimpl.o: ../../src/fl/hintanimpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_panedrawpl.o: ../../src/fl/panedrawpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_rowdragpl.o: ../../src/fl/rowdragpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_toolwnd.o: ../../src/fl/toolwnd.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fllib_updatesmgr.o: ../../src/fl/updatesmgr.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc
deleted file mode 100644
index 186d9ad731..0000000000
--- a/contrib/build/fl/makefile.vc
+++ /dev/null
@@ -1,490 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\fl\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include /W4 /I..\..\src\fl\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_FL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fldll.pch" $(CPPFLAGS) $(CXXFLAGS)
-FLDLL_OBJECTS =  \
-	$(OBJS)\fldll_dummy.obj \
-	$(OBJS)\fldll_version.res \
-	$(OBJS)\fldll_antiflickpl.obj \
-	$(OBJS)\fldll_bardragpl.obj \
-	$(OBJS)\fldll_barhintspl.obj \
-	$(OBJS)\fldll_cbcustom.obj \
-	$(OBJS)\fldll_controlbar.obj \
-	$(OBJS)\fldll_dyntbar.obj \
-	$(OBJS)\fldll_dyntbarhnd.obj \
-	$(OBJS)\fldll_frmview.obj \
-	$(OBJS)\fldll_garbagec.obj \
-	$(OBJS)\fldll_gcupdatesmgr.obj \
-	$(OBJS)\fldll_hintanimpl.obj \
-	$(OBJS)\fldll_newbmpbtn.obj \
-	$(OBJS)\fldll_panedrawpl.obj \
-	$(OBJS)\fldll_rowdragpl.obj \
-	$(OBJS)\fldll_rowlayoutpl.obj \
-	$(OBJS)\fldll_toolwnd.obj \
-	$(OBJS)\fldll_updatesmgr.obj
-FLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\fl\..\..\..\include /W4 /I..\..\src\fl\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_fllib.pch" $(CPPFLAGS) $(CXXFLAGS)
-FLLIB_OBJECTS =  \
-	$(OBJS)\fllib_dummy.obj \
-	$(OBJS)\fllib_antiflickpl.obj \
-	$(OBJS)\fllib_bardragpl.obj \
-	$(OBJS)\fllib_barhintspl.obj \
-	$(OBJS)\fllib_cbcustom.obj \
-	$(OBJS)\fllib_controlbar.obj \
-	$(OBJS)\fllib_dyntbar.obj \
-	$(OBJS)\fllib_dyntbarhnd.obj \
-	$(OBJS)\fllib_frmview.obj \
-	$(OBJS)\fllib_garbagec.obj \
-	$(OBJS)\fllib_gcupdatesmgr.obj \
-	$(OBJS)\fllib_hintanimpl.obj \
-	$(OBJS)\fllib_newbmpbtn.obj \
-	$(OBJS)\fllib_panedrawpl.obj \
-	$(OBJS)\fllib_rowdragpl.obj \
-	$(OBJS)\fllib_rowlayoutpl.obj \
-	$(OBJS)\fllib_toolwnd.obj \
-	$(OBJS)\fllib_updatesmgr.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__fldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__fllib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__fldll___depname) $(__fllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj  $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(FLDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib: $(OBJS)\fllib_dummy.obj  $(FLLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(FLLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\fl\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG) $**
-
-$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
-
-$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
-$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat
deleted file mode 100644
index ef6dc83b4a..0000000000
--- a/contrib/build/fl/makefile.wat
+++ /dev/null
@@ -1,437 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__fldll___depname =
-!ifeq SHARED 1
-__fldll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__fllib___depname =
-!ifeq SHARED 0
-__fllib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\fl\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL &
-	/fh=$(OBJS)\wxprec_fldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FLDLL_OBJECTS =  &
-	$(OBJS)\fldll_dummy.obj &
-	$(OBJS)\fldll_antiflickpl.obj &
-	$(OBJS)\fldll_bardragpl.obj &
-	$(OBJS)\fldll_barhintspl.obj &
-	$(OBJS)\fldll_cbcustom.obj &
-	$(OBJS)\fldll_controlbar.obj &
-	$(OBJS)\fldll_dyntbar.obj &
-	$(OBJS)\fldll_dyntbarhnd.obj &
-	$(OBJS)\fldll_frmview.obj &
-	$(OBJS)\fldll_garbagec.obj &
-	$(OBJS)\fldll_gcupdatesmgr.obj &
-	$(OBJS)\fldll_hintanimpl.obj &
-	$(OBJS)\fldll_newbmpbtn.obj &
-	$(OBJS)\fldll_panedrawpl.obj &
-	$(OBJS)\fldll_rowdragpl.obj &
-	$(OBJS)\fldll_rowlayoutpl.obj &
-	$(OBJS)\fldll_toolwnd.obj &
-	$(OBJS)\fldll_updatesmgr.obj
-FLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\fl\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\fl\..\..\include /fh=$(OBJS)\wxprec_fllib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-FLLIB_OBJECTS =  &
-	$(OBJS)\fllib_dummy.obj &
-	$(OBJS)\fllib_antiflickpl.obj &
-	$(OBJS)\fllib_bardragpl.obj &
-	$(OBJS)\fllib_barhintspl.obj &
-	$(OBJS)\fllib_cbcustom.obj &
-	$(OBJS)\fllib_controlbar.obj &
-	$(OBJS)\fllib_dyntbar.obj &
-	$(OBJS)\fllib_dyntbarhnd.obj &
-	$(OBJS)\fllib_frmview.obj &
-	$(OBJS)\fllib_garbagec.obj &
-	$(OBJS)\fllib_gcupdatesmgr.obj &
-	$(OBJS)\fllib_hintanimpl.obj &
-	$(OBJS)\fllib_newbmpbtn.obj &
-	$(OBJS)\fllib_panedrawpl.obj &
-	$(OBJS)\fllib_rowdragpl.obj &
-	$(OBJS)\fllib_rowlayoutpl.obj &
-	$(OBJS)\fllib_toolwnd.obj &
-	$(OBJS)\fllib_updatesmgr.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__fldll___depname) $(__fllib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll :  $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
-	@%create $(OBJS)\fldll.lbc
-	@%append $(OBJS)\fldll.lbc option quiet
-	@%append $(OBJS)\fldll.lbc name $^@
-	@%append $(OBJS)\fldll.lbc option caseexact
-	@%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
-	@%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res
-	@%append $(OBJS)\fldll.lbc system nt_dll
-	wlink @$(OBJS)\fldll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib :  $(FLLIB_OBJECTS)
-	@%create $(OBJS)\fllib.lbc
-	@for %i in ($(FLLIB_OBJECTS)) do @%append $(OBJS)\fllib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\fllib.lbc
-!endif
-
-$(OBJS)\fldll_dummy.obj :  .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_version.res :  .AUTODEPEND ../../src/fl\..\..\..\src\msw\version.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=..\..\src\fl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) $<
-
-$(OBJS)\fldll_antiflickpl.obj :  .AUTODEPEND ../../src/fl\antiflickpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_bardragpl.obj :  .AUTODEPEND ../../src/fl\bardragpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_barhintspl.obj :  .AUTODEPEND ../../src/fl\barhintspl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_cbcustom.obj :  .AUTODEPEND ../../src/fl\cbcustom.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_controlbar.obj :  .AUTODEPEND ../../src/fl\controlbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_dyntbar.obj :  .AUTODEPEND ../../src/fl\dyntbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_dyntbarhnd.obj :  .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_frmview.obj :  .AUTODEPEND ../../src/fl\frmview.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_garbagec.obj :  .AUTODEPEND ../../src/fl\garbagec.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_gcupdatesmgr.obj :  .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_hintanimpl.obj :  .AUTODEPEND ../../src/fl\hintanimpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_newbmpbtn.obj :  .AUTODEPEND ../../src/fl\newbmpbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_panedrawpl.obj :  .AUTODEPEND ../../src/fl\panedrawpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_rowdragpl.obj :  .AUTODEPEND ../../src/fl\rowdragpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_rowlayoutpl.obj :  .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_toolwnd.obj :  .AUTODEPEND ../../src/fl\toolwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fldll_updatesmgr.obj :  .AUTODEPEND ../../src/fl\updatesmgr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
-
-$(OBJS)\fllib_dummy.obj :  .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_antiflickpl.obj :  .AUTODEPEND ../../src/fl\antiflickpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_bardragpl.obj :  .AUTODEPEND ../../src/fl\bardragpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_barhintspl.obj :  .AUTODEPEND ../../src/fl\barhintspl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_cbcustom.obj :  .AUTODEPEND ../../src/fl\cbcustom.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_controlbar.obj :  .AUTODEPEND ../../src/fl\controlbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_dyntbar.obj :  .AUTODEPEND ../../src/fl\dyntbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_dyntbarhnd.obj :  .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_frmview.obj :  .AUTODEPEND ../../src/fl\frmview.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_garbagec.obj :  .AUTODEPEND ../../src/fl\garbagec.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_gcupdatesmgr.obj :  .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_hintanimpl.obj :  .AUTODEPEND ../../src/fl\hintanimpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_newbmpbtn.obj :  .AUTODEPEND ../../src/fl\newbmpbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_panedrawpl.obj :  .AUTODEPEND ../../src/fl\panedrawpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_rowdragpl.obj :  .AUTODEPEND ../../src/fl\rowdragpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_rowlayoutpl.obj :  .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_toolwnd.obj :  .AUTODEPEND ../../src/fl\toolwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
-$(OBJS)\fllib_updatesmgr.obj :  .AUTODEPEND ../../src/fl\updatesmgr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/foldbar/foldbar.bkl b/contrib/build/foldbar/foldbar.bkl
deleted file mode 100644
index acdbe5bed2..0000000000
--- a/contrib/build/foldbar/foldbar.bkl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="FOLDBAR_SRC">
-        captionbar.cpp
-        foldpanelbar.cpp
-        foldpanelitem.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/foldbar/captionbar.h
-            wx/foldbar/foldpanelbar.h
-            wx/foldbar/foldpanelitem.h
-        </files>
-    </headers>
-
-    <dll id="foldbardll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_FOLDBAR</define>
-        <sources>$(FOLDBAR_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-    
-    <lib id="foldbarlib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(FOLDBAR_SRC)</sources>
-    </lib>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">foldbar=foldbarlib+foldbardll</set>
-
-</makefile>
diff --git a/contrib/build/foldbar/foldbar.dsp b/contrib/build/foldbar/foldbar.dsp
deleted file mode 100644
index d103256a83..0000000000
--- a/contrib/build/foldbar/foldbar.dsp
+++ /dev/null
@@ -1,537 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foldbar" - 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=foldbar - 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 "foldbar.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 "foldbar.mak" CFG="foldbar - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "foldbar - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "foldbar - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "foldbar - Win32 Debug" (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)" == "foldbar - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29u_foldbar.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /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_FOLDBAR" /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_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29ud_foldbar.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29ud_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29_foldbar.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29d_foldbar.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv290d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmswuniv29d_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290u_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290u_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswu" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290u_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29u_foldbar.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290u_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290ud_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290ud_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswud" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290ud_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29ud_foldbar.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290ud_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29ud_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_foldbardll.pch" /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\msw" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29_foldbar.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_foldbardll.pch" /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290d_foldbar_vc_custom.pdb /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FOLDBAR" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290d_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\foldbar\..\..\..\lib\vc_dll\mswd" /i "..\..\src\foldbar\..\..\..\include" /d WXDLLNAME=wxmsw290d_foldbar_vc_custom /i "..\..\src\foldbar\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FOLDBAR
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29d_foldbar.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw290d_foldbar_vc_custom.dll" /libpath:"..\..\src\foldbar\..\..\..\lib\vc_dll" /implib:"..\..\src\foldbar\..\..\..\lib\vc_dll\wxmsw29d_foldbar.lib" /debug
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29u_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29ud_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29ud_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29d_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmswuniv29d_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswu" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29u_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29u_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29u_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswud" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29ud_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29ud_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29ud_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\msw" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\msw" /I "..\..\src\foldbar\..\..\..\include" /W4 /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29_foldbar.lib"
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\foldbar"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\foldbar\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\foldbar"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\foldbar\..\..\..\lib\vc_lib\mswd" /I "..\..\src\foldbar\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29d_foldbar.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_foldbarlib.pch" /I "..\..\src\foldbar\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29d_foldbar.lib"
-# ADD LIB32 /nologo /out:"..\..\src\foldbar\..\..\..\lib\vc_lib\wxmsw29d_foldbar.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "foldbar - Win32 DLL Universal Unicode Release"
-# Name "foldbar - Win32 DLL Universal Unicode Debug"
-# Name "foldbar - Win32 DLL Universal Release"
-# Name "foldbar - Win32 DLL Universal Debug"
-# Name "foldbar - Win32 DLL Unicode Release"
-# Name "foldbar - Win32 DLL Unicode Debug"
-# Name "foldbar - Win32 DLL Release"
-# Name "foldbar - Win32 DLL Debug"
-# Name "foldbar - Win32 Universal Unicode Release"
-# Name "foldbar - Win32 Universal Unicode Debug"
-# Name "foldbar - Win32 Universal Release"
-# Name "foldbar - Win32 Universal Debug"
-# Name "foldbar - Win32 Unicode Release"
-# Name "foldbar - Win32 Unicode Debug"
-# Name "foldbar - Win32 Release"
-# Name "foldbar - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/foldbar\captionbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\foldpanelbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\foldpanelitem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/foldbar\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "foldbar - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/foldbar/foldbar.dsw b/contrib/build/foldbar/foldbar.dsw
deleted file mode 100644
index 30d1c6a873..0000000000
--- a/contrib/build/foldbar/foldbar.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "foldbar"=foldbar.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/foldbar/makefile.bcc b/contrib/build/foldbar/makefile.bcc
deleted file mode 100644
index 49c4b5f34e..0000000000
--- a/contrib/build/foldbar/makefile.bcc
+++ /dev/null
@@ -1,293 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\foldbar\..\..\..\include \
-	-I..\..\src\foldbar\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FOLDBAR -Hu \
-	-H=$(OBJS)\wxprec_foldbardll.csm $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.obj \
-	$(OBJS)\foldbardll_captionbar.obj \
-	$(OBJS)\foldbardll_foldpanelbar.obj \
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\foldbar\..\..\..\include \
-	-I..\..\src\foldbar\..\..\include -Hu -H=$(OBJS)\wxprec_foldbarlib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.obj \
-	$(OBJS)\foldbarlib_captionbar.obj \
-	$(OBJS)\foldbarlib_foldpanelbar.obj \
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj  $(FOLDBARDLL_OBJECTS)  $(OBJS)\foldbardll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\foldbardll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib: $(OBJS)\foldbarlib_dummy.obj  $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(FOLDBARLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) -H $**
-
-$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.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..\..\src\foldbar\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG) $**
-
-$(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) -H $**
-
-$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/foldbar/makefile.gcc b/contrib/build/foldbar/makefile.gcc
deleted file mode 100644
index 4f59d5f735..0000000000
--- a/contrib/build/foldbar/makefile.gcc
+++ /dev/null
@@ -1,289 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\foldbar\..\..\..\include -W \
-	-Wall -I..\..\src\foldbar\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FOLDBAR \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.o \
-	$(OBJS)\foldbardll_version_rc.o \
-	$(OBJS)\foldbardll_captionbar.o \
-	$(OBJS)\foldbardll_foldpanelbar.o \
-	$(OBJS)\foldbardll_foldpanelitem.o
-FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\foldbar\..\..\..\include -W \
-	-Wall -I..\..\src\foldbar\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.o \
-	$(OBJS)\foldbarlib_captionbar.o \
-	$(OBJS)\foldbarlib_foldpanelbar.o \
-	$(OBJS)\foldbarlib_foldpanelitem.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a: $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(FOLDBARLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbardll_version_rc.o: ../../src/foldbar/../../../src/msw/version.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 ../../src/foldbar/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG)
-
-$(OBJS)\foldbardll_captionbar.o: ../../src/foldbar/captionbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbardll_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbardll_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
-	$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbarlib_captionbar.o: ../../src/foldbar/captionbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbarlib_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldbarlib_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
-	$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/foldbar/makefile.vc b/contrib/build/foldbar/makefile.vc
deleted file mode 100644
index c61002e5b9..0000000000
--- a/contrib/build/foldbar/makefile.vc
+++ /dev/null
@@ -1,378 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\foldbar\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\foldbar\..\..\..\include /W4 /I..\..\src\foldbar\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_FOLDBAR $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_foldbardll.pch" $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(OBJS)\foldbardll_dummy.obj \
-	$(OBJS)\foldbardll_version.res \
-	$(OBJS)\foldbardll_captionbar.obj \
-	$(OBJS)\foldbardll_foldpanelbar.obj \
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\foldbar\..\..\..\include /W4 /I..\..\src\foldbar\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_foldbarlib.pch" $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	$(OBJS)\foldbarlib_dummy.obj \
-	$(OBJS)\foldbarlib_captionbar.obj \
-	$(OBJS)\foldbarlib_foldpanelbar.obj \
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__foldbardll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__foldbarlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj  $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(FOLDBARDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib: $(OBJS)\foldbarlib_dummy.obj  $(FOLDBARLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(FOLDBARLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\foldbar\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG) $**
-
-$(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
-
-$(OBJS)\foldbarlib_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/foldbar/makefile.wat b/contrib/build/foldbar/makefile.wat
deleted file mode 100644
index c6dfdc1d3d..0000000000
--- a/contrib/build/foldbar/makefile.wat
+++ /dev/null
@@ -1,325 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__foldbardll___depname =
-!ifeq SHARED 1
-__foldbardll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__foldbarlib___depname =
-!ifeq SHARED 0
-__foldbarlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDBARDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\foldbar\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\foldbar\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FOLDBAR &
-	/fh=$(OBJS)\wxprec_foldbardll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  &
-	$(OBJS)\foldbardll_dummy.obj &
-	$(OBJS)\foldbardll_captionbar.obj &
-	$(OBJS)\foldbardll_foldpanelbar.obj &
-	$(OBJS)\foldbardll_foldpanelitem.obj
-FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\foldbar\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\foldbar\..\..\include /fh=$(OBJS)\wxprec_foldbarlib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  &
-	$(OBJS)\foldbarlib_dummy.obj &
-	$(OBJS)\foldbarlib_captionbar.obj &
-	$(OBJS)\foldbarlib_foldpanelbar.obj &
-	$(OBJS)\foldbarlib_foldpanelitem.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__foldbardll___depname) $(__foldbarlib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG).dll :  $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
-	@%create $(OBJS)\foldbardll.lbc
-	@%append $(OBJS)\foldbardll.lbc option quiet
-	@%append $(OBJS)\foldbardll.lbc name $^@
-	@%append $(OBJS)\foldbardll.lbc option caseexact
-	@%append $(OBJS)\foldbardll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
-	@%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res
-	@%append $(OBJS)\foldbardll.lbc system nt_dll
-	wlink @$(OBJS)\foldbardll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib :  $(FOLDBARLIB_OBJECTS)
-	@%create $(OBJS)\foldbarlib.lbc
-	@for %i in ($(FOLDBARLIB_OBJECTS)) do @%append $(OBJS)\foldbarlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\foldbarlib.lbc
-!endif
-
-$(OBJS)\foldbardll_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_version.res :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\version.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=..\..\src\foldbar\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) $<
-
-$(OBJS)\foldbardll_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbardll_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
-$(OBJS)\foldbarlib_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
deleted file mode 100644
index 828e494292..0000000000
--- a/contrib/build/gizmos/gizmos.bkl
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="GIZMOS_SRC">
-        dynamicsash.cpp
-        editlbox.cpp
-        ledctrl.cpp
-        multicell.cpp
-        splittree.cpp
-        statpict.cpp
-    </set>
-    
-    <set var="GIZMOS_XRC_SRC">
-        xh_statpict.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/gizmos/dynamicsash.h
-            wx/gizmos/editlbox.h
-            wx/gizmos/ledctrl.h
-            wx/gizmos/multicell.h
-            wx/gizmos/splittree.h
-            wx/gizmos/statpict.h
-            wx/gizmos/gizmos.h
-            wx/gizmos/xh_statpict.h
-        </files>
-    </headers>
-
-    <dll id="gizmosdll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_GIZMOS</define>
-        <sources>$(GIZMOS_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-    
-    <dll id="gizmos_xrcdll" template="wx_contrib_dll"
-         cond="SHARED=='1' and USE_XRC=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_GIZMOS_XRC</define>
-        <sources>$(GIZMOS_XRC_SRC)</sources>
-        <library>gizmosdll</library>
-        <wx-lib>xrc</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-
-    <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(GIZMOS_SRC)</sources>
-    </lib>
-
-    <lib id="gizmos_xrclib" template="wx_contrib_lib"
-         cond="SHARED=='0' and USE_XRC=='1'">
-        <sources>$(GIZMOS_XRC_SRC)</sources>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos_xrc=gizmos_xrclib+gizmos_xrcdll</set>
-
-</makefile>
diff --git a/contrib/build/gizmos/gizmos.dsp b/contrib/build/gizmos/gizmos.dsp
deleted file mode 100644
index 97cdb925e8..0000000000
--- a/contrib/build/gizmos/gizmos.dsp
+++ /dev/null
@@ -1,553 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gizmos" - 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=gizmos - 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 "gizmos.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 "gizmos.mak" CFG="gizmos - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gizmos - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Debug" (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)" == "gizmos - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /d WXDLLNAME=wxmswuniv255u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /d WXDLLNAME=wxmswuniv255u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 oleacc.lib odbc32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25u_gizmos.lib"
-# ADD LINK32 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 oleacc.lib odbc32.lib wxbase25u.lib wxmswuniv25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /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_GIZMOS" /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_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /d WXDLLNAME=wxmswuniv255ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /d WXDLLNAME=wxmswuniv255ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 oleacc.lib odbc32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25ud_gizmos.lib" /debug
-# ADD LINK32 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 oleacc.lib odbc32.lib wxbase25ud.lib wxmswuniv25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25ud_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /d WXDLLNAME=wxmswuniv255_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /d WXDLLNAME=wxmswuniv255_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmswuniv25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /d WXDLLNAME=wxmswuniv255d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /d WXDLLNAME=wxmswuniv255d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25d_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmswuniv25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv255d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv25d_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /d WXDLLNAME=wxmsw255u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /d WXDLLNAME=wxmsw255u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 oleacc.lib odbc32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25u_gizmos.lib"
-# ADD LINK32 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 oleacc.lib odbc32.lib wxbase25u.lib wxmsw25u_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /d WXDLLNAME=wxmsw255ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /d WXDLLNAME=wxmsw255ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 oleacc.lib odbc32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25ud_gizmos.lib" /debug
-# ADD LINK32 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 oleacc.lib odbc32.lib wxbase25ud.lib wxmsw25ud_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25ud_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /d WXDLLNAME=wxmsw255_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /d WXDLLNAME=wxmsw255_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25.lib wxmsw25_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /d WXDLLNAME=wxmsw255d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\include" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /d WXDLLNAME=wxmsw255d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25d_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib wxbase25d.lib wxmsw25d_core.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw255d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw25d_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25ud_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv25d_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25ud_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\include" /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw25d_gizmos.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "gizmos - Win32 DLL Universal Unicode Release"
-# Name "gizmos - Win32 DLL Universal Unicode Debug"
-# Name "gizmos - Win32 DLL Universal Release"
-# Name "gizmos - Win32 DLL Universal Debug"
-# Name "gizmos - Win32 DLL Unicode Release"
-# Name "gizmos - Win32 DLL Unicode Debug"
-# Name "gizmos - Win32 DLL Release"
-# Name "gizmos - Win32 DLL Debug"
-# Name "gizmos - Win32 Universal Unicode Release"
-# Name "gizmos - Win32 Universal Unicode Debug"
-# Name "gizmos - Win32 Universal Release"
-# Name "gizmos - Win32 Universal Debug"
-# Name "gizmos - Win32 Unicode Release"
-# Name "gizmos - Win32 Unicode Debug"
-# Name "gizmos - Win32 Release"
-# Name "gizmos - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\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/gizmos\dynamicsash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\editlbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\ledctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\multicell.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\splittree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\statpict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\xh_statpict.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/gizmos/gizmos.dsw b/contrib/build/gizmos/gizmos.dsw
deleted file mode 100644
index 2a413d4460..0000000000
--- a/contrib/build/gizmos/gizmos.dsw
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "gizmos"=gizmos_gizmos.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gizmos_xrc"=gizmos_gizmos_xrc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/gizmos/gizmos_gizmos.dsp b/contrib/build/gizmos/gizmos_gizmos.dsp
deleted file mode 100644
index 826ab0f938..0000000000
--- a/contrib/build/gizmos/gizmos_gizmos.dsp
+++ /dev/null
@@ -1,549 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gizmos_gizmos" - 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=gizmos - 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 "gizmos_gizmos.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 "gizmos_gizmos.mak" CFG="gizmos - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gizmos - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos - Win32 Debug" (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)" == "gizmos - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /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_GIZMOS" /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_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290u_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290ud_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmosdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmosdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290d_gizmos_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\gizmos"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\gizmos"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmoslib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "gizmos - Win32 DLL Universal Unicode Release"
-# Name "gizmos - Win32 DLL Universal Unicode Debug"
-# Name "gizmos - Win32 DLL Universal Release"
-# Name "gizmos - Win32 DLL Universal Debug"
-# Name "gizmos - Win32 DLL Unicode Release"
-# Name "gizmos - Win32 DLL Unicode Debug"
-# Name "gizmos - Win32 DLL Release"
-# Name "gizmos - Win32 DLL Debug"
-# Name "gizmos - Win32 Universal Unicode Release"
-# Name "gizmos - Win32 Universal Unicode Debug"
-# Name "gizmos - Win32 Universal Release"
-# Name "gizmos - Win32 Universal Debug"
-# Name "gizmos - Win32 Unicode Release"
-# Name "gizmos - Win32 Unicode Debug"
-# Name "gizmos - Win32 Release"
-# Name "gizmos - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\dynamicsash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\editlbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\ledctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\multicell.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\splittree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\statpict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/gizmos/gizmos_gizmos_xrc.dsp b/contrib/build/gizmos/gizmos_gizmos_xrc.dsp
deleted file mode 100644
index f872e5762c..0000000000
--- a/contrib/build/gizmos/gizmos_gizmos_xrc.dsp
+++ /dev/null
@@ -1,529 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gizmos_gizmos_xrc" - 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=gizmos_xrc - 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 "gizmos_gizmos_xrc.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 "gizmos_gizmos_xrc.mak" CFG="gizmos_xrc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gizmos_xrc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gizmos_xrc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gizmos_xrc - Win32 Debug" (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)" == "gizmos_xrc - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos_xrc.lib"
-# ADD LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290u_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29u_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /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_GIZMOS_XRC" /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_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos_xrc.lib" /debug
-# ADD LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290ud_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29ud_gizmos_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos.lib wxmswuniv29_xrc.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos_xrc.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos.lib wxmswuniv29_xrc.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos.lib wxmswuniv29d_xrc.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos_xrc.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos.lib wxmswuniv29d_xrc.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv290d_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmswuniv29d_gizmos_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290u_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswu" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290u_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos_xrc.lib"
-# ADD LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290u_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29u_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290ud_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswud" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290ud_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos_xrc.lib" /debug
-# ADD LINK32 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 ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290ud_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29ud_gizmos_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gizmos_xrcdll.pch" /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\msw" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos.lib wxmsw29_xrc.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos_xrc.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos.lib wxmsw29_xrc.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gizmos_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_xrc_vc_custom.pdb /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GIZMOS_XRC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290d_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\gizmos\..\..\..\lib\vc_dll\mswd" /i "..\..\src\gizmos\..\..\..\include" /d WXDLLNAME=wxmsw290d_gizmos_xrc_vc_custom /i "..\..\src\gizmos\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_GIZMOS_XRC
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos.lib wxmsw29d_xrc.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos_xrc.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos.lib wxmsw29d_xrc.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw290d_gizmos_xrc_vc_custom.dll" /libpath:"..\..\src\gizmos\..\..\..\lib\vc_dll" /implib:"..\..\src\gizmos\..\..\..\lib\vc_dll\wxmsw29d_gizmos_xrc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29u_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29ud_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmswuniv29d_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswu" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29u_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswud" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29ud_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\msw" /I "..\..\src\gizmos\..\..\..\include" /W4 /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29_gizmos_xrc.lib"
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\gizmos_xrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\gizmos\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\gizmos_xrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\gizmos\..\..\..\lib\vc_lib\mswd" /I "..\..\src\gizmos\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos_xrc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gizmos_xrclib.pch" /I "..\..\src\gizmos\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos_xrc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\gizmos\..\..\..\lib\vc_lib\wxmsw29d_gizmos_xrc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "gizmos_xrc - Win32 DLL Universal Unicode Release"
-# Name "gizmos_xrc - Win32 DLL Universal Unicode Debug"
-# Name "gizmos_xrc - Win32 DLL Universal Release"
-# Name "gizmos_xrc - Win32 DLL Universal Debug"
-# Name "gizmos_xrc - Win32 DLL Unicode Release"
-# Name "gizmos_xrc - Win32 DLL Unicode Debug"
-# Name "gizmos_xrc - Win32 DLL Release"
-# Name "gizmos_xrc - Win32 DLL Debug"
-# Name "gizmos_xrc - Win32 Universal Unicode Release"
-# Name "gizmos_xrc - Win32 Universal Unicode Debug"
-# Name "gizmos_xrc - Win32 Universal Release"
-# Name "gizmos_xrc - Win32 Universal Debug"
-# Name "gizmos_xrc - Win32 Unicode Release"
-# Name "gizmos_xrc - Win32 Unicode Debug"
-# Name "gizmos_xrc - Win32 Release"
-# Name "gizmos_xrc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "gizmos_xrc - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/gizmos\xh_statpict.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc
deleted file mode 100644
index e259df02de..0000000000
--- a/contrib/build/gizmos/makefile.bcc
+++ /dev/null
@@ -1,392 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-GIZMOSDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -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..\..\src\gizmos\..\..\..\include \
-	-I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS -Hu \
-	-H=$(OBJS)\wxprec_gizmosdll.csm $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSDLL_OBJECTS =  \
-	$(OBJS)\gizmosdll_dummy.obj \
-	$(OBJS)\gizmosdll_dynamicsash.obj \
-	$(OBJS)\gizmosdll_editlbox.obj \
-	$(OBJS)\gizmosdll_ledctrl.obj \
-	$(OBJS)\gizmosdll_multicell.obj \
-	$(OBJS)\gizmosdll_splittree.obj \
-	$(OBJS)\gizmosdll_statpict.obj
-GIZMOS_XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -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..\..\src\gizmos\..\..\..\include \
-	-I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS_XRC -Hu \
-	-H=$(OBJS)\wxprec_gizmos_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS =  \
-	$(OBJS)\gizmos_xrcdll_dummy.obj \
-	$(OBJS)\gizmos_xrcdll_xh_statpict.obj
-GIZMOSLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -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..\..\src\gizmos\..\..\..\include \
-	-I..\..\src\gizmos\..\..\include -Hu -H=$(OBJS)\wxprec_gizmoslib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS =  \
-	$(OBJS)\gizmoslib_dummy.obj \
-	$(OBJS)\gizmoslib_dynamicsash.obj \
-	$(OBJS)\gizmoslib_editlbox.obj \
-	$(OBJS)\gizmoslib_ledctrl.obj \
-	$(OBJS)\gizmoslib_multicell.obj \
-	$(OBJS)\gizmoslib_splittree.obj \
-	$(OBJS)\gizmoslib_statpict.obj
-GIZMOS_XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -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..\..\src\gizmos\..\..\..\include \
-	-I..\..\src\gizmos\..\..\include -Hu -H=$(OBJS)\wxprec_gizmos_xrclib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS =  \
-	$(OBJS)\gizmos_xrclib_dummy.obj \
-	$(OBJS)\gizmos_xrclib_xh_statpict.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__gizmosdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll
-!endif
-!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-__gizmos_xrcdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XRC_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(SHARED)" == "0"
-__gizmoslib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-!endif
-!if "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
-__gizmos_xrclib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_0 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_0 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_0 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_0 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_0 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_0 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_0 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_0 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_0 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_0 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(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"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_2 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_2 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj  $(GIZMOSDLL_OBJECTS)  $(OBJS)\gizmosdll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmosdll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $@
-!endif
-
-!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj  $(GIZMOS_XRCDLL_OBJECTS)  $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(GIZMOS_XRCDLL_OBJECTS),$@,, $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmos_xrcdll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj  $(GIZMOSLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(GIZMOSLIB_OBJECTS)
-|
-!endif
-
-!if "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib: $(OBJS)\gizmos_xrclib_dummy.obj  $(GIZMOS_XRCLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(GIZMOS_XRCLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $**
-
-$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i..\..\src\gizmos\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG) $**
-
-$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) -H $**
-
-$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) -i$(SETUPHDIR) -i..\..\src\gizmos\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG) $**
-
-$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $**
-
-$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOS_XRCLIB_CXXFLAGS) -H $**
-
-$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
-	$(CXX) -q -c -P -o$@ $(GIZMOS_XRCLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
deleted file mode 100644
index 017c3e1169..0000000000
--- a/contrib/build/gizmos/makefile.gcc
+++ /dev/null
@@ -1,389 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-GIZMOSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include -W \
-	-Wall -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-GIZMOSDLL_OBJECTS =  \
-	$(OBJS)\gizmosdll_dummy.o \
-	$(OBJS)\gizmosdll_version_rc.o \
-	$(OBJS)\gizmosdll_dynamicsash.o \
-	$(OBJS)\gizmosdll_editlbox.o \
-	$(OBJS)\gizmosdll_ledctrl.o \
-	$(OBJS)\gizmosdll_multicell.o \
-	$(OBJS)\gizmosdll_splittree.o \
-	$(OBJS)\gizmosdll_statpict.o
-GIZMOS_XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include -W \
-	-Wall -I..\..\src\gizmos\..\..\include -DWXUSINGDLL \
-	-DWXMAKINGDLL_GIZMOS_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS =  \
-	$(OBJS)\gizmos_xrcdll_dummy.o \
-	$(OBJS)\gizmos_xrcdll_version_rc.o \
-	$(OBJS)\gizmos_xrcdll_xh_statpict.o
-GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include -W \
-	-Wall -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS =  \
-	$(OBJS)\gizmoslib_dummy.o \
-	$(OBJS)\gizmoslib_dynamicsash.o \
-	$(OBJS)\gizmoslib_editlbox.o \
-	$(OBJS)\gizmoslib_ledctrl.o \
-	$(OBJS)\gizmoslib_multicell.o \
-	$(OBJS)\gizmoslib_splittree.o \
-	$(OBJS)\gizmoslib_statpict.o
-GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include -W \
-	-Wall -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS =  \
-	$(OBJS)\gizmos_xrclib_dummy.o \
-	$(OBJS)\gizmos_xrclib_xh_statpict.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__gizmosdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll
-endif
-ifeq ($(SHARED),1)
-ifeq ($(USE_XRC),1)
-__gizmos_xrcdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XRC_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(SHARED),0)
-__gizmoslib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
-endif
-ifeq ($(SHARED),0)
-ifeq ($(USE_XRC),1)
-__gizmos_xrclib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a
-endif
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_0 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_0 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_0 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),1)
-ifeq ($(USE_XRC),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a: $(GIZMOSLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(GIZMOSLIB_OBJECTS)
-	ranlib $@
-endif
-
-ifeq ($(SHARED),0)
-ifeq ($(USE_XRC),1)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a: $(GIZMOS_XRCLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(GIZMOS_XRCLIB_OBJECTS)
-	ranlib $@
-endif
-endif
-
-$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ../../src/gizmos/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG)
-
-$(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_editlbox.o: ../../src/gizmos/editlbox.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_ledctrl.o: ../../src/gizmos/ledctrl.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_multicell.o: ../../src/gizmos/multicell.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
-	$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ../../src/gizmos/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG)
-
-$(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
-	$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_editlbox.o: ../../src/gizmos/editlbox.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_ledctrl.o: ../../src/gizmos/ledctrl.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_multicell.o: ../../src/gizmos/multicell.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
-	$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\gizmos_xrclib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
-	$(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc
deleted file mode 100644
index da1523cfd9..0000000000
--- a/contrib/build/gizmos/makefile.vc
+++ /dev/null
@@ -1,493 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\gizmos\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-GIZMOSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_3) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include /W4 /I..\..\src\gizmos\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_GIZMOS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmosdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSDLL_OBJECTS =  \
-	$(OBJS)\gizmosdll_dummy.obj \
-	$(OBJS)\gizmosdll_version.res \
-	$(OBJS)\gizmosdll_dynamicsash.obj \
-	$(OBJS)\gizmosdll_editlbox.obj \
-	$(OBJS)\gizmosdll_ledctrl.obj \
-	$(OBJS)\gizmosdll_multicell.obj \
-	$(OBJS)\gizmosdll_splittree.obj \
-	$(OBJS)\gizmosdll_statpict.obj
-GIZMOS_XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_3) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include /W4 /I..\..\src\gizmos\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_GIZMOS_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmos_xrcdll.pch" $(CPPFLAGS) \
-	$(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS =  \
-	$(OBJS)\gizmos_xrcdll_dummy.obj \
-	$(OBJS)\gizmos_xrcdll_version.res \
-	$(OBJS)\gizmos_xrcdll_xh_statpict.obj
-GIZMOSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_3) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include /W4 /I..\..\src\gizmos\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_gizmoslib.pch" $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS =  \
-	$(OBJS)\gizmoslib_dummy.obj \
-	$(OBJS)\gizmoslib_dynamicsash.obj \
-	$(OBJS)\gizmoslib_editlbox.obj \
-	$(OBJS)\gizmoslib_ledctrl.obj \
-	$(OBJS)\gizmoslib_multicell.obj \
-	$(OBJS)\gizmoslib_splittree.obj \
-	$(OBJS)\gizmoslib_statpict.obj
-GIZMOS_XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_49)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_3) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\gizmos\..\..\..\include /W4 /I..\..\src\gizmos\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_gizmos_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS =  \
-	$(OBJS)\gizmos_xrclib_dummy.obj \
-	$(OBJS)\gizmos_xrclib_xh_statpict.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__gizmosdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!endif
-!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-__gizmos_xrcdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_23 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_23 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XRC_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(SHARED)" == "0"
-__gizmoslib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_36 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_36 = $(__THREADSFLAG)
-!endif
-!if "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
-__gizmos_xrclib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_49 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_49 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_0 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_0 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_0 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_0 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_0 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_0 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_0 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_0 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_0 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj  $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(GIZMOSDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-<<
-!endif
-
-!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj  $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(GIZMOS_XRCDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj  $(GIZMOSLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(GIZMOSLIB_OBJECTS)
-<<
-!endif
-
-!if "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib: $(OBJS)\gizmos_xrclib_dummy.obj  $(GIZMOS_XRCLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(GIZMOS_XRCLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i ..\..\src\gizmos\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG) $**
-
-$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i ..\..\src\gizmos\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG) $**
-
-$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
-
-$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat
deleted file mode 100644
index 1df5e193f8..0000000000
--- a/contrib/build/gizmos/makefile.wat
+++ /dev/null
@@ -1,438 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__gizmosdll___depname =
-!ifeq SHARED 1
-__gizmosdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll
-!endif
-__gizmos_xrcdll___depname =
-!ifeq SHARED 1
-!ifeq USE_XRC 1
-__gizmos_xrcdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll
-!endif
-!endif
-__WXLIB_XRC_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XRC_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-__gizmoslib___depname =
-!ifeq SHARED 0
-__gizmoslib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-!endif
-__gizmos_xrclib___depname =
-!ifeq SHARED 0
-!ifeq USE_XRC 1
-__gizmos_xrclib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-!endif
-!endif
-__DEBUGINFO =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO = debug all
-!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
-__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
-__DEBUGINFO_3 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_3 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_3 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_3 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_3 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-GIZMOSDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\gizmos\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS &
-	/fh=$(OBJS)\wxprec_gizmosdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-GIZMOSDLL_OBJECTS =  &
-	$(OBJS)\gizmosdll_dummy.obj &
-	$(OBJS)\gizmosdll_dynamicsash.obj &
-	$(OBJS)\gizmosdll_editlbox.obj &
-	$(OBJS)\gizmosdll_ledctrl.obj &
-	$(OBJS)\gizmosdll_multicell.obj &
-	$(OBJS)\gizmosdll_splittree.obj &
-	$(OBJS)\gizmosdll_statpict.obj
-GIZMOS_XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) &
-	$(__THREADSFLAG) $(__RUNTIME_LIBS) -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=..\..\src\gizmos\..\..\..\include -wx -wcd=549 -wcd=656 &
-	-wcd=657 -wcd=667 -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL &
-	-dWXMAKINGDLL_GIZMOS_XRC /fh=$(OBJS)\wxprec_gizmos_xrcdll.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS =  &
-	$(OBJS)\gizmos_xrcdll_dummy.obj &
-	$(OBJS)\gizmos_xrcdll_xh_statpict.obj
-GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\gizmos\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\gizmos\..\..\include /fh=$(OBJS)\wxprec_gizmoslib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS =  &
-	$(OBJS)\gizmoslib_dummy.obj &
-	$(OBJS)\gizmoslib_dynamicsash.obj &
-	$(OBJS)\gizmoslib_editlbox.obj &
-	$(OBJS)\gizmoslib_ledctrl.obj &
-	$(OBJS)\gizmoslib_multicell.obj &
-	$(OBJS)\gizmoslib_splittree.obj &
-	$(OBJS)\gizmoslib_statpict.obj
-GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO_3) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\gizmos\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\gizmos\..\..\include /fh=$(OBJS)\wxprec_gizmos_xrclib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS =  &
-	$(OBJS)\gizmos_xrclib_dummy.obj &
-	$(OBJS)\gizmos_xrclib_xh_statpict.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG).dll :  $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
-	@%create $(OBJS)\gizmosdll.lbc
-	@%append $(OBJS)\gizmosdll.lbc option quiet
-	@%append $(OBJS)\gizmosdll.lbc name $^@
-	@%append $(OBJS)\gizmosdll.lbc option caseexact
-	@%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME)
-	@for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
-	@%append $(OBJS)\gizmosdll.lbc option resource=$(OBJS)\gizmosdll_version.res
-	@%append $(OBJS)\gizmosdll.lbc system nt_dll
-	wlink @$(OBJS)\gizmosdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib +$^@
-!endif
-
-!ifeq SHARED 1
-!ifeq USE_XRC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG).dll :  $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
-	@%create $(OBJS)\gizmos_xrcdll.lbc
-	@%append $(OBJS)\gizmos_xrcdll.lbc option quiet
-	@%append $(OBJS)\gizmos_xrcdll.lbc name $^@
-	@%append $(OBJS)\gizmos_xrcdll.lbc option caseexact
-	@%append $(OBJS)\gizmos_xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME)
-	@for %i in ($(GIZMOS_XRCDLL_OBJECTS)) do @%append $(OBJS)\gizmos_xrcdll.lbc file %i
-	@for %i in ( $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
-	@%append $(OBJS)\gizmos_xrcdll.lbc option resource=$(OBJS)\gizmos_xrcdll_version.res
-	@%append $(OBJS)\gizmos_xrcdll.lbc system nt_dll
-	wlink @$(OBJS)\gizmos_xrcdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib +$^@
-!endif
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib :  $(GIZMOSLIB_OBJECTS)
-	@%create $(OBJS)\gizmoslib.lbc
-	@for %i in ($(GIZMOSLIB_OBJECTS)) do @%append $(OBJS)\gizmoslib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\gizmoslib.lbc
-!endif
-
-!ifeq SHARED 0
-!ifeq USE_XRC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib :  $(GIZMOS_XRCLIB_OBJECTS)
-	@%create $(OBJS)\gizmos_xrclib.lbc
-	@for %i in ($(GIZMOS_XRCLIB_OBJECTS)) do @%append $(OBJS)\gizmos_xrclib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\gizmos_xrclib.lbc
-!endif
-!endif
-
-$(OBJS)\gizmosdll_dummy.obj :  .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_version.res :  .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.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=..\..\src\gizmos\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_wat$(VENDORTAG) $<
-
-$(OBJS)\gizmosdll_dynamicsash.obj :  .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_editlbox.obj :  .AUTODEPEND ../../src/gizmos\editlbox.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_ledctrl.obj :  .AUTODEPEND ../../src/gizmos\ledctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_multicell.obj :  .AUTODEPEND ../../src/gizmos\multicell.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_splittree.obj :  .AUTODEPEND ../../src/gizmos\splittree.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmosdll_statpict.obj :  .AUTODEPEND ../../src/gizmos\statpict.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmos_xrcdll_dummy.obj :  .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmos_xrcdll_version.res :  .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.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=..\..\src\gizmos\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_wat$(VENDORTAG) $<
-
-$(OBJS)\gizmos_xrcdll_xh_statpict.obj :  .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_dummy.obj :  .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_dynamicsash.obj :  .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_editlbox.obj :  .AUTODEPEND ../../src/gizmos\editlbox.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_ledctrl.obj :  .AUTODEPEND ../../src/gizmos\ledctrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_multicell.obj :  .AUTODEPEND ../../src/gizmos\multicell.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_splittree.obj :  .AUTODEPEND ../../src/gizmos\splittree.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmoslib_statpict.obj :  .AUTODEPEND ../../src/gizmos\statpict.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmos_xrclib_dummy.obj :  .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\gizmos_xrclib_xh_statpict.obj :  .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/mmedia/makefile.bcc b/contrib/build/mmedia/makefile.bcc
deleted file mode 100644
index 2d76c62846..0000000000
--- a/contrib/build/mmedia/makefile.bcc
+++ /dev/null
@@ -1,429 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\mmedia\..\..\..\include \
-	-I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA -Hu \
-	-H=$(OBJS)\wxprec_mmediadll.csm $(CPPFLAGS) $(CXXFLAGS)
-MMEDIADLL_OBJECTS =  \
-	$(OBJS)\mmediadll_dummy.obj \
-	$(OBJS)\mmediadll_cdwin.obj \
-	$(OBJS)\mmediadll_sndwin.obj \
-	$(OBJS)\mmediadll_vidwin.obj \
-	$(OBJS)\mmediadll_cdbase.obj \
-	$(OBJS)\mmediadll_g711.obj \
-	$(OBJS)\mmediadll_g721.obj \
-	$(OBJS)\mmediadll_g723_24.obj \
-	$(OBJS)\mmediadll_g723_40.obj \
-	$(OBJS)\mmediadll_g72x.obj \
-	$(OBJS)\mmediadll_sndaiff.obj \
-	$(OBJS)\mmediadll_sndbase.obj \
-	$(OBJS)\mmediadll_sndcodec.obj \
-	$(OBJS)\mmediadll_sndcpcm.obj \
-	$(OBJS)\mmediadll_sndfile.obj \
-	$(OBJS)\mmediadll_sndg72x.obj \
-	$(OBJS)\mmediadll_sndmsad.obj \
-	$(OBJS)\mmediadll_sndpcm.obj \
-	$(OBJS)\mmediadll_sndulaw.obj \
-	$(OBJS)\mmediadll_sndwav.obj \
-	$(OBJS)\mmediadll_vidbase.obj
-MMEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\mmedia\..\..\..\include \
-	-I..\..\src\mmedia\..\..\include -Hu -H=$(OBJS)\wxprec_mmedialib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS =  \
-	$(OBJS)\mmedialib_dummy.obj \
-	$(OBJS)\mmedialib_cdwin.obj \
-	$(OBJS)\mmedialib_sndwin.obj \
-	$(OBJS)\mmedialib_vidwin.obj \
-	$(OBJS)\mmedialib_cdbase.obj \
-	$(OBJS)\mmedialib_g711.obj \
-	$(OBJS)\mmedialib_g721.obj \
-	$(OBJS)\mmedialib_g723_24.obj \
-	$(OBJS)\mmedialib_g723_40.obj \
-	$(OBJS)\mmedialib_g72x.obj \
-	$(OBJS)\mmedialib_sndaiff.obj \
-	$(OBJS)\mmedialib_sndbase.obj \
-	$(OBJS)\mmedialib_sndcodec.obj \
-	$(OBJS)\mmedialib_sndcpcm.obj \
-	$(OBJS)\mmedialib_sndfile.obj \
-	$(OBJS)\mmedialib_sndg72x.obj \
-	$(OBJS)\mmedialib_sndmsad.obj \
-	$(OBJS)\mmedialib_sndpcm.obj \
-	$(OBJS)\mmedialib_sndulaw.obj \
-	$(OBJS)\mmedialib_sndwav.obj \
-	$(OBJS)\mmedialib_vidbase.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__mmediadll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__mmedialib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__mmediadll___depname) $(__mmedialib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj  $(MMEDIADLL_OBJECTS)  $(OBJS)\mmediadll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\mmediadll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib: $(OBJS)\mmedialib_dummy.obj  $(MMEDIALIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(MMEDIALIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $**
-
-$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.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..\..\src\mmedia\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG) $**
-
-$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) -H $**
-
-$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp
-	$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $**
-
diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc
deleted file mode 100644
index 22393d55aa..0000000000
--- a/contrib/build/mmedia/makefile.gcc
+++ /dev/null
@@ -1,425 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\mmedia\..\..\..\include -W \
-	-Wall -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-MMEDIADLL_OBJECTS =  \
-	$(OBJS)\mmediadll_dummy.o \
-	$(OBJS)\mmediadll_version_rc.o \
-	$(OBJS)\mmediadll_cdwin.o \
-	$(OBJS)\mmediadll_sndwin.o \
-	$(OBJS)\mmediadll_vidwin.o \
-	$(OBJS)\mmediadll_cdbase.o \
-	$(OBJS)\mmediadll_g711.o \
-	$(OBJS)\mmediadll_g721.o \
-	$(OBJS)\mmediadll_g723_24.o \
-	$(OBJS)\mmediadll_g723_40.o \
-	$(OBJS)\mmediadll_g72x.o \
-	$(OBJS)\mmediadll_sndaiff.o \
-	$(OBJS)\mmediadll_sndbase.o \
-	$(OBJS)\mmediadll_sndcodec.o \
-	$(OBJS)\mmediadll_sndcpcm.o \
-	$(OBJS)\mmediadll_sndfile.o \
-	$(OBJS)\mmediadll_sndg72x.o \
-	$(OBJS)\mmediadll_sndmsad.o \
-	$(OBJS)\mmediadll_sndpcm.o \
-	$(OBJS)\mmediadll_sndulaw.o \
-	$(OBJS)\mmediadll_sndwav.o \
-	$(OBJS)\mmediadll_vidbase.o
-MMEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\mmedia\..\..\..\include -W \
-	-Wall -I..\..\src\mmedia\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS =  \
-	$(OBJS)\mmedialib_dummy.o \
-	$(OBJS)\mmedialib_cdwin.o \
-	$(OBJS)\mmedialib_sndwin.o \
-	$(OBJS)\mmedialib_vidwin.o \
-	$(OBJS)\mmedialib_cdbase.o \
-	$(OBJS)\mmedialib_g711.o \
-	$(OBJS)\mmedialib_g721.o \
-	$(OBJS)\mmedialib_g723_24.o \
-	$(OBJS)\mmedialib_g723_40.o \
-	$(OBJS)\mmedialib_g72x.o \
-	$(OBJS)\mmedialib_sndaiff.o \
-	$(OBJS)\mmedialib_sndbase.o \
-	$(OBJS)\mmedialib_sndcodec.o \
-	$(OBJS)\mmedialib_sndcpcm.o \
-	$(OBJS)\mmedialib_sndfile.o \
-	$(OBJS)\mmedialib_sndg72x.o \
-	$(OBJS)\mmedialib_sndmsad.o \
-	$(OBJS)\mmedialib_sndpcm.o \
-	$(OBJS)\mmedialib_sndulaw.o \
-	$(OBJS)\mmedialib_sndwav.o \
-	$(OBJS)\mmedialib_vidbase.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__mmediadll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__mmedialib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__mmediadll___depname) $(__mmedialib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a: $(MMEDIALIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(MMEDIALIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_version_rc.o: ../../src/mmedia/../../../src/msw/version.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 ../../src/mmedia/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG)
-
-$(OBJS)\mmediadll_cdwin.o: ../../src/mmedia/cdwin.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndwin.o: ../../src/mmedia/sndwin.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_vidwin.o: ../../src/mmedia/vidwin.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_cdbase.o: ../../src/mmedia/cdbase.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_g711.o: ../../src/mmedia/g711.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_g721.o: ../../src/mmedia/g721.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_g723_24.o: ../../src/mmedia/g723_24.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_g723_40.o: ../../src/mmedia/g723_40.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_g72x.o: ../../src/mmedia/g72x.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndaiff.o: ../../src/mmedia/sndaiff.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndbase.o: ../../src/mmedia/sndbase.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndcodec.o: ../../src/mmedia/sndcodec.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndfile.o: ../../src/mmedia/sndfile.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndg72x.o: ../../src/mmedia/sndg72x.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndmsad.o: ../../src/mmedia/sndmsad.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndpcm.o: ../../src/mmedia/sndpcm.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndulaw.o: ../../src/mmedia/sndulaw.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_sndwav.o: ../../src/mmedia/sndwav.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia/vidbase.cpp
-	$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia/cdwin.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndwin.o: ../../src/mmedia/sndwin.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_vidwin.o: ../../src/mmedia/vidwin.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_cdbase.o: ../../src/mmedia/cdbase.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_g711.o: ../../src/mmedia/g711.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_g721.o: ../../src/mmedia/g721.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_g723_24.o: ../../src/mmedia/g723_24.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_g723_40.o: ../../src/mmedia/g723_40.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_g72x.o: ../../src/mmedia/g72x.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndaiff.o: ../../src/mmedia/sndaiff.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndbase.o: ../../src/mmedia/sndbase.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndcodec.o: ../../src/mmedia/sndcodec.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndcpcm.o: ../../src/mmedia/sndcpcm.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndfile.o: ../../src/mmedia/sndfile.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndg72x.o: ../../src/mmedia/sndg72x.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndmsad.o: ../../src/mmedia/sndmsad.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndpcm.o: ../../src/mmedia/sndpcm.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndulaw.o: ../../src/mmedia/sndulaw.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_sndwav.o: ../../src/mmedia/sndwav.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmedialib_vidbase.o: ../../src/mmedia/vidbase.cpp
-	$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/mmedia/makefile.vc b/contrib/build/mmedia/makefile.vc
deleted file mode 100644
index 010aa8e62f..0000000000
--- a/contrib/build/mmedia/makefile.vc
+++ /dev/null
@@ -1,514 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\mmedia\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\mmedia\..\..\..\include /W4 /I..\..\src\mmedia\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_MMEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mmediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
-MMEDIADLL_OBJECTS =  \
-	$(OBJS)\mmediadll_dummy.obj \
-	$(OBJS)\mmediadll_version.res \
-	$(OBJS)\mmediadll_cdwin.obj \
-	$(OBJS)\mmediadll_sndwin.obj \
-	$(OBJS)\mmediadll_vidwin.obj \
-	$(OBJS)\mmediadll_cdbase.obj \
-	$(OBJS)\mmediadll_g711.obj \
-	$(OBJS)\mmediadll_g721.obj \
-	$(OBJS)\mmediadll_g723_24.obj \
-	$(OBJS)\mmediadll_g723_40.obj \
-	$(OBJS)\mmediadll_g72x.obj \
-	$(OBJS)\mmediadll_sndaiff.obj \
-	$(OBJS)\mmediadll_sndbase.obj \
-	$(OBJS)\mmediadll_sndcodec.obj \
-	$(OBJS)\mmediadll_sndcpcm.obj \
-	$(OBJS)\mmediadll_sndfile.obj \
-	$(OBJS)\mmediadll_sndg72x.obj \
-	$(OBJS)\mmediadll_sndmsad.obj \
-	$(OBJS)\mmediadll_sndpcm.obj \
-	$(OBJS)\mmediadll_sndulaw.obj \
-	$(OBJS)\mmediadll_sndwav.obj \
-	$(OBJS)\mmediadll_vidbase.obj
-MMEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\mmedia\..\..\..\include /W4 /I..\..\src\mmedia\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_mmedialib.pch" $(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS =  \
-	$(OBJS)\mmedialib_dummy.obj \
-	$(OBJS)\mmedialib_cdwin.obj \
-	$(OBJS)\mmedialib_sndwin.obj \
-	$(OBJS)\mmedialib_vidwin.obj \
-	$(OBJS)\mmedialib_cdbase.obj \
-	$(OBJS)\mmedialib_g711.obj \
-	$(OBJS)\mmedialib_g721.obj \
-	$(OBJS)\mmedialib_g723_24.obj \
-	$(OBJS)\mmedialib_g723_40.obj \
-	$(OBJS)\mmedialib_g72x.obj \
-	$(OBJS)\mmedialib_sndaiff.obj \
-	$(OBJS)\mmedialib_sndbase.obj \
-	$(OBJS)\mmedialib_sndcodec.obj \
-	$(OBJS)\mmedialib_sndcpcm.obj \
-	$(OBJS)\mmedialib_sndfile.obj \
-	$(OBJS)\mmedialib_sndg72x.obj \
-	$(OBJS)\mmedialib_sndmsad.obj \
-	$(OBJS)\mmedialib_sndpcm.obj \
-	$(OBJS)\mmedialib_sndulaw.obj \
-	$(OBJS)\mmedialib_sndwav.obj \
-	$(OBJS)\mmedialib_vidbase.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__mmediadll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__mmedialib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__mmediadll___depname) $(__mmedialib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj  $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(MMEDIADLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib: $(OBJS)\mmedialib_dummy.obj  $(MMEDIALIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(MMEDIALIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\mmedia\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG) $**
-
-$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
-$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $**
-
diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat
deleted file mode 100644
index 1b1709786a..0000000000
--- a/contrib/build/mmedia/makefile.wat
+++ /dev/null
@@ -1,461 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__mmediadll___depname =
-!ifeq SHARED 1
-__mmediadll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__mmedialib___depname =
-!ifeq SHARED 0
-__mmedialib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\mmedia\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA &
-	/fh=$(OBJS)\wxprec_mmediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-MMEDIADLL_OBJECTS =  &
-	$(OBJS)\mmediadll_dummy.obj &
-	$(OBJS)\mmediadll_cdwin.obj &
-	$(OBJS)\mmediadll_sndwin.obj &
-	$(OBJS)\mmediadll_vidwin.obj &
-	$(OBJS)\mmediadll_cdbase.obj &
-	$(OBJS)\mmediadll_g711.obj &
-	$(OBJS)\mmediadll_g721.obj &
-	$(OBJS)\mmediadll_g723_24.obj &
-	$(OBJS)\mmediadll_g723_40.obj &
-	$(OBJS)\mmediadll_g72x.obj &
-	$(OBJS)\mmediadll_sndaiff.obj &
-	$(OBJS)\mmediadll_sndbase.obj &
-	$(OBJS)\mmediadll_sndcodec.obj &
-	$(OBJS)\mmediadll_sndcpcm.obj &
-	$(OBJS)\mmediadll_sndfile.obj &
-	$(OBJS)\mmediadll_sndg72x.obj &
-	$(OBJS)\mmediadll_sndmsad.obj &
-	$(OBJS)\mmediadll_sndpcm.obj &
-	$(OBJS)\mmediadll_sndulaw.obj &
-	$(OBJS)\mmediadll_sndwav.obj &
-	$(OBJS)\mmediadll_vidbase.obj
-MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\mmedia\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\mmedia\..\..\include /fh=$(OBJS)\wxprec_mmedialib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS =  &
-	$(OBJS)\mmedialib_dummy.obj &
-	$(OBJS)\mmedialib_cdwin.obj &
-	$(OBJS)\mmedialib_sndwin.obj &
-	$(OBJS)\mmedialib_vidwin.obj &
-	$(OBJS)\mmedialib_cdbase.obj &
-	$(OBJS)\mmedialib_g711.obj &
-	$(OBJS)\mmedialib_g721.obj &
-	$(OBJS)\mmedialib_g723_24.obj &
-	$(OBJS)\mmedialib_g723_40.obj &
-	$(OBJS)\mmedialib_g72x.obj &
-	$(OBJS)\mmedialib_sndaiff.obj &
-	$(OBJS)\mmedialib_sndbase.obj &
-	$(OBJS)\mmedialib_sndcodec.obj &
-	$(OBJS)\mmedialib_sndcpcm.obj &
-	$(OBJS)\mmedialib_sndfile.obj &
-	$(OBJS)\mmedialib_sndg72x.obj &
-	$(OBJS)\mmedialib_sndmsad.obj &
-	$(OBJS)\mmedialib_sndpcm.obj &
-	$(OBJS)\mmedialib_sndulaw.obj &
-	$(OBJS)\mmedialib_sndwav.obj &
-	$(OBJS)\mmedialib_vidbase.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__mmediadll___depname) $(__mmedialib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG).dll :  $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
-	@%create $(OBJS)\mmediadll.lbc
-	@%append $(OBJS)\mmediadll.lbc option quiet
-	@%append $(OBJS)\mmediadll.lbc name $^@
-	@%append $(OBJS)\mmediadll.lbc option caseexact
-	@%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
-	@%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res
-	@%append $(OBJS)\mmediadll.lbc system nt_dll
-	wlink @$(OBJS)\mmediadll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib :  $(MMEDIALIB_OBJECTS)
-	@%create $(OBJS)\mmedialib.lbc
-	@for %i in ($(MMEDIALIB_OBJECTS)) do @%append $(OBJS)\mmedialib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\mmedialib.lbc
-!endif
-
-$(OBJS)\mmediadll_dummy.obj :  .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_version.res :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.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=..\..\src\mmedia\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $<
-
-$(OBJS)\mmediadll_cdwin.obj :  .AUTODEPEND ../../src/mmedia\cdwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndwin.obj :  .AUTODEPEND ../../src/mmedia\sndwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_vidwin.obj :  .AUTODEPEND ../../src/mmedia\vidwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_cdbase.obj :  .AUTODEPEND ../../src/mmedia\cdbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_g711.obj :  .AUTODEPEND ../../src/mmedia\g711.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_g721.obj :  .AUTODEPEND ../../src/mmedia\g721.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_g723_24.obj :  .AUTODEPEND ../../src/mmedia\g723_24.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_g723_40.obj :  .AUTODEPEND ../../src/mmedia\g723_40.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_g72x.obj :  .AUTODEPEND ../../src/mmedia\g72x.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndaiff.obj :  .AUTODEPEND ../../src/mmedia\sndaiff.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndbase.obj :  .AUTODEPEND ../../src/mmedia\sndbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndcodec.obj :  .AUTODEPEND ../../src/mmedia\sndcodec.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndcpcm.obj :  .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndfile.obj :  .AUTODEPEND ../../src/mmedia\sndfile.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndg72x.obj :  .AUTODEPEND ../../src/mmedia\sndg72x.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndmsad.obj :  .AUTODEPEND ../../src/mmedia\sndmsad.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndpcm.obj :  .AUTODEPEND ../../src/mmedia\sndpcm.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndulaw.obj :  .AUTODEPEND ../../src/mmedia\sndulaw.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_sndwav.obj :  .AUTODEPEND ../../src/mmedia\sndwav.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmediadll_vidbase.obj :  .AUTODEPEND ../../src/mmedia\vidbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_dummy.obj :  .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_cdwin.obj :  .AUTODEPEND ../../src/mmedia\cdwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndwin.obj :  .AUTODEPEND ../../src/mmedia\sndwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_vidwin.obj :  .AUTODEPEND ../../src/mmedia\vidwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_cdbase.obj :  .AUTODEPEND ../../src/mmedia\cdbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_g711.obj :  .AUTODEPEND ../../src/mmedia\g711.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_g721.obj :  .AUTODEPEND ../../src/mmedia\g721.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_g723_24.obj :  .AUTODEPEND ../../src/mmedia\g723_24.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_g723_40.obj :  .AUTODEPEND ../../src/mmedia\g723_40.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_g72x.obj :  .AUTODEPEND ../../src/mmedia\g72x.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndaiff.obj :  .AUTODEPEND ../../src/mmedia\sndaiff.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndbase.obj :  .AUTODEPEND ../../src/mmedia\sndbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndcodec.obj :  .AUTODEPEND ../../src/mmedia\sndcodec.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndcpcm.obj :  .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndfile.obj :  .AUTODEPEND ../../src/mmedia\sndfile.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndg72x.obj :  .AUTODEPEND ../../src/mmedia\sndg72x.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndmsad.obj :  .AUTODEPEND ../../src/mmedia\sndmsad.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndpcm.obj :  .AUTODEPEND ../../src/mmedia\sndpcm.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndulaw.obj :  .AUTODEPEND ../../src/mmedia\sndulaw.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_sndwav.obj :  .AUTODEPEND ../../src/mmedia\sndwav.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
-$(OBJS)\mmedialib_vidbase.obj :  .AUTODEPEND ../../src/mmedia\vidbase.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
-
diff --git a/contrib/build/mmedia/mmedia.bkl b/contrib/build/mmedia/mmedia.bkl
deleted file mode 100644
index f14f68ce9c..0000000000
--- a/contrib/build/mmedia/mmedia.bkl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <if cond="FORMAT=='autoconf'">
-        <option name="EXTRALIBS_ESD"/>
-    </if>
-
-    <set var="MMEDIA_UNIX_SRC" hints="files">
-        cdunix.cpp
-        sndesd.cpp
-        sndoss.cpp
-        vidxanm.cpp
-    </set>
-
-    <set var="MMEDIA_WIN32_SRC" hints="files">
-        cdwin.cpp
-        sndwin.cpp
-        vidwin.cpp
-    </set>
-
-    <set var="MMEDIA_PLATFORM_SRC" hints="files">
-        <if cond="PLATFORM_UNIX=='1'">$(MMEDIA_UNIX_SRC)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(MMEDIA_WIN32_SRC)</if>
-    </set>
-
-    <set var="MMEDIA_SRC" hints="files">
-        $(MMEDIA_PLATFORM_SRC)
-        cdbase.cpp
-        g711.cpp
-        g721.cpp
-        g723_24.cpp
-        g723_40.cpp
-        g72x.cpp
-        sndaiff.cpp
-        sndbase.cpp
-        sndcodec.cpp
-        sndcpcm.cpp
-        sndfile.cpp
-        sndg72x.cpp
-        sndmsad.cpp
-        sndpcm.cpp
-        sndulaw.cpp
-        sndwav.cpp
-        vidbase.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/mmedia/cdbase.h
-            wx/mmedia/cdunix.h
-            wx/mmedia/cdwin.h
-            wx/mmedia/sndaiff.h
-            wx/mmedia/sndbase.h
-            wx/mmedia/sndcodec.h
-            wx/mmedia/sndcpcm.h
-            wx/mmedia/sndesd.h
-            wx/mmedia/sndfile.h
-            wx/mmedia/sndg72x.h
-            wx/mmedia/sndmsad.h
-            wx/mmedia/sndoss.h
-            wx/mmedia/sndpcm.h
-            wx/mmedia/sndulaw.h
-            wx/mmedia/sndwav.h
-            wx/mmedia/sndwin.h
-            wx/mmedia/vidbase.h
-            wx/mmedia/vidwin.h
-            wx/mmedia/vidxanm.h
-        </files>
-    </headers>
-
-    <dll id="mmediadll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_MMEDIA</define>
-        <sources>$(MMEDIA_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <ldflags cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldflags>
-    </dll>
-    
-    <lib id="mmedialib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(MMEDIA_SRC)</sources>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmedialib+mmediadll</set>
-
-</makefile>
-
diff --git a/contrib/build/mmedia/mmedia.dsp b/contrib/build/mmedia/mmedia.dsp
deleted file mode 100644
index 9f3a37530f..0000000000
--- a/contrib/build/mmedia/mmedia.dsp
+++ /dev/null
@@ -1,605 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mmedia" - 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=mmedia - 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 "mmedia.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 "mmedia.mak" CFG="mmedia - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mmedia - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mmedia - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mmedia - Win32 Debug" (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)" == "mmedia - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29u_mmedia.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29u_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /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_MMEDIA" /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_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29ud_mmedia.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29ud_mmedia.lib" /debug
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29_mmedia.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29d_mmedia.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv290d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmswuniv29d_mmedia.lib" /debug
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswu" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290u_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswu" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290u_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29u_mmedia.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29u_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswud" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290ud_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswud" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290ud_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29ud_mmedia.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29ud_mmedia.lib" /debug
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\msw" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\msw" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\msw" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\msw" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29_mmedia.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_dll\mswd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswd" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290d_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\lib\vc_dll\mswd" /i "..\..\src\mmedia\..\..\..\include" /d WXDLLNAME=wxmsw290d_mmedia_vc_custom /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29d_mmedia.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw290d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_dll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_dll\wxmsw29d_mmedia.lib" /debug
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29u_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29u_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29ud_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29ud_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29d_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmswuniv29d_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswu" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29u_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29u_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswud" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29ud_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29ud_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\msw" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\msw" /I "..\..\src\mmedia\..\..\..\include" /W4 /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29_mmedia.lib"
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\mmedia"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\mmedia"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\mmedia\..\..\..\lib\vc_lib\mswd" /I "..\..\src\mmedia\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29d_mmedia.lib"
-# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_lib\wxmsw29d_mmedia.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "mmedia - Win32 DLL Universal Unicode Release"
-# Name "mmedia - Win32 DLL Universal Unicode Debug"
-# Name "mmedia - Win32 DLL Universal Release"
-# Name "mmedia - Win32 DLL Universal Debug"
-# Name "mmedia - Win32 DLL Unicode Release"
-# Name "mmedia - Win32 DLL Unicode Debug"
-# Name "mmedia - Win32 DLL Release"
-# Name "mmedia - Win32 DLL Debug"
-# Name "mmedia - Win32 Universal Unicode Release"
-# Name "mmedia - Win32 Universal Unicode Debug"
-# Name "mmedia - Win32 Universal Release"
-# Name "mmedia - Win32 Universal Debug"
-# Name "mmedia - Win32 Unicode Release"
-# Name "mmedia - Win32 Unicode Debug"
-# Name "mmedia - Win32 Release"
-# Name "mmedia - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/mmedia\cdbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\cdwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\g711.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\g721.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\g723_24.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\g723_40.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\g72x.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndaiff.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndcodec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndcpcm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndg72x.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndmsad.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndpcm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndulaw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndwav.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\sndwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "mmedia - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "mmedia - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\vidbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/mmedia\vidwin.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/mmedia/mmedia.dsw b/contrib/build/mmedia/mmedia.dsw
deleted file mode 100644
index b25e9807ce..0000000000
--- a/contrib/build/mmedia/mmedia.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "mmedia"=mmedia.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/net/makefile.bcc b/contrib/build/net/makefile.bcc
deleted file mode 100644
index 4183365a11..0000000000
--- a/contrib/build/net/makefile.bcc
+++ /dev/null
@@ -1,293 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\net\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-NETUTILSDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\net\..\..\..\include \
-	-I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS -Hu \
-	-H=$(OBJS)\wxprec_netutilsdll.csm $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSDLL_OBJECTS =  \
-	$(OBJS)\netutilsdll_dummy.obj \
-	$(OBJS)\netutilsdll_email.obj \
-	$(OBJS)\netutilsdll_smapi.obj \
-	$(OBJS)\netutilsdll_web.obj
-NETUTILSLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\net\..\..\..\include \
-	-I..\..\src\net\..\..\include -Hu -H=$(OBJS)\wxprec_netutilslib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS =  \
-	$(OBJS)\netutilslib_dummy.obj \
-	$(OBJS)\netutilslib_email.obj \
-	$(OBJS)\netutilslib_smapi.obj \
-	$(OBJS)\netutilslib_web.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__netutilsdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__netutilslib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__netutilsdll___depname) $(__netutilslib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj  $(NETUTILSDLL_OBJECTS)  $(OBJS)\netutilsdll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\netutilsdll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib: $(OBJS)\netutilslib_dummy.obj  $(NETUTILSLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(NETUTILSLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) -H $**
-
-$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.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..\..\src\net\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG) $**
-
-$(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) -H $**
-
-$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_smapi.obj: ../../src/net\smapi.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_web.obj: ../../src/net\web.cpp
-	$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
deleted file mode 100644
index ed230ca904..0000000000
--- a/contrib/build/net/makefile.gcc
+++ /dev/null
@@ -1,289 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\net\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-NETUTILSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\net\..\..\..\include -W \
-	-Wall -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-NETUTILSDLL_OBJECTS =  \
-	$(OBJS)\netutilsdll_dummy.o \
-	$(OBJS)\netutilsdll_version_rc.o \
-	$(OBJS)\netutilsdll_email.o \
-	$(OBJS)\netutilsdll_smapi.o \
-	$(OBJS)\netutilsdll_web.o
-NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\net\..\..\..\include -W \
-	-Wall -I..\..\src\net\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS =  \
-	$(OBJS)\netutilslib_dummy.o \
-	$(OBJS)\netutilslib_email.o \
-	$(OBJS)\netutilslib_smapi.o \
-	$(OBJS)\netutilslib_web.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__netutilsdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__netutilslib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__netutilsdll___depname) $(__netutilslib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a: $(NETUTILSLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(NETUTILSLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilsdll_version_rc.o: ../../src/net/../../../src/msw/version.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 ../../src/net/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG)
-
-$(OBJS)\netutilsdll_email.o: ../../src/net/email.cpp
-	$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilsdll_smapi.o: ../../src/net/smapi.cpp
-	$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilsdll_web.o: ../../src/net/web.cpp
-	$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilslib_email.o: ../../src/net/email.cpp
-	$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilslib_smapi.o: ../../src/net/smapi.cpp
-	$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\netutilslib_web.o: ../../src/net/web.cpp
-	$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc
deleted file mode 100644
index 67a625c2e1..0000000000
--- a/contrib/build/net/makefile.vc
+++ /dev/null
@@ -1,379 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\net\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-NETUTILSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\net\..\..\..\include /W4 /I..\..\src\net\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_NETUTILS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilsdll.pch" $(CPPFLAGS) \
-	$(CXXFLAGS)
-NETUTILSDLL_OBJECTS =  \
-	$(OBJS)\netutilsdll_dummy.obj \
-	$(OBJS)\netutilsdll_version.res \
-	$(OBJS)\netutilsdll_email.obj \
-	$(OBJS)\netutilsdll_smapi.obj \
-	$(OBJS)\netutilsdll_web.obj
-NETUTILSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\net\..\..\..\include /W4 /I..\..\src\net\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_netutilslib.pch" $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS =  \
-	$(OBJS)\netutilslib_dummy.obj \
-	$(OBJS)\netutilslib_email.obj \
-	$(OBJS)\netutilslib_smapi.obj \
-	$(OBJS)\netutilslib_web.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__netutilsdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__netutilslib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__netutilsdll___depname) $(__netutilslib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj  $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(NETUTILSDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib: $(OBJS)\netutilslib_dummy.obj  $(NETUTILSLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(NETUTILSLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\net\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG) $**
-
-$(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_smapi.obj: ../../src/net\smapi.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $**
-
-$(OBJS)\netutilslib_web.obj: ../../src/net\web.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat
deleted file mode 100644
index eef98eecde..0000000000
--- a/contrib/build/net/makefile.wat
+++ /dev/null
@@ -1,325 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__netutilsdll___depname =
-!ifeq SHARED 1
-__netutilsdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__netutilslib___depname =
-!ifeq SHARED 0
-__netutilslib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-NETUTILSDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\net\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\net\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS &
-	/fh=$(OBJS)\wxprec_netutilsdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-NETUTILSDLL_OBJECTS =  &
-	$(OBJS)\netutilsdll_dummy.obj &
-	$(OBJS)\netutilsdll_email.obj &
-	$(OBJS)\netutilsdll_smapi.obj &
-	$(OBJS)\netutilsdll_web.obj
-NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\net\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\net\..\..\include /fh=$(OBJS)\wxprec_netutilslib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS =  &
-	$(OBJS)\netutilslib_dummy.obj &
-	$(OBJS)\netutilslib_email.obj &
-	$(OBJS)\netutilslib_smapi.obj &
-	$(OBJS)\netutilslib_web.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__netutilsdll___depname) $(__netutilslib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll :  $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
-	@%create $(OBJS)\netutilsdll.lbc
-	@%append $(OBJS)\netutilsdll.lbc option quiet
-	@%append $(OBJS)\netutilsdll.lbc name $^@
-	@%append $(OBJS)\netutilsdll.lbc option caseexact
-	@%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
-	@%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res
-	@%append $(OBJS)\netutilsdll.lbc system nt_dll
-	wlink @$(OBJS)\netutilsdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib :  $(NETUTILSLIB_OBJECTS)
-	@%create $(OBJS)\netutilslib.lbc
-	@for %i in ($(NETUTILSLIB_OBJECTS)) do @%append $(OBJS)\netutilslib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\netutilslib.lbc
-!endif
-
-$(OBJS)\netutilsdll_dummy.obj :  .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
-
-$(OBJS)\netutilsdll_version.res :  .AUTODEPEND ../../src/net\..\..\..\src\msw\version.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=..\..\src\net\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG) $<
-
-$(OBJS)\netutilsdll_email.obj :  .AUTODEPEND ../../src/net\email.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
-
-$(OBJS)\netutilsdll_smapi.obj :  .AUTODEPEND ../../src/net\smapi.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
-
-$(OBJS)\netutilsdll_web.obj :  .AUTODEPEND ../../src/net\web.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
-
-$(OBJS)\netutilslib_dummy.obj :  .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
-
-$(OBJS)\netutilslib_email.obj :  .AUTODEPEND ../../src/net\email.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
-
-$(OBJS)\netutilslib_smapi.obj :  .AUTODEPEND ../../src/net\smapi.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
-
-$(OBJS)\netutilslib_web.obj :  .AUTODEPEND ../../src/net\web.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/net/net.bkl b/contrib/build/net/net.bkl
deleted file mode 100644
index a521dac043..0000000000
--- a/contrib/build/net/net.bkl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="NETUTILS_SRC">
-        email.cpp
-        smapi.cpp
-        web.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/net/email.h
-            wx/net/msg.h
-            wx/net/smapi.h
-            wx/net/web.h
-        </files>
-    </headers>
-
-    <dll id="netutilsdll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_NETUTILS</define>
-        <sources>$(NETUTILS_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <cppflags-dmars>-w3</cppflags-dmars>
-    </dll>
-    
-    <lib id="netutilslib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(NETUTILS_SRC)</sources>
-        <cppflags-dmars>-w3</cppflags-dmars>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilslib+netutilsdll</set>
-
-</makefile>
diff --git a/contrib/build/net/net.dsp b/contrib/build/net/net.dsp
deleted file mode 100644
index a0fe10f9bb..0000000000
--- a/contrib/build/net/net.dsp
+++ /dev/null
@@ -1,537 +0,0 @@
-# Microsoft Developer Studio Project File - Name="net" - 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 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 "net.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 "net.mak" CFG="netutils - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "netutils - Win32 DLL Universal Unicode 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 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 Unicode 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Debug" (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)" == "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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290u_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290u_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 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_netutils_vc_custom /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 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29u_netutils.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29u_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290ud_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290ud_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_netutils_vc_custom /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 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29ud_netutils.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29ud_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290_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 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290_netutils_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290d_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_netutils_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv290d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv29d_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290u_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290u_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 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290u_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290u_netutils_vc_custom /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 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29u_netutils.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29u_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290ud_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290ud_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290ud_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290ud_netutils_vc_custom /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 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29ud_netutils.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29ud_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290_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 0x409 /d "__WXMSW__" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290_netutils_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290d_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /I "..\..\src\net\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290d_netutils_vc_custom /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\..\include" /d WXDLLNAME=wxmsw290d_netutils_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw290d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw29d_netutils.lib" /debug
-
-!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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29u_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29u_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29u_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29ud_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29ud_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29ud_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29d_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv29d_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29u_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29u_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29u_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29ud_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29ud_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29ud_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29_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 /MD /O2 /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /I "..\..\src\net\..\..\..\include" /W4 /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29_netutils.lib"
-
-!ELSEIF  "$(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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29d_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 /MDd /Od /GR /EHsc /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /I "..\..\src\net\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw29d_netutils.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "netutils - Win32 DLL Universal Unicode Release"
-# Name "netutils - Win32 DLL Universal Unicode Debug"
-# Name "netutils - Win32 DLL Universal Release"
-# Name "netutils - Win32 DLL Universal Debug"
-# Name "netutils - Win32 DLL Unicode Release"
-# Name "netutils - Win32 DLL Unicode Debug"
-# Name "netutils - Win32 DLL Release"
-# Name "netutils - Win32 DLL Debug"
-# Name "netutils - Win32 Universal Unicode Release"
-# Name "netutils - Win32 Universal Unicode Debug"
-# Name "netutils - Win32 Universal Release"
-# Name "netutils - Win32 Universal Debug"
-# Name "netutils - Win32 Unicode Release"
-# Name "netutils - Win32 Unicode Debug"
-# Name "netutils - Win32 Release"
-# Name "netutils - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/net\..\..\..\src\common\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\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "netutils - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# 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/net/net.dsw b/contrib/build/net/net.dsw
deleted file mode 100644
index 1e73e8b66d..0000000000
--- a/contrib/build/net/net.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "netutils"=net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc
deleted file mode 100644
index 66a0ecb7eb..0000000000
--- a/contrib/build/ogl/makefile.bcc
+++ /dev/null
@@ -1,365 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\ogl\..\..\..\include \
-	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -Hu \
-	-H=$(OBJS)\wxprec_ogldll.csm $(CPPFLAGS) $(CXXFLAGS)
-OGLDLL_OBJECTS =  \
-	$(OBJS)\ogldll_dummy.obj \
-	$(OBJS)\ogldll_basic2.obj \
-	$(OBJS)\ogldll_canvas.obj \
-	$(OBJS)\ogldll_divided.obj \
-	$(OBJS)\ogldll_mfutils.obj \
-	$(OBJS)\ogldll_oglmisc.obj \
-	$(OBJS)\ogldll_basic.obj \
-	$(OBJS)\ogldll_composit.obj \
-	$(OBJS)\ogldll_drawn.obj \
-	$(OBJS)\ogldll_bmpshape.obj \
-	$(OBJS)\ogldll_constrnt.obj \
-	$(OBJS)\ogldll_lines.obj \
-	$(OBJS)\ogldll_ogldiag.obj
-OGLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\ogl\..\..\..\include \
-	-I..\..\src\ogl\..\..\include -Hu -H=$(OBJS)\wxprec_ogllib.csm $(CPPFLAGS) \
-	$(CXXFLAGS)
-OGLLIB_OBJECTS =  \
-	$(OBJS)\ogllib_dummy.obj \
-	$(OBJS)\ogllib_basic2.obj \
-	$(OBJS)\ogllib_canvas.obj \
-	$(OBJS)\ogllib_divided.obj \
-	$(OBJS)\ogllib_mfutils.obj \
-	$(OBJS)\ogllib_oglmisc.obj \
-	$(OBJS)\ogllib_basic.obj \
-	$(OBJS)\ogllib_composit.obj \
-	$(OBJS)\ogllib_drawn.obj \
-	$(OBJS)\ogllib_bmpshape.obj \
-	$(OBJS)\ogllib_constrnt.obj \
-	$(OBJS)\ogllib_lines.obj \
-	$(OBJS)\ogllib_ogldiag.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__ogllib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__ogldll___depname) $(__ogllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS)  $(OBJS)\ogldll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\ogldll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib: $(OBJS)\ogllib_dummy.obj  $(OGLLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(OGLLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
-
-$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.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..\..\src\ogl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG) $**
-
-$(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
-	$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $**
-
-$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
-	$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
deleted file mode 100644
index 5fbd4955d2..0000000000
--- a/contrib/build/ogl/makefile.gcc
+++ /dev/null
@@ -1,360 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\ogl\..\..\..\include -W -Wall \
-	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(__RTTIFLAG) \
-	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-OGLDLL_OBJECTS =  \
-	$(OBJS)\ogldll_dummy.o \
-	$(OBJS)\ogldll_version_rc.o \
-	$(OBJS)\ogldll_basic2.o \
-	$(OBJS)\ogldll_canvas.o \
-	$(OBJS)\ogldll_divided.o \
-	$(OBJS)\ogldll_mfutils.o \
-	$(OBJS)\ogldll_oglmisc.o \
-	$(OBJS)\ogldll_basic.o \
-	$(OBJS)\ogldll_composit.o \
-	$(OBJS)\ogldll_drawn.o \
-	$(OBJS)\ogldll_bmpshape.o \
-	$(OBJS)\ogldll_constrnt.o \
-	$(OBJS)\ogldll_lines.o \
-	$(OBJS)\ogldll_ogldiag.o
-OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\ogl\..\..\..\include -W -Wall \
-	-I..\..\src\ogl\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-OGLLIB_OBJECTS =  \
-	$(OBJS)\ogllib_dummy.o \
-	$(OBJS)\ogllib_basic2.o \
-	$(OBJS)\ogllib_canvas.o \
-	$(OBJS)\ogllib_divided.o \
-	$(OBJS)\ogllib_mfutils.o \
-	$(OBJS)\ogllib_oglmisc.o \
-	$(OBJS)\ogllib_basic.o \
-	$(OBJS)\ogllib_composit.o \
-	$(OBJS)\ogllib_drawn.o \
-	$(OBJS)\ogllib_bmpshape.o \
-	$(OBJS)\ogllib_constrnt.o \
-	$(OBJS)\ogllib_lines.o \
-	$(OBJS)\ogllib_ogldiag.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__ogllib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__ogldll___depname) $(__ogllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a: $(OGLLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(OGLLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_version_rc.o: ../../src/ogl/../../../src/msw/version.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 ../../src/ogl/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG)
-
-$(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_canvas.o: ../../src/ogl/canvas.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_lines.o: ../../src/ogl/lines.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc
deleted file mode 100644
index 6db60eb661..0000000000
--- a/contrib/build/ogl/makefile.vc
+++ /dev/null
@@ -1,450 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\ogl\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\ogl\..\..\..\include /W4 /I..\..\src\ogl\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_OGL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogldll.pch" $(CPPFLAGS) $(CXXFLAGS)
-OGLDLL_OBJECTS =  \
-	$(OBJS)\ogldll_dummy.obj \
-	$(OBJS)\ogldll_version.res \
-	$(OBJS)\ogldll_basic2.obj \
-	$(OBJS)\ogldll_canvas.obj \
-	$(OBJS)\ogldll_divided.obj \
-	$(OBJS)\ogldll_mfutils.obj \
-	$(OBJS)\ogldll_oglmisc.obj \
-	$(OBJS)\ogldll_basic.obj \
-	$(OBJS)\ogldll_composit.obj \
-	$(OBJS)\ogldll_drawn.obj \
-	$(OBJS)\ogldll_bmpshape.obj \
-	$(OBJS)\ogldll_constrnt.obj \
-	$(OBJS)\ogldll_lines.obj \
-	$(OBJS)\ogldll_ogldiag.obj
-OGLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\ogl\..\..\..\include /W4 /I..\..\src\ogl\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS)
-OGLLIB_OBJECTS =  \
-	$(OBJS)\ogllib_dummy.obj \
-	$(OBJS)\ogllib_basic2.obj \
-	$(OBJS)\ogllib_canvas.obj \
-	$(OBJS)\ogllib_divided.obj \
-	$(OBJS)\ogllib_mfutils.obj \
-	$(OBJS)\ogllib_oglmisc.obj \
-	$(OBJS)\ogllib_basic.obj \
-	$(OBJS)\ogllib_composit.obj \
-	$(OBJS)\ogllib_drawn.obj \
-	$(OBJS)\ogllib_bmpshape.obj \
-	$(OBJS)\ogllib_constrnt.obj \
-	$(OBJS)\ogllib_lines.obj \
-	$(OBJS)\ogllib_ogldiag.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__ogllib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__ogldll___depname) $(__ogllib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj  $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(OGLDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib: $(OBJS)\ogllib_dummy.obj  $(OGLLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(OGLLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\ogl\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG) $**
-
-$(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
-
-$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
-$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
deleted file mode 100644
index df0c082360..0000000000
--- a/contrib/build/ogl/makefile.wat
+++ /dev/null
@@ -1,397 +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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__ogldll___depname =
-!ifeq SHARED 1
-__ogldll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__ogllib___depname =
-!ifeq SHARED 0
-__ogllib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\ogl\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL &
-	/fh=$(OBJS)\wxprec_ogldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-OGLDLL_OBJECTS =  &
-	$(OBJS)\ogldll_dummy.obj &
-	$(OBJS)\ogldll_basic2.obj &
-	$(OBJS)\ogldll_canvas.obj &
-	$(OBJS)\ogldll_divided.obj &
-	$(OBJS)\ogldll_mfutils.obj &
-	$(OBJS)\ogldll_oglmisc.obj &
-	$(OBJS)\ogldll_basic.obj &
-	$(OBJS)\ogldll_composit.obj &
-	$(OBJS)\ogldll_drawn.obj &
-	$(OBJS)\ogldll_bmpshape.obj &
-	$(OBJS)\ogldll_constrnt.obj &
-	$(OBJS)\ogldll_lines.obj &
-	$(OBJS)\ogldll_ogldiag.obj
-OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\ogl\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\ogl\..\..\include /fh=$(OBJS)\wxprec_ogllib.pch $(__RTTIFLAG) &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-OGLLIB_OBJECTS =  &
-	$(OBJS)\ogllib_dummy.obj &
-	$(OBJS)\ogllib_basic2.obj &
-	$(OBJS)\ogllib_canvas.obj &
-	$(OBJS)\ogllib_divided.obj &
-	$(OBJS)\ogllib_mfutils.obj &
-	$(OBJS)\ogllib_oglmisc.obj &
-	$(OBJS)\ogllib_basic.obj &
-	$(OBJS)\ogllib_composit.obj &
-	$(OBJS)\ogllib_drawn.obj &
-	$(OBJS)\ogllib_bmpshape.obj &
-	$(OBJS)\ogllib_constrnt.obj &
-	$(OBJS)\ogllib_lines.obj &
-	$(OBJS)\ogllib_ogldiag.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__ogldll___depname) $(__ogllib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll :  $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
-	@%create $(OBJS)\ogldll.lbc
-	@%append $(OBJS)\ogldll.lbc option quiet
-	@%append $(OBJS)\ogldll.lbc name $^@
-	@%append $(OBJS)\ogldll.lbc option caseexact
-	@%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
-	@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
-	@%append $(OBJS)\ogldll.lbc system nt_dll
-	wlink @$(OBJS)\ogldll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib :  $(OGLLIB_OBJECTS)
-	@%create $(OBJS)\ogllib.lbc
-	@for %i in ($(OGLLIB_OBJECTS)) do @%append $(OBJS)\ogllib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
-!endif
-
-$(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.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=..\..\src\ogl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
-
-$(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogldll_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
-
-$(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
-$(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
deleted file mode 100644
index 44aa5e89c2..0000000000
--- a/contrib/build/ogl/ogl.bkl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="OGL_SRC">
-        basic2.cpp
-	canvas.cpp
-	divided.cpp
-	mfutils.cpp
-	oglmisc.cpp
-	basic.cpp
-	composit.cpp
-	drawn.cpp
-	bmpshape.cpp
-	constrnt.cpp
-	lines.cpp
-	ogldiag.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/ogl/basic.h
-            wx/ogl/basicp.h
-            wx/ogl/bmpshape.h
-            wx/ogl/canvas.h
-            wx/ogl/composit.h
-            wx/ogl/constrnt.h
-            wx/ogl/divided.h
-            wx/ogl/drawn.h
-            wx/ogl/drawnp.h
-            wx/ogl/lines.h
-            wx/ogl/linesp.h
-            wx/ogl/mfutils.h
-            wx/ogl/misc.h
-            wx/ogl/ogldiag.h
-            wx/ogl/ogl.h
-        </files>
-    </headers>
-
-    <dll id="ogldll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_OGL</define>
-        <sources>$(OGL_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-
-    <lib id="ogllib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(OGL_SRC)</sources>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogllib+ogldll</set>
-
-</makefile>
diff --git a/contrib/build/ogl/ogl.dsp b/contrib/build/ogl/ogl.dsp
deleted file mode 100644
index 0075ef2119..0000000000
--- a/contrib/build/ogl/ogl.dsp
+++ /dev/null
@@ -1,573 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogl" - 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=ogl - 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 "ogl.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.mak" CFG="ogl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ogl - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogl - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogl - Win32 Debug" (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)" == "ogl - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_ogl_vc_custom /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 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29u_ogl.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_ogl_vc_custom /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 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29ud_ogl.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29ud_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290_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 /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290_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 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290_ogl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290d_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 /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_ogl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv290d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmswuniv29d_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswu" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswu" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290u_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswu" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290u_ogl_vc_custom /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 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29u_ogl.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswud" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswud" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290ud_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswud" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290ud_ogl_vc_custom /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 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29ud_ogl.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29ud_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\msw" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290_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 /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\msw" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290_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 0x409 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\msw" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\msw" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290_ogl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswd" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290d_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 /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_dll\mswd" /I "..\..\src\ogl\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290d_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 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290d_ogl_vc_custom /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\lib\vc_dll\mswd" /i "..\..\src\ogl\..\..\..\include" /d WXDLLNAME=wxmsw290d_ogl_vc_custom /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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29d_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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw290d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_dll" /implib:"..\..\src\ogl\..\..\..\lib\vc_dll\wxmsw29d_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29u_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29u_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29ud_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29ud_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29ud_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29_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 /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29d_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 /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmswuniv29d_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswu" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswu" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswud" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29ud_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 "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswud" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29ud_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 "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29ud_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\msw" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29_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 /MD /O2 /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\msw" /I "..\..\src\ogl\..\..\..\include" /W4 /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\ogl"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\ogl"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswd" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29d_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 /MDd /Od /GR /EHsc /I "..\..\src\ogl\..\..\..\lib\vc_lib\mswd" /I "..\..\src\ogl\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29d_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 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_lib\wxmsw29d_ogl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogl - Win32 DLL Universal Unicode Release"
-# Name "ogl - Win32 DLL Universal Unicode Debug"
-# Name "ogl - Win32 DLL Universal Release"
-# Name "ogl - Win32 DLL Universal Debug"
-# Name "ogl - Win32 DLL Unicode Release"
-# Name "ogl - Win32 DLL Unicode Debug"
-# Name "ogl - Win32 DLL Release"
-# Name "ogl - Win32 DLL Debug"
-# Name "ogl - Win32 Universal Unicode Release"
-# Name "ogl - Win32 Universal Unicode Debug"
-# Name "ogl - Win32 Universal Release"
-# Name "ogl - Win32 Universal Debug"
-# Name "ogl - Win32 Unicode Release"
-# Name "ogl - Win32 Unicode Debug"
-# Name "ogl - Win32 Release"
-# Name "ogl - Win32 Debug"
-# 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\common\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
-# Begin Source File
-
-SOURCE=../../src/ogl\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "ogl - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "ogl - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/ogl/ogl.dsw b/contrib/build/ogl/ogl.dsw
deleted file mode 100644
index bb71f75d5f..0000000000
--- a/contrib/build/ogl/ogl.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "ogl"=ogl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc
deleted file mode 100644
index a08d575cb8..0000000000
--- a/contrib/build/plot/makefile.bcc
+++ /dev/null
@@ -1,277 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\plot\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\plot\..\..\..\include \
-	-I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT -Hu \
-	-H=$(OBJS)\wxprec_plotdll.csm $(CPPFLAGS) $(CXXFLAGS)
-PLOTDLL_OBJECTS =  \
-	$(OBJS)\plotdll_dummy.obj \
-	$(OBJS)\plotdll_plot.obj
-PLOTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -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..\..\src\plot\..\..\..\include \
-	-I..\..\src\plot\..\..\include -Hu -H=$(OBJS)\wxprec_plotlib.csm \
-	$(CPPFLAGS) $(CXXFLAGS)
-PLOTLIB_OBJECTS =  \
-	$(OBJS)\plotlib_dummy.obj \
-	$(OBJS)\plotlib_plot.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__plotdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = mt
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!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_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__plotlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__plotdll___depname) $(__plotlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).tds
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ilc
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ild
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ilf
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).ils
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj  $(PLOTDLL_OBJECTS)  $(OBJS)\plotdll_version.res
-	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-	c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\plotdll_version.res
-|
-	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $@
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib: $(OBJS)\plotlib_dummy.obj  $(PLOTLIB_OBJECTS)
-	if exist $@ del $@
-	tlib /a /p4096 $@ @&&|
-	$(PLOTLIB_OBJECTS)
-|
-!endif
-
-$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $**
-
-$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.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..\..\src\plot\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG) $**
-
-$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
-	$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) $**
-
-$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) -H $**
-
-$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp
-	$(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc
deleted file mode 100644
index 0096fce299..0000000000
--- a/contrib/build/plot/makefile.gcc
+++ /dev/null
@@ -1,273 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\plot\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOTDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\plot\..\..\..\include -W \
-	-Wall -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-PLOTDLL_OBJECTS =  \
-	$(OBJS)\plotdll_dummy.o \
-	$(OBJS)\plotdll_version_rc.o \
-	$(OBJS)\plotdll_plot.o
-PLOTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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..\..\src\plot\..\..\..\include -W \
-	-Wall -I..\..\src\plot\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-PLOTLIB_OBJECTS =  \
-	$(OBJS)\plotlib_dummy.o \
-	$(OBJS)\plotlib_plot.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 ($(OFFICIAL_BUILD),0)
-VENDORTAG = _$(VENDOR)
-endif
-ifeq ($(OFFICIAL_BUILD),1)
-VENDORTAG = 
-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 ($(SHARED),1)
-__plotdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-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_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-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 ($(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 ($(SHARED),0)
-__plotlib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a
-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)
-__OPTIMIZEFLAG = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__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 ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__plotdll___depname) $(__plotlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_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)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a: $(PLOTLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(PLOTLIB_OBJECTS)
-	ranlib $@
-endif
-
-$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.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 ../../src/plot/../../../include --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG)
-
-$(OBJS)\plotdll_plot.o: ../../src/plot/plot.cpp
-	$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
-	$(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\plotlib_plot.o: ../../src/plot/plot.cpp
-	$(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc
deleted file mode 100644
index aa02a9ff17..0000000000
--- a/contrib/build/plot/makefile.vc
+++ /dev/null
@@ -1,362 +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 = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-	..\..\src\plot\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\plot\..\..\..\include /W4 /I..\..\src\plot\..\..\include \
-	/DWXUSINGDLL /DWXMAKINGDLL_PLOT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-PLOTDLL_OBJECTS =  \
-	$(OBJS)\plotdll_dummy.obj \
-	$(OBJS)\plotdll_version.res \
-	$(OBJS)\plotdll_plot.obj
-PLOTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO_1) \
-	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.pdb \
-	$(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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..\..\src\plot\..\..\..\include /W4 /I..\..\src\plot\..\..\include \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-	/Fp"$(OBJS)\wxprec_plotlib.pch" $(CPPFLAGS) $(CXXFLAGS)
-PLOTLIB_OBJECTS =  \
-	$(OBJS)\plotlib_dummy.obj \
-	$(OBJS)\plotlib_plot.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-VENDORTAG = _$(VENDOR)
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-VENDORTAG = 
-!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 "$(SHARED)" == "1"
-__plotdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_9 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_9 = $(__THREADSFLAG)
-!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_1 = /d __WXUNIVERSAL__
-!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_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!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 "$(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 "$(SHARED)" == "0"
-__plotlib___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /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 "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__plotdll___depname) $(__plotlib___depname)
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).ilk
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).pdb
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-
-!if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj  $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
-	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-	$(PLOTDLL_OBJECTS)  $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib: $(OBJS)\plotlib_dummy.obj  $(PLOTLIB_OBJECTS)
-	if exist $@ del $@
-	link /LIB /NOLOGO /OUT:$@ @<<
-	$(PLOTLIB_OBJECTS)
-<<
-!endif
-
-$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_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 ..\..\src\plot\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG) $**
-
-$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) $**
-
-$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) $**
-
diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat
deleted file mode 100644
index 750f2471e6..0000000000
--- a/contrib/build/plot/makefile.wat
+++ /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.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
-VENDORTAG =
-!ifeq OFFICIAL_BUILD 0
-VENDORTAG = _$(VENDOR)
-!endif
-!ifeq OFFICIAL_BUILD 1
-VENDORTAG = 
-!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
-__plotdll___depname =
-!ifeq SHARED 1
-__plotdll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll
-!endif
-__DEBUGINFO_2 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_2 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_2 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_2 = debug all
-!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
-__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
-__plotlib___depname =
-!ifeq SHARED 0
-__plotlib___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = -d2
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
-!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
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = ..\..\src\plot\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\plot\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT &
-	/fh=$(OBJS)\wxprec_plotdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-	$(CPPFLAGS) $(CXXFLAGS)
-PLOTDLL_OBJECTS =  &
-	$(OBJS)\plotdll_dummy.obj &
-	$(OBJS)\plotdll_plot.obj
-PLOTLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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=..\..\src\plot\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=..\..\src\plot\..\..\include /fh=$(OBJS)\wxprec_plotlib.pch &
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-PLOTLIB_OBJECTS =  &
-	$(OBJS)\plotlib_dummy.obj &
-	$(OBJS)\plotlib_plot.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__plotdll___depname) $(__plotlib___depname)
-
-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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
-
-!ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll :  $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
-	@%create $(OBJS)\plotdll.lbc
-	@%append $(OBJS)\plotdll.lbc option quiet
-	@%append $(OBJS)\plotdll.lbc name $^@
-	@%append $(OBJS)\plotdll.lbc option caseexact
-	@%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
-	@for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
-	@for %i in ( $(__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 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
-	@%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res
-	@%append $(OBJS)\plotdll.lbc system nt_dll
-	wlink @$(OBJS)\plotdll.lbc
-	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib +$^@
-!endif
-
-!ifeq SHARED 0
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib :  $(PLOTLIB_OBJECTS)
-	@%create $(OBJS)\plotlib.lbc
-	@for %i in ($(PLOTLIB_OBJECTS)) do @%append $(OBJS)\plotlib.lbc +%i
-	wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc
-!endif
-
-$(OBJS)\plotdll_dummy.obj :  .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
-
-$(OBJS)\plotdll_version.res :  .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.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=..\..\src\plot\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) $<
-
-$(OBJS)\plotdll_plot.obj :  .AUTODEPEND ../../src/plot\plot.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
-
-$(OBJS)\plotlib_dummy.obj :  .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
-
-$(OBJS)\plotlib_plot.obj :  .AUTODEPEND ../../src/plot\plot.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
-
diff --git a/contrib/build/plot/plot.bkl b/contrib/build/plot/plot.bkl
deleted file mode 100644
index 05d778e403..0000000000
--- a/contrib/build/plot/plot.bkl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <set var="PLOT_SRC">
-        plot.cpp
-    </set>
-
-    <headers template="wx_contrib_headers">
-        <files>
-            wx/plot/plot.h
-            wx/plot/plot_dwn.bmp
-            wx/plot/plot_enl.bmp
-            wx/plot/plot_shr.bmp
-            wx/plot/plot_up.bmp
-            wx/plot/plot_zin.bmp
-            wx/plot/plot_zot.bmp
-            wx/plot/wxplot.rc
-        </files>
-    </headers>
-
-    <dll id="plotdll" template="wx_contrib_dll" cond="SHARED=='1'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_PLOT</define>
-        <sources>$(PLOT_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </dll>
-    
-    <lib id="plotlib" template="wx_contrib_lib" cond="SHARED=='0'">
-        <sources>$(PLOT_SRC)</sources>
-    </lib>
-    
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotlib+plotdll</set>
-
-</makefile>
diff --git a/contrib/build/plot/plot.dsp b/contrib/build/plot/plot.dsp
deleted file mode 100644
index f374e0ce46..0000000000
--- a/contrib/build/plot/plot.dsp
+++ /dev/null
@@ -1,529 +0,0 @@
-# Microsoft Developer Studio Project File - Name="plot" - 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=plot - 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 "plot.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 "plot.mak" CFG="plot - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "plot - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "plot - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "plot - Win32 Debug" (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)" == "plot - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivu" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290u_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29u_plot.lib"
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29u_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivud" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /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_PLOT" /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_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290ud_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29ud_plot.lib" /debug
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29ud_plot.lib" /debug
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswuniv" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29_plot.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswunivd" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmswuniv290d_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29d_plot.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmswuniv29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv290d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmswuniv29d_plot.lib" /debug
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswu" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswu" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswu" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290u_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswu" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290u_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29u_plot.lib"
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29u_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswud" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswud" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswud" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290ud_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswud" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290ud_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29ud_plot.lib" /debug
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29ud_plot.lib" /debug
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\msw" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\msw" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\plot\..\..\..\lib\vc_dll\msw" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\src\plot\..\..\..\lib\vc_dll\msw" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29_plot.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29_core.lib wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswd" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_dll\mswd" /I "..\..\src\plot\..\..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswd" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290d_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\lib\vc_dll\mswd" /i "..\..\src\plot\..\..\..\include" /d WXDLLNAME=wxmsw290d_plot_vc_custom /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT
-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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29d_plot.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxmsw29d_core.lib wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw290d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_dll" /implib:"..\..\src\plot\..\..\..\lib\vc_dll\wxmsw29d_plot.lib" /debug
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivu" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29u_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29u_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivud" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29ud_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29ud_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswuniv" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswunivd" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29d_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmswuniv29d_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswu" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswu" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29u_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29u_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswud" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswud" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29ud_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29ud_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\msw" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\msw" /I "..\..\src\plot\..\..\..\include" /W4 /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29_plot.lib"
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswd" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\src\plot\..\..\..\lib\vc_lib\mswd" /I "..\..\src\plot\..\..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29d_plot.lib"
-# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_lib\wxmsw29d_plot.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "plot - Win32 DLL Universal Unicode Release"
-# Name "plot - Win32 DLL Universal Unicode Debug"
-# Name "plot - Win32 DLL Universal Release"
-# Name "plot - Win32 DLL Universal Debug"
-# Name "plot - Win32 DLL Unicode Release"
-# Name "plot - Win32 DLL Unicode Debug"
-# Name "plot - Win32 DLL Release"
-# Name "plot - Win32 DLL Debug"
-# Name "plot - Win32 Universal Unicode Release"
-# Name "plot - Win32 Universal Unicode Debug"
-# Name "plot - Win32 Universal Release"
-# Name "plot - Win32 Universal Debug"
-# Name "plot - Win32 Unicode Release"
-# Name "plot - Win32 Unicode Debug"
-# Name "plot - Win32 Release"
-# Name "plot - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/plot\..\..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/plot\plot.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/plot\..\..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "plot - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "plot - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/plot/plot.dsw b/contrib/build/plot/plot.dsw
deleted file mode 100644
index 39529fbfaa..0000000000
--- a/contrib/build/plot/plot.dsw
+++ /dev/null
@@ -1,16 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-Project: "plot"=plot.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/docs/latex/deprecated/category.tex b/contrib/docs/latex/deprecated/category.tex
deleted file mode 100644
index dbfaf7f7d2..0000000000
--- a/contrib/docs/latex/deprecated/category.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\chapter{Classes by category}\label{classesbycat}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-A classification of deprecated wxWindows classes by category.
-
-{\large {\bf Miscellaneous}}
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxTreeLayout}{wxtreelayout}}{Tree layout algorithm}
-\twocolitem{\helpref{wxExpr}{wxexpr}}{A class for parsing WXR (and other) data files}
-\twocolitem{\helpref{wxExprDatabase}{wxexprdatabase}}{A class for storing parsed WXR (and other) data files}
-\end{twocollist}
-
diff --git a/contrib/docs/latex/deprecated/classes.tex b/contrib/docs/latex/deprecated/classes.tex
deleted file mode 100644
index a41c01c35a..0000000000
--- a/contrib/docs/latex/deprecated/classes.tex
+++ /dev/null
@@ -1,35 +0,0 @@
-\chapter{Alphabetical class reference}\label{classref}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-% NB: the files should be in alphabetic order of the classes documented in
-%     them and *not* in alphabetic order of the file names!
-
-\input propbfva.tex
-\input propblva.tex
-\input propflva.tex
-\input propifva.tex
-\input propilva.tex
-\input proplosv.tex
-\input property.tex
-\input propford.tex
-\input propforf.tex
-\input propforp.tex
-\input propforv.tex
-\input propfovi.tex
-\input proplisd.tex
-\input proplisf.tex
-\input proplisp.tex
-\input propliva.tex
-\input proplstv.tex
-\input propsht.tex
-\input propvald.tex
-\input propregv.tex
-\input propval.tex
-\input propview.tex
-\input proprfva.tex
-\input proprlva.tex
-\input propstfv.tex
-\input propslv.tex
-\input treelay.tex
-
diff --git a/contrib/docs/latex/deprecated/expr.tex b/contrib/docs/latex/deprecated/expr.tex
deleted file mode 100644
index 83381dfdde..0000000000
--- a/contrib/docs/latex/deprecated/expr.tex
+++ /dev/null
@@ -1,496 +0,0 @@
-\section{\class{wxExpr}}\label{wxexpr}
-
-The {\bf wxExpr} class is the building brick of expressions similar to Prolog
-clauses, or objects. It can represent an expression of type long integer, float, string, word,
-or list, and lists can be nested.
-
-\wxheading{Derived from}
-
-None
-
-\wxheading{Include files}
-
-<wx/wxexpr.h>
-
-\wxheading{See also}
-
-\helpref{wxExpr overview}{exproverview}, \helpref{wxExprDatabase}{wxexprdatabase}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxExpr::wxExpr}\label{wxexprconstr}
-
-\func{}{wxExpr}{\param{const wxString\&}{functor}}
-
-Construct a new clause with this form, supplying the functor name. A clause is an object
-that will appear in the data file, with a list of attribute/value pairs.
-
-\func{}{wxExpr}{\param{wxExprType}{ type}, \param{const wxString\&}{ wordOrString = ``"}}
-
-Construct a new empty list, or a word (will be output with no quotes), or a string, depending on the
-value of {\it type}.
-
-{\it type} can be {\bf wxExprList}, {\bf wxExprWord}, or {\bf wxExprString}. If {\it type} is wxExprList,
-the value of {\it wordOrString} will be ignored.
-
-\func{}{wxExpr}{\param{long}{ value}}
-
-Construct an integer expression.
-
-\func{}{wxExpr}{\param{float}{ value}}
-
-Construct a floating point expression.
-
-\func{}{wxExpr}{\param{wxList* }{value}}
-
-Construct a list expression. The list's nodes' data should
-themselves be {\bf wxExpr}s.
-
-wxExpr no longer uses the {\bf wxList} internally,
-so this constructor turns the list into its internal
-format (assuming a non-nested list) and then deletes the supplied
-list.
-
-\membersection{wxExpr::\destruct{wxExpr}}
-
-\func{}{\destruct{wxExpr}}{\void}
-
-Destructor.
-
-\membersection{wxExpr::AddAttributeValue}\label{wxexpraddattributevalue}
-
-Use these on clauses ONLY. Note that the functions for adding strings
-and words must be differentiated by function name which is why
-they are missing from this group (see \helpref{wxExpr::AddAttributeValueString}{wxexpraddattributevaluestring} and
-\rtfsp\helpref{wxExpr::AddAttributeValueWord}{wxexpraddattributevalueword}).
-
-\func{void}{AddAttributeValue}{\param{const wxString\&}{ attribute}, \param{float }{value}}
-
-Adds an attribute and floating point value pair to the clause.
-
-\func{void}{AddAttributeValue}{\param{const wxString\&}{ attribute}, \param{long }{value}}
-
-Adds an attribute and long integer value pair to the clause.
-
-\func{void}{AddAttributeValue}{\param{const wxString\&}{ attribute}, \param{wxList* }{value}}
-
-Adds an attribute and list value pair to the clause, converting the list into
-internal form and then deleting {\bf value}. Note that the list should not contain
-nested lists (except if in internal {\bf wxExpr} form.)
-
-\func{void}{AddAttributeValue}{\param{const wxString\&}{ attribute}, \param{wxExpr* }{value}}
-
-Adds an attribute and wxExpr value pair to the clause. Do not delete\rtfsp
-{\it value} once this function has been called.
-
-\membersection{wxExpr::AddAttributeValueString}\label{wxexpraddattributevaluestring}
-
-\func{void}{AddAttributeValueString}{\param{const wxString\&}{ attribute}, \param{const wxString\&}{ value}}
-
-Adds an attribute and string value pair to the clause.
-
-\membersection{wxExpr::AddAttributeValueStringList}\label{wxexpraddattributevaluestringlist}
-
-\func{void}{AddAttributeValueStringList}{\param{const wxString\&}{ attribute}, \param{wxList* }{value}}
-
-Adds an attribute and string list value pair to the clause.
-
-Note that the list passed to this function is a list of strings, NOT a list
-of {\bf wxExpr}s; it gets turned into a list of {\bf wxExpr}s
-automatically. This is a convenience function, since lists of strings
-are often manipulated in C++.
-
-\membersection{wxExpr::AddAttributeValueWord}\label{wxexpraddattributevalueword}
-
-\func{void}{AddAttributeValueWord}{\param{const wxString\&}{ attribute}, \param{const wxString\&}{ value}}
-
-Adds an attribute and word value pair to the clause.
-
-\membersection{wxExpr::Append}\label{wxexprappend}
-
-\func{void}{Append}{\param{wxExpr*}{ value}}
-
-Append the {\bf value} to the end of the list. `this' must be a list.
-
-\membersection{wxExpr::Arg}\label{wxexprarg}
-
-\constfunc{wxExpr* }{Arg}{\param{wxExprType}{ type}, \param{int}{ n}}
-
-Get nth arg of the given clause (starting from 1). NULL is returned if
-the expression is not a clause, or {\it n} is invalid, or the given type
-does not match the actual type. See also \helpref{wxExpr::Nth}{wxexprnth}.
-
-\membersection{wxExpr::Insert}\label{wxexprinsert}
-
-\func{void}{Insert}{\param{wxExpr* }{value}}
-
-Insert the {\bf value} at the start of the list. `this' must be a list.
-
-\membersection{wxExpr::GetAttributeValue}\label{wxexprgetattributevalue}
-
-These functions are the easiest way to retrieve attribute values, by
-passing a pointer to variable. If the attribute is present, the
-variable will be filled with the appropriate value.  If not, the
-existing value is left alone.  This style of retrieving attributes
-makes it easy to set variables to default values before calling these
-functions; no code is necessary to check whether the attribute is
-present or not.
-
-\constfunc{bool}{GetAttributeValue}{\param{const wxString\&}{ attribute}, \param{wxString\&}{ value}}
-
-Retrieve a string (or word) value.
-
-\constfunc{bool}{GetAttributeValue}{\param{const wxString\&}{ attribute}, \param{float\& }{value}}
-
-Retrieve a floating point value.
-
-\constfunc{bool}{GetAttributeValue}{\param{const wxString\&}{ attribute}, \param{int\& }{value}}
-
-Retrieve an integer value.
-
-\constfunc{bool}{GetAttributeValue}{\param{const wxString\&}{ attribute}, \param{long\& }{value}}
-
-Retrieve a long integer value.
-
-\constfunc{bool}{GetAttributeValue}{\param{const wxString\&}{ attribute}, \param{wxExpr**}{ value}}
-
-Retrieve a wxExpr pointer.
-
-\membersection{wxExpr::GetAttributeValueStringList}\label{wxexprgetattributestringlist}
-
-\constfunc{void}{GetAttributeValueStringList}{\param{const wxString\&}{attribute}, \param{wxList* }{value}}
-
-Use this on clauses ONLY. See above for comments on this style of
-attribute value retrieval. This function expects to receive a pointer to
-a new list (created by the calling application); it will append strings
-to the list if the attribute is present in the clause.
-
-\membersection{wxExpr::AttributeValue}\label{wxexprattributevalue}
-
-\constfunc{wxExpr*}{AttributeValue}{\param{const wxString\&}{ word}}
-
-Use this on clauses ONLY. Searches the clause for an attribute
-matching {\it word}, and returns the value associated with it.
-
-\membersection{wxExpr::Copy}\label{wxexprcopy}
-
-\constfunc{wxExpr*}{Copy}{\void}
-
-Recursively copies the expression, allocating new storage space.
-
-\membersection{wxExpr::DeleteAttributeValue}\label{wxexprdeletattributevalue}
-
-\func{void}{DeleteAttributeValue}{\param{const wxString\&}{ attribute}}
-
-Use this on clauses only. Deletes the attribute and its value (if any) from the
-clause.
-
-\membersection{wxExpr::Functor}\label{wxexprfunctor}
-
-\constfunc{wxString}{Functor}{\void}
-
-Use this on clauses only. Returns the clause's functor (object name).
-
-\membersection{wxExpr::GetClientData}\label{wxexprgetclientdata}
-
-\constfunc{wxObject*}{GetClientData}{\void}
-
-Retrieve arbitrary data stored with this clause. This can be useful when
-reading in data for storing a pointer to the C++ object, so when another
-clause makes a reference to this clause, its C++ object can be retrieved.
-See \helpref{wxExpr::SetClientData}{wxexprsetclientdata}.
-
-\membersection{wxExpr::GetFirst}\label{wxexprgetfirst}
-
-\constfunc{wxExpr*}{GetFirst}{\void}
-
-If this is a list expression (or clause), gets the first element in the list.
-
-See also \helpref{wxExpr::GetLast}{wxexprgetlast}, \helpref{wxExpr::GetNext}{wxexprgetnext}, \helpref{wxExpr::Nth}{wxexprnth}.
-
-\membersection{wxExpr::GetLast}\label{wxexprgetlast}
-
-\constfunc{wxExpr*}{GetLast}{\void}
-
-If this is a list expression (or clause), gets the last element in the list.
-
-See also \helpref{wxExpr::GetFirst}{wxexprgetfirst}, \helpref{wxExpr::GetNext}{wxexprgetnext}, \helpref{wxExpr::Nth}{wxexprnth}.
-
-\membersection{wxExpr::GetNext}\label{wxexprgetnext}
-
-\constfunc{wxExpr*}{GetNext}{\void}
-
-If this is a node in a list (any wxExpr may be a node in a list), gets the
-next element in the list.
-
-See also \helpref{wxExpr::GetFirst}{wxexprgetfirst}, \helpref{wxExpr::GetLast}{wxexprgetlast}, \helpref{wxExpr::Nth}{wxexprnth}.
-
-\membersection{wxExpr::IntegerValue}\label{wxexprintegervalue}
-
-\constfunc{long}{IntegerValue}{\void}
-
-Returns the integer value of the expression.
-
-\membersection{wxExpr::Nth}\label{wxexprnth}
-
-\constfunc{wxExpr*}{Nth}{\param{int}{ n}}
-
-Get nth arg of the given list expression (starting from 0). NULL is returned if
-the expression is not a list expression, or {\it n} is invalid. See also \helpref{wxExpr::Arg}{wxexprarg}.
-
-Normally, you would use attribute-value pairs to add and retrieve data
-from objects (clauses) in a data file. However, if the data gets complex,
-you may need to store attribute values as lists, and pick them apart
-yourself.
-
-\membersection{wxExpr::RealValue}\label{wxexprrealvalue}
-
-\constfunc{float}{RealValue}{\void}
-
-Returns the floating point value of the expression.
-
-\membersection{wxExpr::SetClientData}\label{wxexprsetclientdata}
-
-\func{void}{SetClientData}{\param{wxObject *}{data}}
-
-Associate arbitrary data with this clause. This can be useful when
-reading in data for storing a pointer to the C++ object, so when another
-clause makes a reference to this clause, its C++ object can be retrieved.
-See \helpref{wxExpr::GetClientData}{wxexprgetclientdata}.
-
-\membersection{wxExpr::StringValue}\label{wxexprstringvalue}
-
-\constfunc{wxString}{StringValue}{\void}
-
-Returns the string value of the expression.
-
-\membersection{wxExpr::Type}\label{wxexprtype}
-
-\constfunc{wxExprType}{Type}{\void}
-
-Returns the type of the expression. {\bf wxExprType} is defined as follows:
-
-\begin{verbatim}
-typedef enum {
-    wxExprNull,
-    wxExprInteger,
-    wxExprReal,
-    wxExprWord,
-    wxExprString,
-    wxExprList
-} wxExprType;
-\end{verbatim}
-
-\membersection{wxExpr::WordValue}\label{wxexprwordvalue}
-
-\constfunc{wxString}{WordValue}{\void}
-
-Returns the word value of the expression.
-
-\membersection{wxExpr::WriteClause}\label{wxexprwriteprologclause}
-
-\func{void}{WriteClause}{\param{FILE *}{ stream}}
-
-Writes the clause to the given stream in Prolog format. Not normally needed, since
-the whole {\bf wxExprDatabase} will usually be written at once. The format is:
-functor, open parenthesis, list of comma-separated expressions, close parenthesis,
-full stop.
-
-\membersection{wxExpr::WriteExpr}\label{wxexprwriteexpr}
-
-\func{void}{WriteExpr}{\param{FILE *}{ stream}}
-
-Writes the expression (not clause) to the given stream in Prolog
-format. Not normally needed, since the whole {\bf wxExprDatabase} will
-usually be written at once. Lists are written in square bracketed,
-comma-delimited format.
-
-\membersection{Functions and macros}
-
-Below are miscellaneous functions and macros associated with wxExpr objects.
-
-\func{bool}{wxExprIsFunctor}{\param{wxExpr *}{expr}, \param{const wxString\&}{ functor}}
-
-Checks that the functor of {\it expr} is {\it functor}.
-
-\func{void}{wxExprCleanUp}{\void}
-
-Cleans up the wxExpr system (YACC/LEX buffers) to avoid memory-checking warnings as the program exits.
-
-\begin{verbatim}
-#define wxMakeInteger(x) (new wxExpr((long)x))
-#define wxMakeReal(x)    (new wxExpr((float)x))
-#define wxMakeString(x)  (new wxExpr(PrologString, x))
-#define wxMakeWord(x)    (new wxExpr(PrologWord, x))
-#define wxMake(x)        (new wxExpr(x))
-\end{verbatim}
-
-Macros to help make wxExpr objects.
-
-\section{\class{wxExprDatabase}}\label{wxexprdatabase}
-
-The {\bf wxExprDatabase} class represents a database, or list,
-of Prolog-like expressions.  Instances of this class are used for reading,
-writing and creating data files.
-
-\wxheading{Derived from}
-
-\helpref{wxList}{wxlist}\\
-\helpref{wxObject}{wxobject}
-
-\wxheading{See also}
-
-\helpref{wxExpr overview}{exproverview}, \helpref{wxExpr}{wxexpr}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxExprDatabase::wxExprDatabase}\label{wxexprdatabaseconstr}
-
-\func{void}{wxExprDatabase}{\param{proioErrorHandler}{ handler = 0}}
-
-Construct a new, unhashed database, with an optional error handler. The
-error handler must be a function returning a bool and taking an integer and a string
-argument. When an error occurs when reading or writing a database, this function is
-called. The error is given as the first argument (currently one of WXEXPR\_ERROR\_GENERAL,
-WXEXPR\_ERROR\_SYNTAX) and an error message is given as the second argument. If false
-is returned by the error handler, processing of the wxExpr operation stops.
-
-Another way of handling errors is simply to call \helpref{wxExprDatabase::GetErrorCount}{wxexprdatabasegeterrorcount} after
-the operation, to check whether errors have occurred, instead of installing an error handler.
-If the error count is more than zero, \helpref{wxExprDatabase::Write}{wxexprdatabasewrite} and
-\rtfsp\helpref{wxExprDatabase::Read}{wxexprdatabaseread} will return false to
-the application.
-
-For example:
-
-\begin{verbatim}
-bool myErrorHandler(int err, chat *msg)
-{
-  if (err == WXEXPR_ERROR_SYNTAX)
-  {
-    wxMessageBox(msg, "Syntax error");
-  }
-  return false;
-}
-
-wxExprDatabase database(myErrorHandler);
-\end{verbatim}
-
-\func{}{wxExprDatabase}{\param{wxExprType}{ type}, \param{const wxString\&}{attribute},
-\rtfsp\param{int}{ size = 500}, \param{proioErrorHandler}{ handler = 0}}
-
-Construct a new database hashed on a combination of the clause functor and
-a named attribute (often an integer identification).
-
-See above for an explanation of the error handler.
-
-\membersection{wxExprDatabase::\destruct{wxExprDatabase}}
-
-\func{}{\destruct{wxExprDatabase}}{\void}
-
-Delete the database and contents.
-
-\membersection{wxExprDatabase::Append}\label{wxexprdatabaseappend}
-
-\func{void}{Append}{\param{wxExpr* }{clause}}
-
-Append a clause to the end of the database. If the database is hashing,
-the functor and a user-specified attribute will be hashed upon, giving the
-option of random access in addition to linear traversal of the database.
-
-\membersection{wxExprDatabase::BeginFind}\label{wxexprdatabasebeginfind}
-
-\func{void}{BeginFind}{\void}
-
-Reset the current position to the start of the database. Subsequent
-\rtfsp\helpref{wxExprDatabase::FindClause}{wxexprdatabasefindclause} calls will move the pointer.
-
-\membersection{wxExprDatabase::ClearDatabase}\label{wxexprdatabasecleardatabase}
-
-\func{void}{ClearDatabase}{\void}
-
-Clears the contents of the database.
-
-\membersection{wxExprDatabase::FindClause}\label{wxexprdatabasefindclause}
-
-Various ways of retrieving clauses from the database. A return
-value of NULL indicates no (more) clauses matching the given criteria.
-Calling the functions repeatedly retrieves more matching clauses, if any.
-
-\func{wxExpr* }{FindClause}{\param{long}{ id}}
-
-Find a clause based on the special ``id'' attribute.
-
-\func{wxExpr* }{FindClause}{\param{const wxString\&}{ attribute}, \param{const wxString\&}{ value}}
-
-Find a clause which has the given attribute set to the given string or word value.
-
-\func{wxExpr*}{FindClause}{\param{const wxString\&}{ attribute}, \param{long}{ value}}
-
-Find a clause which has the given attribute set to the given integer value.
-
-\func{wxExpr*}{FindClause}{\param{const wxString\&}{ attribute}, \param{float}{ value}}
-
-Find a clause which has the given attribute set to the given floating point value.
-
-\membersection{wxExprDatabase::FindClauseByFunctor}\label{wxexprdatabasefindclausebyfunctor}
-
-\func{wxExpr*}{FindClauseByFunctor}{\param{const wxString\&}{ functor}}
-
-Find the next clause with the specified functor.
-
-\membersection{wxExprDatabase::GetErrorCount}\label{wxexprdatabasegeterrorcount}
-
-\constfunc{int}{GetErrorCount}{\void}
-
-Returns the number of errors encountered during the last read or write operation.
-
-\membersection{wxExprDatabase::HashFind}\label{wxexprdatabasehashfind}
-
-\constfunc{wxExpr*}{HashFind}{\param{const wxString\&}{ functor}, \param{long}{ value}}
-
-Finds the clause with the given functor and with the attribute specified
-in the database constructor having the given integer value.
-
-For example,
-
-\begin{verbatim}
-// Hash on a combination of functor and integer "id" attribute when reading in
-wxExprDatabase db(wxExprInteger, "id");
-
-// Read it in
-db.ReadProlog("data");
-
-// Retrieve a clause with specified functor and id
-wxExpr *clause = db.HashFind("node", 24);
-\end{verbatim}
-
-This would retrieve a clause which is written: {\tt node(id = 24, ..., )}.
-
-\func{wxExpr*}{HashFind}{\param{const wxString\&}{ functor}, \param{const wxString\&}{ value}}
-
-Finds the clause with the given functor and with the attribute specified
-in the database constructor having the given string value.
-
-\membersection{wxExprDatabase::Read}\label{wxexprdatabaseread}
-
-\func{bool}{Read}{\param{const wxString\&}{ filename}}
-
-Reads in the given file, returning true if successful.
-
-\membersection{wxExprDatabase::ReadFromString}\label{wxexprdatabasereadfromstring}
-
-\func{bool}{ReadFromString}{\param{const wxString\&}{ buffer}}
-
-Reads a Prolog database from the given string buffer, returning true if
-successful.
-
-\membersection{wxExprDatabase::Write}\label{wxexprdatabasewrite}
-
-\func{bool}{Write}{\param{FILE *}{stream}}
-
-\func{bool}{Write}{\param{const wxString\&}{ filename}}
-
-Writes the database as a Prolog-format file.
-
-
diff --git a/contrib/docs/latex/deprecated/function.tex b/contrib/docs/latex/deprecated/function.tex
deleted file mode 100644
index de3fa0c617..0000000000
--- a/contrib/docs/latex/deprecated/function.tex
+++ /dev/null
@@ -1,361 +0,0 @@
-\chapter{Functions}\label{functions}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-Deprecated functions and macros defined in wxWindows are described here: you can
-either look up a function using the alphabetical listing of them or find it in
-the corresponding topic.
-
-\section{Alphabetical functions and macros list}
-
-%\helpref{wxGetResource}{wxgetresource}\\
-%\helpref{wxLoadUserResource}{wxloaduserresource}\\
-%\helpref{wxMakeMetafilePlaceable}{wxmakemetafileplaceable}\\
-%\helpref{wxNewId}{wxnewid}\\
-\helpref{wxLoadFromResource}{wxloadfromresource}\\
-\helpref{wxResourceAddIdentifier}{wxresourceaddidentifier}\\
-\helpref{wxResourceClear}{wxresourceclear}\\
-\helpref{wxResourceCreateBitmap}{wxresourcecreatebitmap}\\
-\helpref{wxResourceCreateIcon}{wxresourcecreateicon}\\
-\helpref{wxResourceCreateMenuBar}{wxresourcecreatemenubar}\\
-\helpref{wxResourceGetIdentifier}{wxresourcegetidentifier}\\
-\helpref{wxResourceParseData}{wxresourcedata}\\
-\helpref{wxResourceParseFile}{wxresourceparsefile}\\
-\helpref{wxResourceParseString}{wxresourceparsestring}\\
-\helpref{wxResourceRegisterBitmapData}{registerbitmapdata}\\
-\helpref{wxResourceRegisterIconData}{wxresourceregistericondata}\\
-%\helpref{wxSetPrinterCommand}{wxsetprintercommand}\\
-%\helpref{wxSetPrinterFile}{wxsetprinterfile}\\
-%\helpref{wxSetPrinterMode}{wxsetprintermode}\\
-%\helpref{wxSetPrinterOptions}{wxsetprinteroptions}\\
-%\helpref{wxSetPrinterOrientation}{wxsetprinterorientation}\\
-%\helpref{wxSetPrinterPreviewCommand}{wxsetprinterpreviewcommand}\\
-%\helpref{wxSetPrinterScaling}{wxsetprinterscaling}\\
-%\helpref{wxSetPrinterTranslation}{wxsetprintertranslation}\\
-
-\section{Printer settings}\label{printersettings}
-
-{\bf NB:} These routines are obsolete and should no longer be used!
-
-The following functions are used to control PostScript printing. Under
-Windows, PostScript output can only be sent to a file.
-
-\wxheading{Include files}
-
-<wx/dcps.h>
-
-\membersection{::wxGetPrinterCommand}\label{wxgetprintercommand}
-
-\func{wxString}{wxGetPrinterCommand}{\void}
-
-Gets the printer command used to print a file. The default is {\tt lpr}.
-
-\membersection{::wxGetPrinterFile}\label{wxgetprinterfile}
-
-\func{wxString}{wxGetPrinterFile}{\void}
-
-Gets the PostScript output filename.
-
-\membersection{::wxGetPrinterMode}\label{wxgetprintermode}
-
-\func{int}{wxGetPrinterMode}{\void}
-
-Gets the printing mode controlling where output is sent (PS\_PREVIEW, PS\_FILE or PS\_PRINTER).
-The default is PS\_PREVIEW.
-
-\membersection{::wxGetPrinterOptions}\label{wxgetprinteroptions}
-
-\func{wxString}{wxGetPrinterOptions}{\void}
-
-Gets the additional options for the print command (e.g. specific printer). The default is nothing.
-
-\membersection{::wxGetPrinterOrientation}\label{wxgetprinterorientation}
-
-\func{int}{wxGetPrinterOrientation}{\void}
-
-Gets the orientation (PS\_PORTRAIT or PS\_LANDSCAPE). The default is PS\_PORTRAIT.
-
-\membersection{::wxGetPrinterPreviewCommand}\label{wxgetprinterpreviewcommand}
-
-\func{wxString}{wxGetPrinterPreviewCommand}{\void}
-
-Gets the command used to view a PostScript file. The default depends on the platform.
-
-\membersection{::wxGetPrinterScaling}\label{wxgetprinterscaling}
-
-\func{void}{wxGetPrinterScaling}{\param{float *}{x}, \param{float *}{y}}
-
-Gets the scaling factor for PostScript output. The default is 1.0, 1.0.
-
-\membersection{::wxGetPrinterTranslation}\label{wxgetprintertranslation}
-
-\func{void}{wxGetPrinterTranslation}{\param{float *}{x}, \param{float *}{y}}
-
-Gets the translation (from the top left corner) for PostScript output. The default is 0.0, 0.0.
-
-\membersection{::wxSetPrinterCommand}\label{wxsetprintercommand}
-
-\func{void}{wxSetPrinterCommand}{\param{const wxString\& }{command}}
-
-Sets the printer command used to print a file. The default is {\tt lpr}.
-
-\membersection{::wxSetPrinterFile}\label{wxsetprinterfile}
-
-\func{void}{wxSetPrinterFile}{\param{const wxString\& }{filename}}
-
-Sets the PostScript output filename.
-
-\membersection{::wxSetPrinterMode}\label{wxsetprintermode}
-
-\func{void}{wxSetPrinterMode}{\param{int }{mode}}
-
-Sets the printing mode controlling where output is sent (PS\_PREVIEW, PS\_FILE or PS\_PRINTER).
-The default is PS\_PREVIEW.
-
-\membersection{::wxSetPrinterOptions}\label{wxsetprinteroptions}
-
-\func{void}{wxSetPrinterOptions}{\param{const wxString\& }{options}}
-
-Sets the additional options for the print command (e.g. specific printer). The default is nothing.
-
-\membersection{::wxSetPrinterOrientation}\label{wxsetprinterorientation}
-
-\func{void}{wxSetPrinterOrientation}{\param{int}{ orientation}}
-
-Sets the orientation (PS\_PORTRAIT or PS\_LANDSCAPE). The default is PS\_PORTRAIT.
-
-\membersection{::wxSetPrinterPreviewCommand}\label{wxsetprinterpreviewcommand}
-
-\func{void}{wxSetPrinterPreviewCommand}{\param{const wxString\& }{command}}
-
-Sets the command used to view a PostScript file. The default depends on the platform.
-
-\membersection{::wxSetPrinterScaling}\label{wxsetprinterscaling}
-
-\func{void}{wxSetPrinterScaling}{\param{float }{x}, \param{float }{y}}
-
-Sets the scaling factor for PostScript output. The default is 1.0, 1.0.
-
-\membersection{::wxSetPrinterTranslation}\label{wxsetprintertranslation}
-
-\func{void}{wxSetPrinterTranslation}{\param{float }{x}, \param{float }{y}}
-
-Sets the translation (from the top left corner) for PostScript output. The default is 0.0, 0.0.
-
-\section{Resource functions}\label{resourcefunctions}
-
-\overview{Resource functions}{resourceformats}
-
-This section details functions for manipulating wxWindows (.WXR) resource
-files and loading user interface elements from resources.
-
-\normalbox{Please note that this use of the word `resource' is different from that used when talking
-about initialisation file resource reading and writing, using such functions
-as wxWriteResource and wxGetResource. It is just an unfortunate clash of terminology.}
-
-\helponly{For an overview of the wxWindows resource mechanism, see \helpref{the wxWindows resource system}{resourceformats}.}
-
-See also \helpref{wxWindow::LoadFromResource}{wxwindowloadfromresource} for
-loading from resource data.
-
-\membersection{wxLoadFromResource}\label{wxloadfromresource}
-
-\func{virtual bool}{LoadFromResource}{\param{wxWindow* thisWindow}, \param{wxWindow* }{parent},\rtfsp
-\param{const wxString\& }{resourceName}, \param{const wxResourceTable* }{resourceTable = NULL}}
-
-Loads a panel or dialog from a resource file.
-
-\wxheading{Parameters}
-
-\docparam{thisWindow}{Window to load the resource into.}
-
-\docparam{parent}{Parent window.}
-
-\docparam{resourceName}{The name of the resource to load.}
-
-\docparam{resourceTable}{The resource table to load it from. If this is NULL, the
-default resource table will be used.}
-
-\wxheading{Return value}
-
-{\tt true} if the operation succeeded, otherwise {\tt false}.
-
-\membersection{::wxResourceAddIdentifier}\label{wxresourceaddidentifier}
-
-\func{bool}{wxResourceAddIdentifier}{\param{const wxString\& }{name}, \param{int }{value}}
-
-Used for associating a name with an integer identifier (equivalent to dynamically\rtfsp
-{\tt\#}defining a name to an integer). Unlikely to be used by an application except
-perhaps for implementing resource functionality for interpreted languages.
-
-\membersection{::wxResourceClear}\label{wxresourceclear}
-
-\func{void}{wxResourceClear}{\void}
-
-Clears the wxWindows resource table.
-
-\membersection{::wxResourceCreateBitmap}\label{wxresourcecreatebitmap}
-
-\func{wxBitmap *}{wxResourceCreateBitmap}{\param{const wxString\& }{resource}}
-
-Creates a new bitmap from a file, static data, or Windows resource, given a valid
-wxWindows bitmap resource identifier. For example, if the .WXR file contains
-the following:
-
-\begin{verbatim}
-static const wxString\& project_resource = "bitmap(name = 'project_resource',\
-  bitmap = ['project', wxBITMAP_TYPE_BMP_RESOURCE, 'WINDOWS'],\
-  bitmap = ['project.xpm', wxBITMAP_TYPE_XPM, 'X']).";
-\end{verbatim}
-
-then this function can be called as follows:
-
-\begin{verbatim}
-  wxBitmap *bitmap  = wxResourceCreateBitmap("project_resource");
-\end{verbatim}
-
-\membersection{::wxResourceCreateIcon}\label{wxresourcecreateicon}
-
-\func{wxIcon *}{wxResourceCreateIcon}{\param{const wxString\& }{resource}}
-
-Creates a new icon from a file, static data, or Windows resource, given a valid
-wxWindows icon resource identifier. For example, if the .WXR file contains
-the following:
-
-\begin{verbatim}
-static const wxString\& project_resource = "icon(name = 'project_resource',\
-  icon = ['project', wxBITMAP_TYPE_ICO_RESOURCE, 'WINDOWS'],\
-  icon = ['project', wxBITMAP_TYPE_XBM_DATA, 'X']).";
-\end{verbatim}
-
-then this function can be called as follows:
-
-\begin{verbatim}
-  wxIcon *icon = wxResourceCreateIcon("project_resource");
-\end{verbatim}
-
-\membersection{::wxResourceCreateMenuBar}\label{wxresourcecreatemenubar}
-
-\func{wxMenuBar *}{wxResourceCreateMenuBar}{\param{const wxString\& }{resource}}
-
-Creates a new menu bar given a valid wxWindows menubar resource
-identifier. For example, if the .WXR file contains the following:
-
-\begin{verbatim}
-static const wxString\& menuBar11 = "menu(name = 'menuBar11',\
-  menu = \
-  [\
-    ['&File', 1, '', \
-      ['&Open File', 2, 'Open a file'],\
-      ['&Save File', 3, 'Save a file'],\
-      [],\
-      ['E&xit', 4, 'Exit program']\
-    ],\
-    ['&Help', 5, '', \
-      ['&About', 6, 'About this program']\
-    ]\
-  ]).";
-\end{verbatim}
-
-then this function can be called as follows:
-
-\begin{verbatim}
-  wxMenuBar *menuBar = wxResourceCreateMenuBar("menuBar11");
-\end{verbatim}
-
-
-\membersection{::wxResourceGetIdentifier}\label{wxresourcegetidentifier}
-
-\func{int}{wxResourceGetIdentifier}{\param{const wxString\& }{name}}
-
-Used for retrieving the integer value associated with an identifier.
-A zero value indicates that the identifier was not found.
-
-See \helpref{wxResourceAddIdentifier}{wxresourceaddidentifier}.
-
-\membersection{::wxResourceParseData}\label{wxresourcedata}
-
-\func{bool}{wxResourceParseData}{\param{const wxString\& }{resource}, \param{wxResourceTable *}{table = NULL}}
-
-Parses a string containing one or more wxWindows resource objects. If
-the resource objects are global static data that are included into the
-C++ program, then this function must be called for each variable
-containing the resource data, to make it known to wxWindows.
-
-{\it resource} should contain data in the following form:
-
-\begin{verbatim}
-dialog(name = 'dialog1',
-  style = 'wxCAPTION | wxDEFAULT_DIALOG_STYLE',
-  title = 'Test dialog box',
-  x = 312, y = 234, width = 400, height = 300,
-  modal = 0,
-  control = [1000, wxStaticBox, 'Groupbox', '0', 'group6', 5, 4, 380, 262,
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],
-  control = [1001, wxTextCtrl, '', 'wxTE_MULTILINE', 'text3',
-      156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).
-\end{verbatim}
-
-This function will typically be used after including a {\tt .wxr} file into
-a C++ program as follows:
-
-\begin{verbatim}
-#include "dialog1.wxr"
-\end{verbatim}
-
-Each of the contained resources will declare a new C++ variable, and each
-of these variables should be passed to wxResourceParseData.
-
-\membersection{::wxResourceParseFile}\label{wxresourceparsefile}
-
-\func{bool}{wxResourceParseFile}{\param{const wxString\& }{filename}, \param{wxResourceTable *}{table = NULL}}
-
-Parses a file containing one or more wxWindows resource objects
-in C++-compatible syntax. Use this function to dynamically load
-wxWindows resource data.
-
-\membersection{::wxResourceParseString}\label{wxresourceparsestring}
-
-\func{bool}{wxResourceParseString}{\param{char *}{s}, \param{wxResourceTable *}{table = NULL}}
-
-Parses a string containing one or more wxWindows resource objects. If
-the resource objects are global static data that are included into the
-C++ program, then this function must be called for each variable
-containing the resource data, to make it known to wxWindows.
-
-{\it resource} should contain data with the following form:
-
-\begin{verbatim}
-dialog(name = 'dialog1',
-  style = 'wxCAPTION | wxDEFAULT_DIALOG_STYLE',
-  title = 'Test dialog box',
-  x = 312, y = 234, width = 400, height = 300,
-  modal = 0,
-  control = [1000, wxStaticBox, 'Groupbox', '0', 'group6', 5, 4, 380, 262,
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],
-  control = [1001, wxTextCtrl, '', 'wxTE_MULTILINE', 'text3',
-      156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],
-      [11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).
-\end{verbatim}
-
-This function will typically be used after calling \helpref{wxLoadUserResource}{wxloaduserresource} to
-load an entire {\tt .wxr file} into a string.
-
-\membersection{::wxResourceRegisterBitmapData}\label{registerbitmapdata}
-
-\func{bool}{wxResourceRegisterBitmapData}{\param{const wxString\& }{name}, \param{char *}{xbm\_data}, \param{int }{width},
-\param{int }{height}, \param{wxResourceTable *}{table = NULL}}
-
-\func{bool}{wxResourceRegisterBitmapData}{\param{const wxString\& }{name}, \param{char **}{xpm\_data}}
-
-Makes {\tt\#}included XBM or XPM bitmap data known to the wxWindows resource system.
-This is required if other resources will use the bitmap data, since otherwise there
-is no connection between names used in resources, and the global bitmap data.
-
-\membersection{::wxResourceRegisterIconData}\label{wxresourceregistericondata}
-
-Another name for \helpref{wxResourceRegisterBitmapData}{registerbitmapdata}.
-
diff --git a/contrib/docs/latex/deprecated/manual.tex b/contrib/docs/latex/deprecated/manual.tex
deleted file mode 100644
index 1fc222cf91..0000000000
--- a/contrib/docs/latex/deprecated/manual.tex
+++ /dev/null
@@ -1,649 +0,0 @@
-\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
-% JACS: doesn't make it through Tex2RTF, sorry. I will put it into texhelp.sty
-% since Tex2RTF doesn't parse it.
-% BTW, style MUST be report for it to work for Tex2RTF.
-%KB:
-%\addtolength{\textwidth}{1in}
-%\addtolength{\oddsidemargin}{-0.5in}
-%\addtolength{\topmargin}{-0.5in}
-%\addtolength{\textheight}{1in}
-%\sloppy
-%end of my changes
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\pipe}[0]{$\|$\ }%
-\definecolour{black}{0}{0}{0}%
-\definecolour{cyan}{0}{255}{255}%
-\definecolour{green}{0}{255}{0}%
-\definecolour{magenta}{255}{0}{255}%
-\definecolour{red}{255}{0}{0}%
-\definecolour{blue}{0}{0}{200}%
-\definecolour{yellow}{255}{255}{0}%
-\definecolour{white}{255}{255}{255}%
-%
-\input psbox.tex
-\input ltx.tex
-% Remove this for processing with dvi2ps instead of dvips
-%\special{!/@scaleunit 1 def}
-\parskip=10pt
-\parindent=0pt
-\title{wxWindows Deprecated Classes}
-\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{April 2003}
-}
-\makeindex
-\begin{document}
-\maketitle
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\pagenumbering{roman}
-\tableofcontents
-
-\chapter{Copyright notice}
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\begin{center}
-Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin and other
-members of the wxWindows team\\
-Portions (c) 1996 Artificial Intelligence Applications Institute\\
-\end{center}
-
-Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
-licendoc.txt) for conditions of software and documentation use.
-
-\section*{wxWindows Library License, Version 3}
-
-Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed. 
-
-\begin{center}
-WXWINDOWS LIBRARY LICENSE\\
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
-\end{center}
-
-This library is free software; you can redistribute it and/or modify it 
-under the terms of the GNU Library General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or (at 
-your option) any later version. 
-
-This library is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library 
-General Public License for more details. 
-
-You should have received a copy of the GNU Library General Public License 
-along with this software, usually in a file named COPYING.LIB. If not, 
-write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-Boston, MA~02111-1307 USA. 
-
-EXCEPTION NOTICE 
-
-1. As a special exception, the copyright holders of this library give 
-permission for additional uses of the text contained in this release of 
-the library as licensed under the wxWindows Library License, applying 
-either version 3 of the License, or (at your option) any later version of 
-the License as published by the copyright holders of version 3 of the 
-License document. 
-
-2. The exception is that you may create binary object code versions of any 
-works using this library or based on this library, and use, copy, modify, 
-link and distribute such binary object code files unrestricted under terms 
-of your choice. 
-
-3. If you copy code from files distributed under the terms of the GNU 
-General Public License or the GNU Library General Public License into a 
-copy of this library, as this license permits, the exception does not 
-apply to the code that you add in this way. To avoid misleading anyone as 
-to the status of such modified files, you must delete this exception 
-notice from such code and/or adjust the licensing conditions notice
-accordingly. 
-
-4. If you write modifications of your own for this library, it is your 
-choice whether to permit this exception to apply to your modifications. 
-If you do not wish that, you must delete the exception notice from such 
-code and/or adjust the licensing conditions notice accordingly. 
-
-\section*{GNU Library General Public License, Version 2}
-
-Copyright (C) 1991 Free Software Foundation, Inc.
-675 Mass Ave, Cambridge, MA 02139, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL. It is
-numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-\wxheading{Preamble}
-
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software -- to make sure the software is free for all its users.
-
-This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
-Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
-However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
-
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-\begin{center}
-		GNU LIBRARY GENERAL PUBLIC LICENSE\\
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-\end{center}
-
-0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
-
-A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-\begin{indented}{1cm}
-a) The modified work must itself be a software library.
-
-b) You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-
-c) You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-
-d) If a facility in the modified Library refers to a function or a
-table of data to be supplied by an application program that uses
-the facility, other than as an argument passed when the facility
-is invoked, then you must make a good faith effort to ensure that,
-in the event an application does not supply such function or
-table, the facility still operates, and performs whatever part of
-its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has
-a purpose that is entirely well-defined independent of the
-application. Therefore, Subsection 2d requires that any
-application-supplied function or table used by this function must
-be optional: if the application does not supply it, the square
-root function must still compute square roots.) 
-\end{indented}
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
-Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
-\begin{indented}{1cm}
-a) Accompany the work with the complete corresponding
-machine-readable source code for the Library including whatever
-changes were used in the work (which must be distributed under
-Sections 1 and 2 above); and, if the work is an executable linked
-with the Library, with the complete machine-readable "work that
-uses the Library", as object code and/or source code, so that the
-user can modify the Library and then relink to produce a modified
-executable containing the modified Library. (It is understood
-that the user who changes the contents of definitions files in the
-Library will not necessarily be able to recompile the application
-to use the modified definitions.)
-
-b) Accompany the work with a written offer, valid for at
-least three years, to give the same user the materials
-specified in Subsection 6a, above, for a charge no more
-than the cost of performing this distribution.
-
-c) If distribution of the work is made by offering access to copy
-from a designated place, offer equivalent access to copy the above
-specified materials from the same place.
-
-d) Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
-\end{indented}
-
-For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-\begin{indented}{1cm}
-a) Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library
-facilities. This must be distributed under the terms of the
-Sections above.
-
-b) Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
-\end{indented}
-
-8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-\begin{center}
-NO WARRANTY
-\end{center}
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-
-\begin{center}
-END OF TERMS AND CONDITIONS
-\end{center}
-
-\wxheading{Appendix: How to Apply These Terms to Your New Libraries}
-
-If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-\footnotesize{
-\begin{verbatim}
-<one line to give the library's name and a brief idea of what it does.>
-Copyright (C) <year> <name of author>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-\end{verbatim}
-}
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
-\footnotesize{
-\begin{verbatim}
-Yoyodyne, Inc., hereby disclaims all copyright interest in the
-library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-<signature of Ty Coon>, 1 April 1990
-Ty Coon, President of Vice
-\end{verbatim} 
-}
-
-That's all there is to it!
-
-\chapter{Introduction}\label{introduction}
-\pagenumbering{arabic}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This manual contains documentation for classes that are
-now obsolete.
-
-\input classes.tex
-\input function.tex
-\input category.tex
-\input topics.tex
-\input proplist.tex
-
-\newpage
-
-% Note: In RTF, the \printindex must come before the
-% change of header/footer, since the \printindex inserts
-% the RTF \sect command which divides one chapter from
-% the next.
-\rtfonly{\printindex
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-}
-% In Latex, it must be this way around (I think)
-\latexonly{\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\printindex
-}
-
-\end{document}
diff --git a/contrib/docs/latex/deprecated/prop1.bmp b/contrib/docs/latex/deprecated/prop1.bmp
deleted file mode 100644
index 92c6beec8b..0000000000
Binary files a/contrib/docs/latex/deprecated/prop1.bmp and /dev/null differ
diff --git a/contrib/docs/latex/deprecated/prop1.eps b/contrib/docs/latex/deprecated/prop1.eps
deleted file mode 100644
index 02ac7d68cf..0000000000
--- a/contrib/docs/latex/deprecated/prop1.eps
+++ /dev/null
@@ -1,539 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: prop1.eps
-%%Creator: XV Version 2.20  Rev: 4/24/92  -  by John Bradley
-%%BoundingBox: 167 292 445 500
-%%Pages: 1
-%%DocumentFonts:
-%%EndComments
-%%EndProlog
-
-%%Page: 1 1
-
-% remember original state
-/origstate save def
-
-% build a temporary dictionary
-20 dict begin
-
-% lower left corner
-167 292 translate
-
-% size of image (on paper, in 1/72inch coords)
-278 208 scale
-
-% define 'colorimage' if it isn't defined
-%   ('colortogray' and 'mergeprocs' come from xwd2ps
-%     via xgrab)
-/colorimage where   % do we know about 'colorimage'?
-  { pop }           % yes: pop off the 'dict' returned
-  {                 % no:  define one
-    /colortogray {  % define an RGB->I function
-      /rgbdata exch store    % call input 'rgbdata'
-      rgbdata length 3 idiv
-      /npixls exch store
-      /rgbindx 0 store
-      /grays npixls string store  % str to hold the result
-      0 1 npixls 1 sub {
-        grays exch
-        rgbdata rgbindx       get 20 mul    % Red
-        rgbdata rgbindx 1 add get 32 mul    % Green
-        rgbdata rgbindx 2 add get 12 mul    % Blue
-        add add 64 idiv      % I = .5G + .31R + .18B
-        put
-        /rgbindx rgbindx 3 add store
-      } for
-      grays
-    } bind def
-
-    % Utility procedure for colorimage operator.
-    % This procedure takes two procedures off the
-    % stack and merges them into a single procedure.
-
-    /mergeprocs { % def
-      dup length
-      3 -1 roll
-      dup
-      length
-      dup
-      5 1 roll
-      3 -1 roll
-      add
-      array cvx
-      dup
-      3 -1 roll
-      0 exch
-      putinterval
-      dup
-      4 2 roll
-      putinterval
-    } bind def
-
-    /colorimage { % def
-      pop pop     % remove 'false 3' operands
-      {colortogray} mergeprocs
-      image
-    } bind def
-  } ifelse          % end of 'false' case
-
-
-
-% define the colormap
-/cmap 42 string def
-
-
-% load up the colormap
-currentfile cmap readhexstring
-000000 bf0000 00bf00 bfbf00 0000bf 00bfbf c0c0c0 808080 ff0000 00ff00 
-ffff00 0000ff 00ffff ffffff 
-pop pop   % lose return values from readhexstring
-
-
-% rlecmapimage expects to have 'w h bits matrix' on stack
-/rlecmapimage {
-  /buffer 1 string def
-  /rgbval 3 string def
-  /block  384 string def
-
-  % proc to read a block from file, and return RGB data
-  { currentfile buffer readhexstring pop
-    /bcount exch 0 get store
-    bcount 128 ge
-    {  % it's a non-run block
-      0 1 bcount 128 sub
-      { currentfile buffer readhexstring pop pop
-
-        % look up value in color map
-        /rgbval cmap buffer 0 get 3 mul 3 getinterval store
-
-        % and put it in position i*3 in block
-        block exch 3 mul rgbval putinterval
-      } for
-      block  0  bcount 127 sub 3 mul  getinterval
-    }
-
-    { % else it's a run block
-      currentfile buffer readhexstring pop pop
-
-      % look up value in colormap
-      /rgbval cmap buffer 0 get 3 mul 3 getinterval store
-
-      0 1 bcount { block exch 3 mul rgbval putinterval } for
-
-      block 0 bcount 1 add 3 mul getinterval
-    } ifelse
-  } % end of proc
-  false 3 colorimage
-} bind def
-
-
-278 208 8			% dimensions of data
-[278 0 0 -208 0 208]		% mapping matrix
-rlecmapimage
-
-7f067f0614060000
-81060d7f0d7f0d110d810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d068106047f047f040c040106810700
-82060d068106048204060d820d060783070d0702010203098102047f047a040106810700
-
-82060d068106048704060b060001020781070283020702098109028102047f0446040e0d
-81000d0d0d81000481040d0d0d81000481040682060700
-82060d0681060482040806810600820002078507020902070201028109047f044604810d
-060b068307000d060b068207000482040d060b068207000481040682060700
-82060d0681060481040685060800040307820702098409020702098109040104050d2d04
-030d0204010d1a04050d6604810d060b068307000d06810600070001068207000482040d
-060b068207000481040682060700
-82060d068106048704060b0604000a0789070209020702070209040104010d0204010d1d
-04010d0b04010d0104010d0104010d1204010d0704010d1004010d5504810d060b068307
-000d06810600070001068207000482040d06010601000306010001068207000481040682
-060700
-82060d068106048204070681060001000107010286070209020702040104010d0204010d
-1d04010d0b04010d0504010d1204010d0704010d1004010d5504810d060b068307000d06
-820600060506810006830607000482040d06020601000106010002068207000481040682
-060700
-82060d0681060485040d0607060d010d8407020002090109820200040104010d0204010d
-81040d010d0104030d0104040d0204030d0104020d81040d010d81040d820d040d810d04
-0304010d0504040d0204030d0204030d0104020d0604010d0404030d0204020d0104020d
-5404810d060b068307000d06820600060506810006830607000482040d06030603000306
-8207000481040682060700
-82060d068106048104070507010006020204050d0104010d0104010d0104010d81040d81
-0d0481040d820d040d810d0481040d820d040d810d0481040d810d0481040d820d040d81
-0d040404030d0204020d81040d820d040d810d0481040d820d040d810d0481040d820d04
-0d810d040604010d0304010d0104010d81040d820d040d820d040d810d045404810d060b
-068307000d06820600060506810006830607000482040d06040601000406820700048104
-0682060700
-82060d068106048104050505010006030204010d0504010d0104010d0104010d81040d81
-0d0481040d820d040d040d81040d810d0481040d810d0481040d820d040d810d04070401
-0d0104010d0104010d81040d040d81040d040d81040d810d040604010d0304050d010401
-0d0204010d5504810d060b068307000d06820600060506810006830607000482040d0603
-06030003068207000481040682060700
-82060d0681060481040c010c8205080c830c05030a020a81030a810a040104010d050401
-0d0104010d0104010d81040d810d0481040d820d040d810d040304010d0104010d010401
-0d81040d810d040704010d0104010d0104010d81040d810d040304010d0404010d070401
-0d0304010d0604010d0104010d5504810d060b068307000d068206000605068100068306
-07000482040d06020601000106010002068207000481040682060700
-82060d068106048c040c05070507050c05030a030a840a03000a040104010d0504010d01
-04010d0104010d81040d810d0481040d820d040d810d0481040d820d040d810d0481040d
-810d040104020d0504010d0104010d0104010d0104010d81040d810d0481040d820d040d
-810d0481040d820d040d810d040604010d0304010d0104010d81040d820d040d820d040d
-810d045404810d060106050003068307000d06820600060506810006830607000482040d
-06010601000306010001068207000481040682060700
-82060d0681060482040c08020886070c05030a030a010a82030a040104010d0504010d02
-04030d0104040d0204030d0104010d0204010d0104010d0704030d0204010d0104010d01
-04030d0204030d0204010d0604010d0404030d0204020d0204010d5404810d0601060500
-03068307000d06810600070001068207000482040d060b068207000481040682060700
-82060d0681060482040c080208010c8205030a810a0384030a030a041404010d1404010d
-7f041804810d060b068307000d060b068207000482040d060b0682070004810406820607
-00
-82060d0681060482040c080308850c05030a030a010a82000a041404010d1204020d7f04
-1904810d070c0782000d070c0781000482040d070c0781000481040682060700
-82060d0681060483040c05080208850c05030a030a810a0382030a047f0446041f000104
-0f0001040106810700
-82060d0681060481040c050c8205030a050a7f047b040106810700
-82060d068106047f047f040c040106810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d0637067f073907810d061c06810700
-82060d06030616000306160001068107007f00360082060d0681060015000406810700
-82060d06020681000d140d820700068206000d140d8507000607000d7f0d350d84060d06
-000d140d820700060206810700
-82060d06020682000d06120601078100068306000d061206010784000607000d7f0d350d
-84060d06000d130d01078100060206810700
-82060d06020682000d06120601078100068306000d061206010784000607000d7f0d350d
-84060d06000d810d06110601078100060206810700
-82060d06020682000d06120601078100068306000d061206010784000607000d7f0d350d
-84060d06000d810d06110601078100060206810700
-82060d06020682000d0603068100060606810006030601078100068306000d0612060107
-84000607000d820d000d7f0d320d84060d06000d810d06110601078100060206810700
-82060d06020682000d06030683000600060306810006040601078100068306000d061206
-010785000607000d0081000d7f0d320d84060d06000d810d061106010781000602068107
-00
-82060d06020682000d06040683000600060106810006050601078100068306000d060b06
-8100060406010785000607000d000100810d0081000d820d000d810d0081000d810d0002
-007f0d220d84060d06000d810d06110601078100060206810700
-82060d06020682000d06050685000600060006060601078100068306000d060a06830006
-00060306010785000607000d0081000d810d0082000d000100810d0082000d0081000d81
-0d0081000d7f0d200d84060d06000d810d06110601078100060206810700
-82060d06020682000d0606068300060006070601078100068306000d0609068300060006
-0406010785000607000d0081000d810d0082000d000100810d0082000d0081000d810d00
-81000d7f0d200d84060d06000d810d06110601078100060206810700
-82060d06020682000d0607068300060006060601078100068306000d0604068100060106
-83000600060506010785000607000d0081000d010d0200810d000100010d0100010d0100
-7f0d210d84060d06000d810d06110601078100060206810700
-82060d06020682000d06060685000600060006050601078100068306000d060306870006
-0006000600060606010785000607000d0081000d010d0200810d000100010d0100010d01
-007f0d210d84060d06000d810d06110601078100060206810700
-82060d06020682000d06050681000601068300060006040601078100068306000d060406
-850006000600060706010784000607000d810d0081000d810d0081000d010d0100020d03
-007f0d220d84060d06000d810d0603060100810600820006008100060406010781000602
-06810700
-82060d06020682000d06040681000603068300060006030601078100068306000d060506
-83000600060806010784000607000d7f0d350d84060d06000d810d060306010081060082
-000600810006040601078100060206810700
-82060d06020682000d060306010005060100040601078100068306000d06060681000609
-06010784000607000d7f0d350d84060d06000d810d06110601078100060206810700
-82060d06020682000d06120601078100068306000d061206010784000607000d7f0d350d
-84060d06000d810d06110601078100060206810700
-82060d06020682000d06120601078100068306000d061206010784000607000d7f0d350d
-84060d06000d810d06110601078100060206810700
-82060d06020682000d0714078100068306000d07140784000607000d7f0d350d85060d06
-000d0714078100060206810700
-82060d06020682000d0714078100068306000d07140784000607000d7f0d350d84060d06
-000715078100060206810700
-82060d06030616000306160001068207000d7f0d350d82060d0681060015000406810700
-
-82060d0637068107067f063706810d061c06810700
-82060d0637067f0d3a0d1d06810700
-82060d0601067f077f070a07810d060106810700
-82060d0601068107007f007f00070082060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d010d0300010d0400020d03007f0d720d82060d060106810700
-82060d0601068207000d810d0081000d810d0082000d0081000d810d0082000d0081000d
-810d0081000d7f0d700d82060d060106810700
-82060d0601068207000d810d0081000d810d0082000d0081000d810d0082000d0004007f
-0d710d82060d060106810700
-82060d0601068207000d810d0081000d810d0082000d0081000d810d0082000d0081000d
-7f0d740d82060d060106810700
-82060d0601068207000d810d0081000d810d0082000d0081000d810d0082000d0081000d
-810d0081000d7f0d700d82060d060106810700
-82060d0601068207000d010d0300010d0100010d0100010d03007f0d720d82060d060106
-810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d060106ff0700040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040aff040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a8c040a040a040a040a040a060d060106810700
-82060d0601068307000a047f047f04050482060d060106810700
-82060d060106820700047f047f040504830a060d060106810700
-82060d0601068307000a0482040d047f047f04020482060d060106810700
-82060d0601068207000481040d810d047f047f040104830a060d060106810700
-82060d0601068307000a0d020d81040d810d0482040d0481040d810d0481040d020d7f04
-720482060d060106810700
-82060d0601068207000481040d810d0481040d820d040d010d81040d820d040d810d0481
-040d810d047f046f04830a060d060106810700
-82060d0601068407000a040d810d0481040d820d040d010d81040d820d040d810d048104
-0d810d047f04700482060d060106810700
-82060d0601068207000481040d810d040104020d81040d010d0104010d0104010d7f0470
-04830a060d060106810700
-82060d0601068407000a040d810d040104020d81040d010d0104010d0104010d7f047104
-82060d060106810700
-82060d060106820700040104010d0104010d0204010d0204030d7f047104830a060d0601
-06810700
-82060d0601068307000a047f047f04050482060d060106810700
-82060d060106820700047f047f040504830a060d060106810700
-82060d060106ff07000a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a
-040a040a040a040a040a040a040a040a040a040a040a040a040a04ff0a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a040a04
-0a040a040a040a040a040a048c0a040a040a040a040a04060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d010d81000d810d0081000d7f0d7e0d82060d060106810700
-82060d0601068207000d810d0081000d810d0081000d7f0d7e0d82060d060106810700
-82060d0601068307000d000200810d000300010d0300010d0300020d03007f0d690d8206
-0d060106810700
-82060d0601068207000d810d0081000d810d0081000d810d0082000d0081000d010d0100
-010d0100810d0081000d810d0081000d7f0d670d82060d060106810700
-82060d0601068207000d810d0081000d810d0081000d810d0082000d0081000d010d0500
-810d0004007f0d680d82060d060106810700
-82060d0601068207000d810d0081000d810d0081000d810d0082000d0081000d010d0100
-040d01007f0d6c0d82060d060106810700
-82060d0601068207000d810d0081000d810d0081000d810d0082000d0081000d010d0100
-010d0100810d0081000d810d0081000d7f0d670d82060d060106810700
-82060d0601068207000d010d0100810d0081000d810d0082000d0081000d020d0300020d
-03007f0d690d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068207000d7f0d7f0d060d82060d060106810700
-82060d0601068107067f067f060806810d060106810700
-82060d0601067f0d7f0d0b0d0206810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d0601067f077f070b070206810700
-82060d0601068107007f007f000800810d060106810700
-82060d0601068207000d7f0d760d0e060100810d060106810700
-82060d0601068207000d7f0d760d81060d0b0d81070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d1c0d0100120d01000e0d81000d6b0d0400400d82060d060a0681
-070082000d060106810700
-82060d0601068207000d010d81000d190d81000d120d81000d7b0d85000d000d000d3f0d
-82060d060a0681070082000d060106810700
-82060d0601068207000d810d000300030d0200010d0100010d0100020d0100810d008400
-0d000d0081000d090d0300010d82000d0081000d020d0200020d0200040d0300020d0200
-5f0d81000d020d0100810d0082000d0081000d810d0081000d010d02002c0d82060d0603
-06810006040681070082000d060106810700
-82060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d820d
-000d810d0081000d810d0081000d820d000d070d81000d010d81000d810d0081000d820d
-000d820d000d010d81000d020d81000d020d81000d010d81000d820d000d010d81000d5d
-0d81000d030d0100030d81000d010d81000d820d000d010d81000d2a0d82060d06020602
-00040681070082000d060106810700
-82060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d820d
-000d010d81000d820d000d010d81000d070d81000d040d81000d010d81000d820d000d01
-0d81000d020d81000d020d81000d040d04005e0d81000d030d81000d030d81000d010d81
-000d810d0003002b0d82060d0601060400030681070082000d060106810700
-82060d0601068207000d010d81000d010d81000d820d000d010d81000d820d000d810d00
-81000d820d000d010d81000d820d000d010d81000d070d81000d040d81000d010d81000d
-820d000d010d81000d020d81000d020d81000d040d81000d610d81000d030d81000d030d
-81000d810d0081000d820d000d2e0d82060d068106000500020681070082000d06010681
-0700
-82060d0601068207000d020d0200030d0200030d0100810d0081000d810d000200810d00
-0100810d000100080d0300810d000100810d000100010d0200020d0400020d0300020d03
-005d0d0200020d0300030d0100810d0081000d810d0002002b0d82060d060a0681070082
-000d060106810700
-82060d0601068207000d1a0d81000d7f0d590d82060d060a0681070082000d0601068107
-00
-82060d0601068207000d170d02007f0d5b0d82060d060a0681070082000d060106810700
-
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d8106070c070100810d060106810700
-82060d0601068207000d7f0d760d1000810d060106810700
-82060d0601068207000d7f0d760d92060d060d060d060d060d060d060d060d000d060106
-810700
-82060d0601068207000d7f0d770d91060d060d060d060d060d060d060d06000d06010681
-0700
-82060d0601068207000d030d81000d7f0d2d0d81000d020d0300390d92060d060d060d06
-0d060d060d060d060d000d060106810700
-82060d0601068207000d7f0d320d0100030d81000d3c0d91060d060d060d060d060d060d
-060d06000d060106810700
-82060d0601068207000d010d0200040d0200010d0100810d0081000d7f0d1c0d83000d00
-0d020d81000d3b0d92060d060d060d060d060d060d060d060d000d060106810700
-82060d0601068207000d030d81000d020d81000d010d81000d810d0081000d820d000d7f
-0d1a0d81000d820d000d020d02003b0d91060d060d060d060d060d060d060d06000d0601
-06810700
-82060d0601068207000d030d81000d030d0300010d81000d010d81000d7f0d1a0d040005
-0d81000d380d92060d060d060d060d060d060d060d060d000d060106810700
-82060d0601068207000d030d81000d020d81000d010d81000d820d000d010d81000d7f0d
-1d0d81000d010d81000d010d81000d380d0e060100810d060106810700
-82060d0601068207000d010d0400010d0800810d0001007f0d1c0d0200020d02003a0d81
-060d0b0d81070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d810d0081000d060d81000d030d0100040d01007f0d170d020003
-0d0300390d82060d060a0681070082000d060106810700
-82060d0601068207000d010d81000d0d0d81000d040d81000d7f0d150d81000d010d8100
-0d010d81000d3b0d82060d060a0681070082000d060106810700
-82060d0601068207000d010d82000d0081000d010d0200050d81000d040d81000d7f0d18
-0d81000d020d81000d3b0d82060d060a0681070082000d060106810700
-82060d0601068207000d010d0100010d81000d020d81000d040d81000d040d81000d7f0d
-170d81000d030d02003a0d82060d060a0681070082000d060106810700
-82060d0601068207000d010d81000d010d81000d020d81000d040d81000d040d81000d7f
-0d160d81000d070d81000d380d82060d060a0681070082000d060106810700
-82060d0601068207000d010d81000d010d81000d020d81000d040d81000d040d81000d7f
-0d150d81000d040d81000d010d81000d380d82060d060a0681070082000d060106810700
-
-82060d0601068207000d810d000300020d0400010d0400010d04007f0d140d0400020d02
-003a0d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d030d81000d0a0d0100050d81000d7f0d5b0d82060d060a068107
-0082000d060106810700
-82060d0601068207000d110d81000d7f0d620d82060d060a0681070082000d0601068107
-00
-82060d0601068207000d010d0300010d0100010d0100030d81000d020d0200040d020001
-0d0100810d0081000d7f0d070d0200010d0100810d0081000d020d0200330d82060d060a
-0681070082000d060106810700
-82060d0601068207000d040d81000d010d81000d010d81000d020d81000d040d81000d02
-0d81000d010d81000d810d0081000d820d000d7f0d050d81000d010d81000d810d008100
-0d820d000d820d000d010d81000d310d82060d060a0681070082000d060106810700
-82060d0601068207000d040d81000d010d81000d010d81000d020d81000d040d81000d03
-0d0300010d81000d010d81000d7f0d050d81000d010d81000d820d000d010d81000d810d
-000300320d82060d060a0681070082000d060106810700
-82060d0601068207000d040d81000d010d81000d810d0081000d020d81000d040d81000d
-020d81000d010d81000d820d000d010d81000d7f0d050d81000d010d81000d820d000d01
-0d81000d820d000d350d82060d060a0681070082000d060106810700
-82060d0601068207000d040d81000d020d0100810d0082000d000300010d0400010d0800
-810d0001007f0d060d0200010d0200810d000100010d0300320d82060d060a0681070082
-000d060106810700
-82060d0601068207000d040d81000d7f0d6f0d82060d060a0681070082000d0601068107
-00
-82060d0601068207000d010d02007f0d710d82060d060a0681070082000d060106810700
-
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d7f0d760d82060d060a0681070082000d060106810700
-82060d0601068207000d810d0081000d060d81000d7f0d690d82060d060a068107008200
-0d060106810700
-82060d0601068207000d010d81000d0b0d81000d7f0d640d82060d060a0681070082000d
-060106810700
-82060d0601068207000d010d82000d0081000d010d0200020d0400010d0200820d000d02
-0d0200010d0100810d0081000d7f0d050d0100810d0081000d020d0200010d0100810d00
-81000d020d02002c0d82060d060a0681070082000d060106810700
-82060d0601068207000d010d0100010d81000d020d81000d020d81000d040d85000d000d
-000d820d000d010d81000d810d0081000d820d000d7f0d050d0100010d81000d820d000d
-010d81000d810d0081000d820d000d820d000d010d81000d2a0d82060d060a0681070082
-000d060106810700
-82060d0601068207000d010d81000d010d81000d020d81000d020d81000d040d85000d00
-0d000d010d0300010d81000d010d81000d7f0d050d81000d010d81000d820d000d010d81
-000d820d000d010d81000d810d0003002b0d82060d060a0681070082000d060106810700
-
-82060d0601068207000d010d81000d010d81000d020d81000d020d81000d010d81000d86
-0d000d000d000d820d000d010d81000d820d000d010d81000d7f0d050d81000d010d8100
-0d820d000d010d81000d820d000d010d81000d820d000d2e0d82060d060a068107008200
-0d060106810700
-82060d0601068207000d810d000300020d0400020d0200010d0600810d000400810d0002
-007f0d060d0200810d000100010d0200010d0200810d000100010d03002b0d8106070c07
-0100810d060106810700
-82060d0601068207000d240d81000d7f0d4f0d1000810d060106810700
-82060d0601068207000d230d02007f0d4f0d0e060100810d060106810700
-82060d0601068207000d7f0d760d81060d0b0d81070082000d060106810700
-82060d060106820700047f04760482060d060a0681070082000d060106810700
-82060d060106820700047f04760482060d060a0681070082000d060106810700
-82060d060106820700047f04760482060d060a0681070082000d060106810700
-82060d060106820700047f04760482060d060a0681070082000d060106810700
-82060d060106820700043404810d041304010d7f04290482060d06810600050002068107
-0082000d060106810700
-82060d060106820700041d04810d042b04810d046204810d04430482060d060106040003
-0681070082000d060106810700
-82060d060106820700040204030d0204020d0104010d81040d810d040204030d81040d03
-0d0204010d81040d810d040104020d0204020d0204010d81040d810d040204020d030401
-0d82040d046104040d0104020d81040d010d0104020d330482060d060206020004068107
-0082000d060106810700
-82060d060106820700040104810d040104810d0482040d040104810d0481040d810d0482
-040d0482040d040404810d040504010d0304810d040104810d040204810d040204010d01
-04810d0482040d040104810d0482040d0481040d810d046204810d040404810d04010481
-0d0482040d040104810d04310482060d060306810006040681070082000d060106810700
-
-82060d060106820700040104810d040404810d040104810d0482040d040104810d040104
-020d0204810d040504810d040404030d0304810d040204810d040104810d0481040d030d
-0104810d040104810d046204810d040404850d040d040d0482040d040104810d04310482
-060d060a0681070082000d060106810700
-82060d060106820700040104810d040404810d040104810d0482040d040104810d040404
-810d0482040d040104810d040104810d040304810d040104810d040204810d040204810d
-040104810d0482040d040404810d040104810d046204810d040104810d0486040d040d04
-0d0482040d040104810d04310482060d060a0681070082000d060106810700
-82060d060106820700040204030d0204020d0104020d81040d010d81040d020d0304020d
-0204030d0204050d81040d030d81040d010d81040d010d0104030d0204040d6304020d03
-04830d040d040204020d330482060d060a0681070082000d060106810700
-82060d060106820700047f04760482060d060a0681070082000d060106810700
-82060d060106820700047f0476048106070c070100810d060106810700
-82060d060106820700047f0476041000810d060106810700
-82060d0601068107067f0677061000810d060106810700
-82060d0601067f0d7f0d0b0d0206810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-82060d067f067f061006810700
-8106077f077f0712070000
-7f007f001500
-
-%
-% Compression made this file 6.27% of the uncompressed size.
-%
-
-
-showpage
-
-% stop using temporary dictionary
-end
-
-% restore original state
-origstate restore
-
-%%Trailer
diff --git a/contrib/docs/latex/deprecated/prop1.gif b/contrib/docs/latex/deprecated/prop1.gif
deleted file mode 100644
index a3d724d570..0000000000
Binary files a/contrib/docs/latex/deprecated/prop1.gif and /dev/null differ
diff --git a/contrib/docs/latex/deprecated/prop2.bmp b/contrib/docs/latex/deprecated/prop2.bmp
deleted file mode 100644
index d909f41abc..0000000000
Binary files a/contrib/docs/latex/deprecated/prop2.bmp and /dev/null differ
diff --git a/contrib/docs/latex/deprecated/prop2.eps b/contrib/docs/latex/deprecated/prop2.eps
deleted file mode 100644
index 398e70c553..0000000000
--- a/contrib/docs/latex/deprecated/prop2.eps
+++ /dev/null
@@ -1,664 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: prop2.eps
-%%Creator: XV Version 2.20  Rev: 4/24/92  -  by John Bradley
-%%BoundingBox: 167 221 466 500
-%%Pages: 1
-%%DocumentFonts:
-%%EndComments
-%%EndProlog
-
-%%Page: 1 1
-
-% remember original state
-/origstate save def
-
-% build a temporary dictionary
-20 dict begin
-
-% lower left corner
-167 221 translate
-
-% size of image (on paper, in 1/72inch coords)
-299 279 scale
-
-% define 'colorimage' if it isn't defined
-%   ('colortogray' and 'mergeprocs' come from xwd2ps
-%     via xgrab)
-/colorimage where   % do we know about 'colorimage'?
-  { pop }           % yes: pop off the 'dict' returned
-  {                 % no:  define one
-    /colortogray {  % define an RGB->I function
-      /rgbdata exch store    % call input 'rgbdata'
-      rgbdata length 3 idiv
-      /npixls exch store
-      /rgbindx 0 store
-      /grays npixls string store  % str to hold the result
-      0 1 npixls 1 sub {
-        grays exch
-        rgbdata rgbindx       get 20 mul    % Red
-        rgbdata rgbindx 1 add get 32 mul    % Green
-        rgbdata rgbindx 2 add get 12 mul    % Blue
-        add add 64 idiv      % I = .5G + .31R + .18B
-        put
-        /rgbindx rgbindx 3 add store
-      } for
-      grays
-    } bind def
-
-    % Utility procedure for colorimage operator.
-    % This procedure takes two procedures off the
-    % stack and merges them into a single procedure.
-
-    /mergeprocs { % def
-      dup length
-      3 -1 roll
-      dup
-      length
-      dup
-      5 1 roll
-      3 -1 roll
-      add
-      array cvx
-      dup
-      3 -1 roll
-      0 exch
-      putinterval
-      dup
-      4 2 roll
-      putinterval
-    } bind def
-
-    /colorimage { % def
-      pop pop     % remove 'false 3' operands
-      {colortogray} mergeprocs
-      image
-    } bind def
-  } ifelse          % end of 'false' case
-
-
-
-% define the colormap
-/cmap 42 string def
-
-
-% load up the colormap
-currentfile cmap readhexstring
-000000 bf0000 00bf00 bfbf00 0000bf 00bfbf c0c0c0 808080 ff0000 00ff00 
-ffff00 0000ff 00ffff ffffff 
-pop pop   % lose return values from readhexstring
-
-
-% rlecmapimage expects to have 'w h bits matrix' on stack
-/rlecmapimage {
-  /buffer 1 string def
-  /rgbval 3 string def
-  /block  384 string def
-
-  % proc to read a block from file, and return RGB data
-  { currentfile buffer readhexstring pop
-    /bcount exch 0 get store
-    bcount 128 ge
-    {  % it's a non-run block
-      0 1 bcount 128 sub
-      { currentfile buffer readhexstring pop pop
-
-        % look up value in color map
-        /rgbval cmap buffer 0 get 3 mul 3 getinterval store
-
-        % and put it in position i*3 in block
-        block exch 3 mul rgbval putinterval
-      } for
-      block  0  bcount 127 sub 3 mul  getinterval
-    }
-
-    { % else it's a run block
-      currentfile buffer readhexstring pop pop
-
-      % look up value in colormap
-      /rgbval cmap buffer 0 get 3 mul 3 getinterval store
-
-      0 1 bcount { block exch 3 mul rgbval putinterval } for
-
-      block 0 bcount 1 add 3 mul getinterval
-    } ifelse
-  } % end of proc
-  false 3 colorimage
-} bind def
-
-
-299 279 8			% dimensions of data
-[299 0 0 -279 0 279]		% mapping matrix
-rlecmapimage
-
-7f0003007f072607
-07077f067f0618068100070707
-070781060d7f0d7f0d150d820700070707
-070782060d067f067f061406820700070707
-070782060d067f067f061406820700070707
-070782060d068106077f077f0710070106820700070707
-070782060d068106078207060d820d060783070d0702010203098102077f077e07010682
-0700070707
-070782060d068106078707060b060001020781070283020702098109028102077f074a07
-0e0d81000d0d0d81000781070d0d0d81000781070683060700070707
-070782060d0681060782070806810600820002078507020902070201028109077f074a07
-810d060b068307000d060b068207000782070d060b068207000781070683060700070707
-
-070782060d06810607810706850608000403078207020984090207020981090701070506
-2d070306020701061a0705066a07810d060b068307000d06810600070001068207000782
-070d060b068207000781070683060700070707
-070782060d068106078707060b0604000a07890702090207020702090701070106020701
-061d0701060b07010601070106010701061207010607070106100701065907810d060b06
-8307000d06810600070001068207000782070d0601060100030601000106820700078107
-0683060700070707
-070782060d0681060701070106020001070102860702090207020701070106020701061d
-0701060b070106050701061207010607070106100701065907810d060b068307000d0682
-0600060506810006830607000782070d0602060100010601000206820700078107068306
-0700070707
-070782060d0681060785070d0607060d010d840702000209010982020007010701060207
-010681070601060107030601070406020703060107020681070601068107068206070681
-060703070106050704060207030602070306010702060607010604070306020702060107
-02065807810d060b068307000d06820600060506810006830607000782070d0603060300
-03068207000781070683060700070707
-070782060d06810607070701000602020705060107010601070106010701068107068106
-078107068206070681060781070682060706810607810706810607810706820607068106
-070407030602070206810706820607068106078107068206070681060781070682060706
-81060706070106030701060107010681070682060706820607068106075807810d060b06
-8307000d06820600060506810006830607000782070d0604060100040682070007810706
-83060700070707
-070782060d06810607810705050501000603020701060507010601070106010701068107
-068106078107068206070604068107068106078107068106078107068206070681060707
-070106010701060107010681070604068107060406810706810607060701060307050601
-070106020701065907810d060b068307000d06820600060506810006830607000782070d
-060306030003068207000781070683060700070707
-070782060d0681060781070c010c8205080c830c05030a020a81030a810a070107010605
-070106010701060107010681070681060781070682060706810607030701060107010601
-070106810706810607070701060107010601070106810706810607030701060407010607
-0701060307010606070106010701065907810d060b068307000d06820600060506810006
-830607000782070d06020601000106010002068207000781070683060700070707
-070782060d068106078c070c05070507050c05030a030a840a03000a0701070106050701
-060107010601070106810706810607810706820607068106078107068206070681060781
-070681060701070206050701060107010601070106010701068107068106078107068206
-070681060781070682060706810607060701060307010601070106810706820607068206
-07068106075807810d060106050003068307000d06820600060506810006830607000782
-070d06010601000306010001068207000781070683060700070707
-070782060d0681060782070c08020886070c05030a030a010a82030a0701070106050701
-060207030601070406020703060107010602070106010701060707030602070106010701
-06010703060207030602070106060701060407030602070206020701065807810d060106
-050003068307000d06810600070001068207000782070d060b0682070007810706830607
-00070707
-070782060d0681060782070c080208010c8205030a810a0384030a030a07140701061407
-01067f071c07810d060b068307000d060b068207000782070d060b068207000781070683
-060700070707
-070782060d0681060782070c080308850c05030a030a010a82000a071407010612070206
-7f071d07810d070c0782000d070c0781000782070d070c07810007810706830607000707
-07
-070782060d0681060783070c05080208850c05030a030a810a0382030a077f074a071f00
-01070f0001070106820700070707
-070782060d0681060781070c050c8205030a050a7f077f070106820700070707
-070782060d068106077f077f0710070106820700070707
-070782060d067f067f061406820700070707
-070782060d067f067f061406820700070707
-070782060d0637067f073d07810d061c06820700070707
-070782060d06030616000306160001068107007f003a0082060d06810600150004068207
-00070707
-070782060d06020681000d140d820700068206000d140d8507000607000d7f0d390d8406
-0d06000d140d820700060206820700070707
-070782060d06020682000d06120601078100068306000d061206010784000607000d7f0d
-390d84060d06000d130d01078100060206820700070707
-070782060d06020682000d06120601078100068306000d061206010784000607000d7f0d
-390d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d06120601078100068306000d061206010784000607000d7f0d
-390d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0603068100060606810006030601078100068306000d061206
-010784000607000d010d0100020d0200020d0200020d02007f0d230d84060d06000d810d
-06110601078100060206820700070707
-070782060d06020682000d060306020003060200040601078100068306000d060b068100
-060406010784000607000d810d000100010d0100810d0082000d0082000d0082000d0082
-000d0081000d7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d060406020001060200050601078100068306000d060a060200
-0406010785000607000d000200010d0100810d0082000d0082000d0082000d0082000d00
-81000d7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0605060500060601078100068306000d060906030004060107
-87000607000d000d0081000d810d0082000d0082000d0082000d0082000d0082000d0081
-000d7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0606060300070601078100068306000d060806030005060107
-84000607000d010d0100010d0100810d0082000d0082000d0082000d0082000d0081000d
-7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0606060300070601078100068306000d060306010001060300
-0606010784000607000d010d0100010d0100810d0082000d0082000d0082000d0082000d
-0081000d7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0605060500060601078100068306000d060306060007060107
-84000607000d010d0100010d0100810d0082000d0082000d0082000d0082000d0081000d
-7f0d210d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d060406020001060200050601078100068306000d0604060400
-0806010784000607000d010d0100020d0200020d0200020d02007f0d230d84060d06000d
-810d060306010781060782070607810706040601078100060206820700070707
-070782060d06020682000d060306020003060200040601078100068306000d0605060200
-0906010784000607000d7f0d390d84060d06000d810d0603060107810607820706078107
-06040601078100060206820700070707
-070782060d06020682000d060306010005060100040601078100068306000d0606068100
-060906010784000607000d7f0d390d84060d06000d810d06110601078100060206820700
-070707
-070782060d06020682000d06120601078100068306000d061206010784000607000d7f0d
-390d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d06120601078100068306000d061206010784000607000d7f0d
-390d84060d06000d810d06110601078100060206820700070707
-070782060d06020682000d0714078100068306000d07140784000607000d7f0d390d8506
-0d06000d0714078100060206820700070707
-070782060d06020682000d0714078100068306000d07140784000607000d7f0d390d8406
-0d06000715078100060206820700070707
-070782060d06030616000306160001068207000d7f0d390d82060d068106001500040682
-0700070707
-070782060d0637068107067f063b06810d061c06820700070707
-070782060d0637067f0d3e0d1d06820700070707
-070782060d0601067f077f070e07810d060106820700070707
-070782060d0601068107007f007f000b0082060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d040d0100120d01007f0d150d0200550d82060d0601068207
-00070707
-070782060d0601068207000d030d81000d140d81000d7f0d130d81000d010d81000d530d
-82060d060106820700070707
-070782060d0601068207000d020d0300010d0100810d0081000d010d0200030d0100820d
-000d7f0d130d81000d010d81000d530d82060d060106820700070707
-070782060d0601068207000d030d81000d030d0100030d81000d010d81000d820d000d81
-0d0081000d7f0d130d81000d010d81000d530d82060d060106820700070707
-070782060d0601068207000d030d81000d030d81000d030d0400010d81000d010d81000d
-7f0d130d81000d010d81000d530d82060d060106820700070707
-070782060d0601068207000d030d81000d030d81000d030d81000d040d81000d010d8100
-0d7f0d130d81000d010d81000d530d82060d060106820700070707
-070782060d0601068207000d020d0300010d0300030d0300020d04007f0d140d0200550d
-82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d1c0d0100120d01000e0d81000d6b0d0400090d0100480d82
-060d060106820700070707
-070782060d0601068207000d010d81000d190d81000d120d81000d7c0d81000d820d000d
-090d81000d470d82060d060106820700070707
-070782060d0601068207000d810d000300030d0200010d0100010d0100020d0100810d00
-84000d000d0081000d090d0300010d82000d0081000d020d0200020d0200040d0300020d
-02005e0d83000d000d020d0200040d81000d030d0300020d0200390d82060d0601068207
-00070707
-070782060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d
-820d000d810d0081000d810d0081000d820d000d070d81000d010d81000d810d0081000d
-820d000d820d000d010d81000d020d81000d020d81000d010d81000d820d000d010d8100
-0d5c0d0200020d81000d010d81000d020d81000d020d81000d040d81000d010d81000d37
-0d82060d060106820700070707
-070782060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d
-820d000d010d81000d820d000d010d81000d070d81000d040d81000d010d81000d820d00
-0d010d81000d020d81000d020d81000d040d04005d0d83000d000d020d0300030d81000d
-030d0200020d0400380d82060d060106820700070707
-070782060d0601068207000d010d81000d010d81000d820d000d010d81000d820d000d81
-0d0081000d820d000d010d81000d820d000d010d81000d070d81000d040d81000d010d81
-000d820d000d010d81000d020d81000d020d81000d040d81000d600d81000d030d81000d
-010d81000d020d81000d060d81000d820d000d3b0d82060d060106820700070707
-070782060d0601068207000d020d0200030d0200030d0100810d0081000d810d00020081
-0d000100810d000100080d0300810d000100810d000100010d0200020d0400020d030002
-0d03005c0d0200030d0500810d000300010d0300030d0300380d82060d06010682070007
-0707
-070782060d0601068207000d1a0d81000d7f0d6d0d82060d060106820700070707
-070782060d0601068207000d170d02007f0d6f0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700040304810d047f043204010d4f0482060d0601068207000707
-07
-070782060d060106820700047f043904810d044e0482060d060106820700070707
-070782060d060106820700040104020d0404020d0104010d81040d810d047f042404810d
-044e0482060d060106820700070707
-070782060d060106820700040304810d040204810d040104810d0481040d810d0482040d
-047f041a04040d0304810d044e0482060d060106820700070707
-070782060d060106820700040304810d040304030d0104810d040104810d047f04230481
-0d044e0482060d060106820700070707
-070782060d060106820700040304810d040204810d040104810d0482040d040104810d04
-7f042304810d044e0482060d060106820700070707
-070782060d060106820700040104040d0104080d81040d010d7f042104040d4d0482060d
-060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d060106820700047f047f040a0482060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d810d0081000d060d81000d030d0100040d01007f0d170d02
-00030d03004d0d82060d060106820700070707
-070782060d0601068207000d010d81000d0d0d81000d040d81000d7f0d150d81000d010d
-81000d010d81000d4f0d82060d060106820700070707
-070782060d0601068207000d010d82000d0081000d010d0200050d81000d040d81000d7f
-0d180d81000d020d81000d4f0d82060d060106820700070707
-070782060d0601068207000d010d0100010d81000d020d81000d040d81000d040d81000d
-7f0d170d81000d030d02004e0d82060d060106820700070707
-070782060d0601068207000d010d81000d010d81000d020d81000d040d81000d040d8100
-0d7f0d160d81000d070d81000d4c0d82060d060106820700070707
-070782060d0601068207000d010d81000d010d81000d020d81000d040d81000d040d8100
-0d7f0d150d81000d040d81000d010d81000d4c0d82060d060106820700070707
-070782060d0601068207000d810d000300020d0400010d0400010d04007f0d140d040002
-0d02004e0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d030d81000d0a0d0100050d81000d7f0d6f0d82060d060106
-820700070707
-070782060d0601068207000d110d81000d7f0d760d82060d060106820700070707
-070782060d0601068207000d010d0300010d0100010d0100030d81000d020d0200040d02
-00010d0100810d0081000d7f0d070d0200010d0100810d0081000d020d0200470d82060d
-060106820700070707
-070782060d0601068207000d040d81000d010d81000d010d81000d020d81000d040d8100
-0d020d81000d010d81000d810d0081000d820d000d7f0d050d81000d010d81000d810d00
-81000d820d000d820d000d010d81000d450d82060d060106820700070707
-070782060d0601068207000d040d81000d010d81000d010d81000d020d81000d040d8100
-0d030d0300010d81000d010d81000d7f0d050d81000d010d81000d820d000d010d81000d
-810d000300460d82060d060106820700070707
-070782060d0601068207000d040d81000d010d81000d810d0081000d020d81000d040d81
-000d020d81000d010d81000d820d000d010d81000d7f0d050d81000d010d81000d820d00
-0d010d81000d820d000d490d82060d060106820700070707
-070782060d0601068207000d040d81000d020d0100810d0082000d000300010d0400010d
-0800810d0001007f0d060d0200010d0200810d000100010d0300460d82060d0601068207
-00070707
-070782060d0601068207000d040d81000d7f0d7f0d030d82060d060106820700070707
-070782060d0601068207000d010d02007f0d7f0d050d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d810d0081000d060d81000d7f0d7d0d82060d060106820700
-070707
-070782060d0601068207000d010d81000d0b0d81000d7f0d780d82060d06010682070007
-0707
-070782060d0601068207000d010d82000d0081000d010d0200020d0400010d0200820d00
-0d020d0200010d0100810d0081000d7f0d050d0100810d0081000d020d0200010d010081
-0d0081000d020d0200400d82060d060106820700070707
-070782060d0601068207000d010d0100010d81000d020d81000d020d81000d040d85000d
-000d000d820d000d010d81000d810d0081000d820d000d7f0d050d0100010d81000d820d
-000d010d81000d810d0081000d820d000d820d000d010d81000d3e0d82060d0601068207
-00070707
-070782060d0601068207000d010d81000d010d81000d020d81000d020d81000d040d8500
-0d000d000d010d0300010d81000d010d81000d7f0d050d81000d010d81000d820d000d01
-0d81000d820d000d010d81000d810d0003003f0d82060d060106820700070707
-070782060d0601068207000d010d81000d010d81000d020d81000d020d81000d010d8100
-0d860d000d000d000d820d000d010d81000d820d000d010d81000d7f0d050d81000d010d
-81000d820d000d010d81000d820d000d010d81000d820d000d420d82060d060106820700
-070707
-070782060d0601068207000d810d000300020d0400020d0200010d0600810d000400810d
-0002007f0d060d0200810d000100010d0200010d0200810d000100010d03003f0d82060d
-060106820700070707
-070782060d0601068207000d240d81000d7f0d630d82060d060106820700070707
-070782060d0601068207000d230d02007f0d630d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d340d81000d130d01007f0d3d0d82060d0601068207000707
-07
-070782060d0601068207000d1d0d81000d2b0d81000d620d81000d570d82060d06010682
-0700070707
-070782060d0601068207000d020d0300020d0200010d0100810d0081000d020d0300810d
-000300020d0100810d0081000d010d0200020d0200020d0100810d0081000d020d020003
-0d0100820d000d610d0400010d0200810d000100010d0200470d82060d06010682070007
-0707
-070782060d0601068207000d010d81000d010d81000d820d000d010d81000d810d008100
-0d820d000d820d000d040d81000d050d0100030d81000d010d81000d020d81000d020d01
-00010d81000d820d000d010d81000d820d000d810d0081000d620d81000d040d81000d01
-0d81000d820d000d010d81000d450d82060d060106820700070707
-070782060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d
-010d0200020d81000d050d81000d040d0300030d81000d020d81000d010d81000d810d00
-0300010d81000d010d81000d620d81000d040d85000d000d000d820d000d010d81000d45
-0d82060d060106820700070707
-070782060d0601068207000d010d81000d040d81000d010d81000d820d000d010d81000d
-040d81000d820d000d010d81000d010d81000d030d81000d010d81000d020d81000d020d
-81000d010d81000d820d000d040d81000d010d81000d620d81000d010d81000d860d000d
-000d000d820d000d010d81000d450d82060d060106820700070707
-070782060d0601068207000d020d0300020d0200010d0200810d000100810d000200030d
-0200020d0300020d0500810d000300810d000100810d000100010d0300020d0400630d02
-00030d83000d000d020d0200470d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-070782060d0601068207000d7f0d7f0d0a0d82060d060106820700070707
-7f077f0726078100070107
-03077f0d7f0d210d820700070107
-0307820d06077f077f071c07840d060700070107
-0307830d0607047f047f041c0483060700070107
-0307830d0607047f047f041c0483060700070107
-0307830d0607047f047f040a040e0d8100048404060700070107
-0307830d0607047f047f040a04810d060b06820700048404060700070107
-0307830d06070481040d040d3a04010d7f044604810d060b068207000484040607000701
-07
-0307830d06070481040d810d040104010d1d04010d1904010d7f044604810d0601060107
-030601070106820700048404060700070107
-0307830d06070481040d810d040104010d1d04010d1904010d7f044604810d0602060107
-01060107010d83060700048404060700070107
-0307830d06070481040d810d040104010d81040d010d0104030d0104040d0204030d0104
-020d81040d010d81040d820d040d810d040304010d0104010d0104030d0104010d81040d
-810d0481040d810d0481040d020d0604030d0104020d81040d010d0104030d0104020d7f
-041a04810d0603060307010d0106820700048404060700070107
-0307830d06070481040d040d0104010d0104010d0104010d81040d810d0481040d820d04
-0d810d0481040d820d040d810d0481040d810d0481040d820d040d810d040304010d0104
-010d0404010d81040d820d040d810d0481040d820d040d810d0481040d810d040304010d
-0104010d81040d810d0481040d810d0481040d810d0481040d820d040d810d047f041a04
-810d0604060107010d0206820700048404060700070107
-0307830d06070481040d810d040404010d0104010d0104010d81040d810d0481040d820d
-040d040d81040d810d0481040d810d0481040d820d040d810d040404030d0204040d8104
-0d820d040d810d0481040d820d040d040d0404050d81040d810d0481040d810d0481040d
-810d0481040d820d040d810d047f041a04810d0603060307030682070004840406070007
-0107
-0307830d06070481040d810d040404010d0104010d0104010d81040d810d0481040d820d
-040d810d040304010d0104010d0104010d81040d810d040404030d0104010d0104010d81
-040d820d040d810d0481040d820d040d810d040704010d0404010d0104010d0104010d01
-04010d81040d810d047f041a04810d0602060107010d0107020682070004840406070007
-0107
-0307830d06070481040d810d040404010d0104010d0104010d81040d810d0481040d820d
-040d810d0481040d820d040d810d0481040d810d040104020d0704010d0204010d010401
-0d81040d820d040d820d040d010d81040d810d0481040d810d040304010d0104010d8104
-0d810d0481040d810d0481040d810d0481040d820d040d810d047f041a04810d06010601
-07010d010601070106820700048404060700070107
-0307830d06070481040d810d040404010d0204030d0104040d0204030d0104010d020401
-0d0104010d0804010d0304040d81040d810d0481040d030d0104030d0604030d0104010d
-0104010d0204030d0104010d7f041b04810d060206010d0306010d830607000484040607
-00070107
-0307830d0607041304010d1404010d7f045d04810d060b06820700048404060700070107
-
-0307830d0607041304010d1204020d7f045e04810d070c078100048404060700070107
-0307830d0607047f047f040a040f00010483060700070107
-0307830d0607047f047f041c0483060700070107
-0307830d0607047f047f041c0483060700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d06170602037f067f060406820700070107
-0307810d06160681030a830a0600067f067f060206820700070107
-0307810d06150681030a020a83060007067f067f0683060700070107
-0307810d06150681030a030a8100078107067f067f06820700070107
-0307810d06140681030a040a820600078107067f067e06820700070107
-0307810d06140681030a050a8100078107067f067e06820700070107
-0307810d06130681030a060a820600078107067f067d06820700070107
-0307810d06130681030a070a8100078107067f067d06820700070107
-0307810d06120681030a080a820600078107067f067c06820700070107
-0307810d06120681030a010a810600010081060a010a8100078107067f067c0682070007
-0107
-0307810d06110681030a020a0400020a820600078107067f067b06820700070107
-0307810d06110681030a020a0400030a8100078107061606810006030681000605068100
-0627068100061b0681000620068100062c06040001060200140681000602060400010602
-0001068100060a06820700070107
-0307810d06100681030a030a0400030a8206000781070615068100060306810006050681
-000621068100060306810006230681000618068100060906810006200681000603068100
-060106810006120681000602068100060306810006010683000600060a06820700070107
-
-0307810d06100681030a030a0400040a8100078107061606810006010681000606068100
-062106810006030681000623068100061806810006090681000620068100060306810006
-0106810006120681000602068100060306810006010683000600060a06820700070107
-0307810d060f0681030a040a0400040a8206000781070615068100060106810006010602
-000106830006000601068100068106000100040602008106008100068206000601068100
-068106008100068106008100060206030002060200050602000106820006008100060306
-840006000600810006810600810006810600010002060300010602000106010003060300
-020602000106010082060006820600068206000681060001000206020001068200060081
-000606060300010681000601068100060306020001068200060081000601060300030603
-000106810006010683000600060a06820700070107
-0307810d060f0681030a040a810300010081030a040a8100078107061506810006010681
-000604068500060006000601068300060006010681000602068100068206000684060006
-000601068300060006840600060006030681000601068300060006010681000606068200
-060081000682060006020682000600810006840600060006820600060106830006000601
-068300060006010683000600060306810006010683000600060106830006000682060006
-820600068406000600060106830006000601068200060081000682060006050681000601
-068300060006010681000606068200060081000684060006000601068100060206810006
-01068300060006010683000600060a06820700070107
-0307810d060e0681030a050a810600010081060a040a8206000781070615068300060006
-020603008406000600060106820006000300030681000682060006840600060006010681
-000682060006010681000603068100060106820006000300040603008206000601068100
-060206830006000601068300060006810600030082060006010682000600030082060006
-030681000601068200060003008206000689060006000600060006000300810600030082
-060006010681000602060100040683000600060106810006030603008206000601068300
-060006010681000606068300060006010683000600060a06820700070107
-0307810d060e0681030a060a0200070a8100078107061506830006000601068100060106
-850006000600060106830006000606068100068206000684060006000601068100060106
-810006820600060306810006010683000600060606810006010683000600060106810006
-020683000600060106830006000682060006030681000601068300060006030681000603
-068100060106830006000603068100068a06000600060006000600060306810006030681
-000601068100060906830006000601068100060206810006010683000600060106830006
-0006010681000606068300060006010683000600060a06820700070107
-0307810d060d0681030a070a830300030a060a8206000781070615068100060206810006
-010685000600060006810600830006000601068100060206810006820600068406000600
-068106008300060006840600060006030681000601068300060006010681000602068100
-060106830006000601068100060206830006000601068300060006820600060106830006
-000601068300060006010683000600060306810006010683000600060106830006000601
-068100060106810006820600060106830006000601068300060006010681000605068100
-060106830006000601068100060206810006010683000600060106830006000601068100
-0602068100060106830006000601068100060c06820700070107
-0307810d060d0681030a070a830600060a070a8100078107061506810006030603008206
-000681060083000600068106000100040681000682060006820600068106008300060006
-810600810006010681000602060300020602000506030082060006010681000602068300
-060006010681000682060006810600010002060300010602000106810006030603000206
-020002068100068206000601068100060106020002060200010681000601068100060606
-020002060200050603008206000601068100068106000200040602000206020001068100
-060a06820700070107
-0307810d060c0681030a090a81000a080a820600078107067c0681000677068207000701
-07
-0307810d060c0681030a150a810007810706780603007906820700070107
-0307810d060b0681030a090a8106008200060a070a820600078107067f06750682070007
-0107
-0307810d060b0681030a090a0300090a8100078107067f067506820700070107
-0307810d060a0681030a0a0a0300090a820600078107067f067406820700070107
-0307810d060a0681030a0a0a8106008200060a090a8100078107067f0674068207000701
-07
-0307810d060a0681030a190a81000701077f067406820700070107
-0307810d060a0681030a180a8206000701077f067406820700070107
-0307810d060b0681030a160a8206000702077f067406820700070107
-0307810d060c06810300160004077f067406820700070107
-0307810d060e061a077f067506820700070107
-0307810d060f0618077f067606820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d066b0648006a06820700070107
-0307810d066a064a006906820700070107
-0307810d066a060100450d8107008100066806820700070107
-0307810d066a060100440d010701006906820700070107
-0307810d066a060100010d18069100060006000600060006000600060006000617060107
-01006906820700070107
-0307810d066a060100010d4206010701006906820700070107
-0307810d066a060100010d18068100060d068100061706010701006906820700070107
-0307810d066a060100010d1b060300020681000601068100061906010701006906820700
-070107
-0307810d066a060100010d18068300060006020681000682060006820600068206000617
-06010701006906820700070107
-0307810d066a060100010d1a0681000602068100068406000600061b0601070100690682
-0700070107
-0307810d066a060100010d18068300060006020681000681060081000602068100061706
-010701006906820700070107
-0307810d066a060100010d1a0681000602068100068106008100061c0601070100690682
-0700070107
-0307810d066a060100010d18068300060006020681000684060006000601068100061706
-010701006906820700070107
-0307810d066a060100010d1a06810006020681000682060006820600061a060107010069
-06820700070107
-0307810d066a060100010d18068300060006020681000682060006010683000600061706
-010701006906820700070107
-0307810d066a060100010d1b060300020681000602068100061806010701006906820700
-070107
-0307810d066a060100010d18068100060d068100061706010701006906820700070107
-0307810d066a060100010d4206010701006906820700070107
-0307810d066a060100010d18069100060006000600060006000600060006000617060107
-01006906820700070107
-0307810d066a060100810d07440701006906820700070107
-0307810d066a060100460701006906820700070107
-0307810d066a064a006906820700070107
-0307810d066b0648006a06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-0307810d067f067f061f06820700070107
-7f077f0726078100070107
-02077f007f0024000207
-7f077f072a07
-7f077f072a07
-7f077f072a07
-7f077f072a07
-7f077f072a07
-7f077f072a07
-
-%
-% Compression made this file 5.68% of the uncompressed size.
-%
-
-
-showpage
-
-% stop using temporary dictionary
-end
-
-% restore original state
-origstate restore
-
-%%Trailer
diff --git a/contrib/docs/latex/deprecated/prop2.gif b/contrib/docs/latex/deprecated/prop2.gif
deleted file mode 100644
index 764f9882b1..0000000000
Binary files a/contrib/docs/latex/deprecated/prop2.gif and /dev/null differ
diff --git a/contrib/docs/latex/deprecated/propbfva.tex b/contrib/docs/latex/deprecated/propbfva.tex
deleted file mode 100644
index a091c492cf..0000000000
--- a/contrib/docs/latex/deprecated/propbfva.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\section{\class{wxBoolFormValidator}}\label{wxboolformvalidator}
-
-This class validates a boolean value for a \helpref{form view}{wxpropertyformview}.
-The associated control must be a wxCheckBox.
-
-\wxheading{See also}
-
-\helpref{Property validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxBoolFormValidator::wxBoolFormValidator}
-
-\func{void}{wxBoolFormValidator}{\param{long }{flags=0}}
-
-Constructor.
-
diff --git a/contrib/docs/latex/deprecated/propblva.tex b/contrib/docs/latex/deprecated/propblva.tex
deleted file mode 100644
index 172bc51a43..0000000000
--- a/contrib/docs/latex/deprecated/propblva.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\section{\class{wxBoolListValidator}}\label{wxboollistvalidator}
-
-This class validates a boolean value for a \helpref{property list view}{wxpropertylistview}.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxBoolListValidator::wxBoolListValidator}
-
-\func{void}{wxBoolListValidator}{\param{long }{flags=0}}
-
-Constructor.
-
diff --git a/contrib/docs/latex/deprecated/property.tex b/contrib/docs/latex/deprecated/property.tex
deleted file mode 100644
index f981df8641..0000000000
--- a/contrib/docs/latex/deprecated/property.tex
+++ /dev/null
@@ -1,107 +0,0 @@
-\section{\class{wxProperty}}\label{wxproperty}
-
-The {\bf wxProperty} class represents a property, with a \helpref{wxPropertyValue}{wxpropertyvalue}\rtfsp
-containing the actual value, a name a role, an optional validator, and
-an optional associated window. 
-
-A property might correspond to an actual C++ data member, or it
-might correspond to a conceptual property, such as the width of a window.
-There is no explicit data member {\it wxWindow::width}, but it may be convenient
-to invent such a property for the purposes of editing attributes of the window.
-The properties in the property sheet can be mapped to ``reality" by
-whatever means (in this case by calling wxWindow::SetSize when the user has
-finished editing the property sheet).
-
-A validator may be associated with the property in order to ensure that this and
-only this validator will be used for editing and validating the property.
-An alternative method is to use the {\it role} parameter to specify what kind
-of validator would be appropriate; for example, specifying ``filename" for the role
-would allow the property view to find an appropriate validator at edit time.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxProperty::wxProperty}
-
-\func{void}{wxProperty}{\void}
-
-\func{void}{wxProperty}{\param{wxProperty\& }{prop}}
-
-\func{void}{wxProperty}{\param{wxString}{ name}, \param{wxString}{ role}, \param{wxPropertyValidator *}{validator=NULL}}
-
-\func{void}{wxProperty}{\param{wxString}{ name}, \param{const wxPropertyValue\&}{ val}, \param{wxString}{ role}, \param{wxPropertyValidator *}{validator=NULL}}
-
-Constructors.
-
-\membersection{wxProperty::\destruct{wxProperty}}
-
-\func{void}{\destruct{wxProperty}}{\void}
-
-Destructor. Destroys the wxPropertyValue, and the property validator if there is one. However, if the
-actual C++ value in the wxPropertyValue is a pointer, the data in that variable is not destroyed.
-
-\membersection{wxProperty::GetValue}
-
-\func{wxPropertyValue\&}{GetValue}{\void}
-
-Returns a reference to the property value.
-
-\membersection{wxProperty::GetValidator}
-
-\func{wxPropertyValidator *}{GetValidator}{\void}
-
-Returns a pointer to the associated property validator (if any).
-
-\membersection{wxProperty::GetName}
-
-\func{wxString\&}{GetName}{\void}
-
-Returns the name of the property.
-
-\membersection{wxProperty::GetRole}
-
-\func{wxRole\&}{GetRole}{\void}
-
-Returns the role of the property, to be used when choosing an appropriate validator.
-
-\membersection{wxProperty::GetWindow}
-
-\func{wxWindow *}{GetWindow}{\void}
-
-Returns the window associated with the property (if any).
-
-\membersection{wxProperty::SetValue}
-
-\func{void}{SetValue}{\param{wxPropertyValue\&}{ val}}
-
-Sets the value of the property.
-
-\membersection{wxProperty::SetName}
-
-\func{void}{SetName}{\param{wxString\&}{ name}}
-
-Sets the name of the property.
-
-\membersection{wxProperty::SetRole}
-
-\func{void}{SetRole}{\param{wxString\&}{ role}}
-
-Sets the role  of the property.
-
-\membersection{wxProperty::SetValidator}
-
-\func{void}{SetValidator}{\param{wxPropertyValidator *}{validator}}
-
-Sets the validator: this will be deleted when the property is deleted.
-
-\membersection{wxProperty::SetWindow}
-
-\func{void}{SetWindow}{\param{wxWindow *}{win}}
-
-Sets the window associated with the property.
-
-\membersection{wxProperty::operator $=$}
-
-\func{void}{operator $=$}{\param{const wxPropertyValue\&}{ val}}
-
-Assignment operator.
-
diff --git a/contrib/docs/latex/deprecated/propflva.tex b/contrib/docs/latex/deprecated/propflva.tex
deleted file mode 100644
index c8748be331..0000000000
--- a/contrib/docs/latex/deprecated/propflva.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\section{\class{wxFilenameListValidator}}\label{wxfilenamelistvalidator}
-
-This class validates a filename for a \helpref{property list view}{wxpropertylistview}, allowing the user to edit it textually and also popping up
-a file selector in ``detailed editing" mode.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxFilenameListValidator::wxFilenameListValidator}
-
-\func{void}{wxFilenameListValidator}{\param{wxString }{message = ``Select a file"}, \param{wxString }{wildcard = ``*.*"},
-  \param{long}{ flags=0}}
-
-Constructor. Supply an optional message and wildcard.
-
diff --git a/contrib/docs/latex/deprecated/propford.tex b/contrib/docs/latex/deprecated/propford.tex
deleted file mode 100644
index 64ce5f11e3..0000000000
--- a/contrib/docs/latex/deprecated/propford.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\section{\class{wxPropertyFormDialog}}\label{wxpropertyformdialog}
-
-The {\bf wxPropertyFormDialog} class is a prepackaged dialog which can
-be used for viewing a form property sheet. Pass a property form view object, and the dialog
-will pass OnClose and OnDefaultAction listbox messages to the view class for
-processing.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyFormDialog::wxPropertyFormDialog}
-
-\func{void}{wxPropertyFormDialog}{\param{wxPropertyFormView *}{view}, \param{wxWindow *}{parent}, \param{char *}{title},
- \param{bool}{ modal=false}, \param{int}{ x=-1}, \param{int}{ y=-1}, \param{int}{ width=-1}, \param{int}{height=-1},
- \param{long}{ style=wxDEFAULT\_DIALOG\_STYLE}, \param{char *}{name=``dialogBox"}}
-
-Constructor.
-
-\membersection{wxPropertyFormDialog::\destruct{wxPropertyFormDialog}}
-
-\func{void}{\destruct{wxPropertyFormDialog}}{\void}
-
-Destructor.
-
diff --git a/contrib/docs/latex/deprecated/propforf.tex b/contrib/docs/latex/deprecated/propforf.tex
deleted file mode 100644
index 3f7d9dddf1..0000000000
--- a/contrib/docs/latex/deprecated/propforf.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-\section{\class{wxPropertyFormFrame}}\label{wxpropertyformframe}
-
-The {\bf wxPropertyFormFrame} class is a prepackaged frame which can
-be used for viewing a property form. Pass a property form view object, and the frame
-will pass OnClose messages to the view class for processing.
-
-Call Initialize to create the panel and associate the view; override OnCreatePanel
-if you wish to use a panel class other than the default wxPropertyFormPanel.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyFormFrame::wxPropertyFormFrame}
-
-\func{void}{wxPropertyFormFrame}{\param{wxPropertyFormView *}{view}, \param{wxFrame *}{parent}, \param{char *}{title},
- \param{int}{ x=-1}, \param{int}{ y=-1}, \param{int}{ width=-1}, \param{int}{height=-1},
- \param{long}{ style=wxSDI $\|$ wxDEFAULT\_FRAME}, \param{char *}{name=``frame"}}
-
-Constructor.
-
-\membersection{wxPropertyFormFrame::\destruct{wxPropertyFormFrame}}
-
-\func{void}{\destruct{wxPropertyFormFrame}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyFormFrame::GetPropertyPanel}
-
-\func{wxPanel *}{GetPropertyPanel}{\void}
-
-Returns the panel associated with the frame.
-
-\membersection{wxPropertyFormFrame::Initialize}
-
-\func{bool}{Initialize}{\void}
-
-Must be called to create the panel and associate the view with the panel and frame.
-
-\membersection{wxPropertyFormFrame::OnCreatePanel}
-
-\func{wxPanel *}{OnCreatePanel}{\param{wxFrame *}{parent}, \param{wxPropertyFormView *}{view}}
-
-Creates a panel. Override this to create a panel type other than wxPropertyFormPanel.
-
diff --git a/contrib/docs/latex/deprecated/propforp.tex b/contrib/docs/latex/deprecated/propforp.tex
deleted file mode 100644
index c84f4eaa8a..0000000000
--- a/contrib/docs/latex/deprecated/propforp.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\section{\class{wxPropertyFormPanel}}\label{wxpropertyformpanel}
-
-The {\bf wxPropertyFormPanel} class is a prepackaged panel which can
-be used for viewing a property form. Pass a property form view object, and the panel
-will pass OnDefaultAction listbox messages to the view class for
-processing.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyFormPanel::wxPropertyFormPanel}
-
-\func{void}{wxPropertyFormPanel}{\param{wxPropertyFormView *}{view}, \param{wxWindow *}{parent},
- \param{int}{ x=-1}, \param{int}{ y=-1}, \param{int}{ width=-1}, \param{int}{height=-1},
- \param{long}{ style=0}, \param{char *}{name=``panel"}}
-
-Constructor.
-
-\membersection{wxPropertyFormPanel::\destruct{wxPropertyFormPanel}}
-
-\func{void}{\destruct{wxPropertyFormPanel}}{\void}
-
-Destructor.
-
diff --git a/contrib/docs/latex/deprecated/propforv.tex b/contrib/docs/latex/deprecated/propforv.tex
deleted file mode 100644
index 0a72305a4a..0000000000
--- a/contrib/docs/latex/deprecated/propforv.tex
+++ /dev/null
@@ -1,60 +0,0 @@
-\section{\class{wxPropertyFormValidator}}\label{wxpropertyformvalidator}
-
-The {\bf wxPropertyFormValidator} class defines a base class for form validators. By overriding virtual functions,
-the programmer can create custom behaviour for kinds of property.
-
-\wxheading{See also}
-
-\helpref{wxPropertyFormValidator overview}{wxpropertyformvalidatoroverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyFormValidator::wxPropertyFormValidator}
-
-\func{void}{wxPropertyFormValidator}{\param{long}{ flags = 0}}
-
-Constructor.
-
-\membersection{wxPropertyFormValidator::\destruct{wxPropertyFormValidator}}
-
-\func{void}{\destruct{wxPropertyFormValidator}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyFormValidator::OnCommand}
-
-\func{bool}{OnCommand}{\param{wxProperty *}{property}, \param{wxPropertyFormView *}{view},
- \param{wxWindow *}{parentWindow}, \param{wxCommandEvent\& }{event}}
-
-Called when the control corresponding to the property receives a command (if not intercepted
-by a callback associated with the actual control).
-
-\membersection{wxPropertyFormValidator::OnCheckValue}
-
-\func{bool}{OnCheckValue}{\param{wxProperty *}{property}, \param{wxPropertyFormView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Called when the view checks the property value. The value checked by this validator should be taken from the
-panel item corresponding to the property.
-
-\membersection{wxPropertyFormValidator::OnDisplayValue}
-
-\func{bool}{OnDisplayValue}{\param{wxProperty *}{property}, \param{wxPropertyFormView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Should display the property value in the appropriate control.
- 
-\membersection{wxPropertyFormValidator::OnDoubleClick}
-
-\func{bool}{OnDoubleClick}{\param{wxProperty *}{property}, \param{wxPropertyFormView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called when the control corresponding to the property is double clicked (listboxes only).
-
-\membersection{wxPropertyFormValidator::OnRetrieveValue}
-
-\func{bool}{OnRetrieveValue}{\param{wxProperty *}{property}, \param{wxPropertyFormView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Should do the transfer from the property editing area to the property itself.
-
diff --git a/contrib/docs/latex/deprecated/propfovi.tex b/contrib/docs/latex/deprecated/propfovi.tex
deleted file mode 100644
index 281cd58425..0000000000
--- a/contrib/docs/latex/deprecated/propfovi.tex
+++ /dev/null
@@ -1,104 +0,0 @@
-\section{\class{wxPropertyFormView}}\label{wxpropertyformview}
-
-The {\bf wxPropertyFormView} class shows a wxPropertySheet as a view onto a panel or dialog
-box which has already been created.
-
-\wxheading{See also}
-
-\helpref{wxPropertyFormView overview}{wxpropertyformviewoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyFormView::wxPropertyFormView}
-
-\func{void}{wxPropertyFormView}{\param{long}{ flags = 0}}
-
-Constructor.
-
-\membersection{wxPropertyFormView::\destruct{wxPropertyFormView}}
-
-\func{void}{\destruct{wxPropertyFormView}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyFormView::AssociateNames}\label{wxpropertyformviewassociatenames}
-
-\func{void}{AssociateNames}{\void}
-
-Associates the properties with the controls on the panel. For each panel item, if the
-panel item name is the same as a property name, the two objects will be associated.
-This function should be called manually since the programmer may wish to do the
-association manually.
-
-\membersection{wxPropertyFormView::Check}\label{wxpropertyformviewcheck}
-
-\func{bool}{Check}{\void}
-
-Checks all properties by calling the appropriate validators; returns false if a validation failed.
-
-\membersection{wxPropertyFormView::GetPanel}\label{wxpropertyformviewgetpanel}
-
-\func{wxPanel *}{GetPanel}{\void}
-
-Returns the panel associated with the view.
-
-\membersection{wxPropertyFormView::GetManagedWindow}\label{wxpropertyformviewgetmanagedwindow}
-
-\func{wxWindow *}{GetManagedWindow}{\void}
-
-Returns the managed window (a frame or dialog) associated with the view.
-
-\membersection{wxPropertyFormView::OnOk}\label{wxpropertyformviewonok}
-
-\func{void}{OnOk}{\void}
-
-Virtual function that will be called when the OK button on the physical window is pressed.
-By default, checks and updates the form values, closes and deletes the frame or dialog, then deletes the view.
-
-\membersection{wxPropertyFormView::OnCancel}\label{wxpropertyformviewoncancel}
-
-\func{void}{OnCancel}{\void}
-
-Virtual function that will be called when the Cancel button on the physical window is pressed.
-By default, closes and deletes the frame or dialog, then deletes the view.
-
-\membersection{wxPropertyFormView::OnHelp}\label{wxpropertyformviewonhelp}
-
-\func{void}{OnHelp}{\void}
-
-Virtual function that will be called when the Help button on the physical window is pressed.
-This needs to be overridden by the application for anything interesting to happen.
-
-\membersection{wxPropertyFormView::OnRevert}\label{wxpropertyformviewonrevert}
-
-\func{void}{OnRevert}{\void}
-
-Virtual function that will be called when the Revert button on the physical window is pressed.
-By default transfers the wxProperty values to the panel items (in effect
-undoing any unsaved changes in the items).
-
-\membersection{wxPropertyFormView::OnUpdate}\label{wxpropertyformviewonupdate}
-
-\func{void}{OnUpdate}{\void}
-
-Virtual function that will be called when the Update button on the physical window is pressed.
-By defaults transfers the displayed values to the wxProperty objects.
-
-\membersection{wxPropertyFormView::SetManagedWindow}\label{wxpropertyformviewsetmanagedwindow}
-
-\func{void}{SetManagedWindow}{\param{wxWindow *}{win}}
-
-Sets the managed window (a frame or dialog) associated with the view.
-
-\membersection{wxPropertyFormView::TransferToDialog}\label{wxpropertyformviewtransfertodialog}
-
-\func{bool}{TransferToDialog}{\void}
-
-Transfers property values to the controls in the dialog.
-
-\membersection{wxPropertyFormView::TransferToPropertySheet}\label{wxpropertyformviewtransfertopropertysheet}
-
-\func{bool}{TransferToPropertySheet}{\void}
-
-Transfers property values from the controls in the dialog to the property sheet.
-
diff --git a/contrib/docs/latex/deprecated/propifva.tex b/contrib/docs/latex/deprecated/propifva.tex
deleted file mode 100644
index 46af6ef034..0000000000
--- a/contrib/docs/latex/deprecated/propifva.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\section{\class{wxIntegerFormValidator}}\label{wxintegerformvalidator}
-
-This class validates a range of integer values for a form view. The associated control must be a wxTextCtrl
-or wxSlider.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxIntegerFormValidator::wxIntegerFormValidator}
-
-\func{void}{wxIntegerFormValidator}{\param{long }{min=0}, \param{long }{max=0},
- \param{long}{ flags=0}}
-
-Constructor. Assigning zero to minimum and maximum values indicates that there is no range to check.
-
diff --git a/contrib/docs/latex/deprecated/propilva.tex b/contrib/docs/latex/deprecated/propilva.tex
deleted file mode 100644
index 7c6803a942..0000000000
--- a/contrib/docs/latex/deprecated/propilva.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\section{\class{wxIntegerListValidator}}\label{wxintegerlistvalidator}
-
-This class validates a range of integer values for a list view.
-
-\wxheading{See also}
-
-\overview{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxIntegerListValidator::wxIntegerListValidator}
-
-\func{void}{wxIntegerListValidator}{\param{long }{min=0}, \param{long }{max=0},
- \param{long}{ flags=wxPROP\_ALLOW\_TEXT\_EDITING}}
-
-Constructor. Assigning zero to minimum and maximum values indicates that there is no range to check.
-
diff --git a/contrib/docs/latex/deprecated/proplisd.tex b/contrib/docs/latex/deprecated/proplisd.tex
deleted file mode 100644
index 8ea7f4c8ce..0000000000
--- a/contrib/docs/latex/deprecated/proplisd.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\section{\class{wxPropertyListDialog}}\label{wxpropertylistdialog}
-
-The {\bf wxPropertyListDialog} class is a prepackaged dialog which can
-be used for viewing a property list. Pass a property list view object, and the dialog
-will pass OnClose and OnDefaultAction listbox messages to the view class for
-processing.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyListDialog::wxPropertyListDialog}
-
-\func{void}{wxPropertyListDialog}{\param{wxPropertyListView *}{view}, \param{wxWindow *}{parent}, \param{char *}{title},
- \param{bool}{ modal=false}, \param{int}{ x=-1}, \param{int}{ y=-1}, \param{int}{ width=-1}, \param{int}{height=-1},
- \param{long}{ style=wxDEFAULT\_DIALOG\_STYLE}, \param{char *}{name=``dialogBox"}}
-
-Constructor.
-
-\membersection{wxPropertyListDialog::\destruct{wxPropertyListDialog}}
-
-\func{void}{\destruct{wxPropertyListDialog}}{\void}
-
-Destructor.
-
diff --git a/contrib/docs/latex/deprecated/proplisf.tex b/contrib/docs/latex/deprecated/proplisf.tex
deleted file mode 100644
index ee780a7ad8..0000000000
--- a/contrib/docs/latex/deprecated/proplisf.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-\section{\class{wxPropertyListFrame}}\label{wxpropertylistframe}
-
-The {\bf wxPropertyListFrame} class is a prepackaged frame which can
-be used for viewing a property list. Pass a property list view object, and the frame
-will pass OnClose messages to the view class for processing.
-
-Call Initialize to create the panel and associate the view; override OnCreatePanel
-if you wish to use a panel class other than the default wxPropertyListPanel.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyListFrame::wxPropertyListFrame}
-
-\func{void}{wxPropertyListFrame}{\param{wxPropertyListView *}{view}, \param{wxFrame *}{parent}, \param{char *}{title},
- \param{int}{ x=-1}, \param{int}{ y=-1}, \param{int}{ width=-1}, \param{int}{height=-1},
- \param{long}{ style=wxSDI $\|$ wxDEFAULT\_FRAME}, \param{char *}{name=``frame"}}
-
-Constructor.
-
-\membersection{wxPropertyListFrame::\destruct{wxPropertyListFrame}}
-
-\func{void}{\destruct{wxPropertyListFrame}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyListFrame::GetPropertyPanel}
-
-\func{wxPanel *}{GetPropertyPanel}{\void}
-
-Returns the panel associated with the frame.
-
-\membersection{wxPropertyListFrame::Initialize}
-
-\func{bool}{Initialize}{\void}
-
-Must be called to create the panel and associate the view with the panel and frame.
-
-\membersection{wxPropertyListFrame::OnCreatePanel}
-
-\func{wxPanel *}{OnCreatePanel}{\param{wxFrame *}{parent}, \param{wxPropertyListView *}{view}}
-
-Creates a panel. Override this to create a panel type other than wxPropertyListPanel.
-
diff --git a/contrib/docs/latex/deprecated/proplisp.tex b/contrib/docs/latex/deprecated/proplisp.tex
deleted file mode 100644
index fb8161d8a7..0000000000
--- a/contrib/docs/latex/deprecated/proplisp.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-\section{\class{wxPropertyListPanel}}\label{wxpropertylistpanel}
-
-The {\bf wxPropertyListPanel} class is a prepackaged panel which can
-be used for viewing a property list. Pass a property list view object, and the panel
-will pass OnDefaultAction listbox messages to the view class for
-processing.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyListPanel::wxPropertyListPanel}
-
-\func{void}{wxPropertyListPanel}{\param{wxPropertyListView *}{view}, \param{wxWindow *}{parent},
- \param{const wxPoint&}{ pos = wxDefaultPosition},
- \param{const wxSize&}{ size = wxDefaultSize},
- \param{long}{ style=0}, \param{char *}{name=``panel"}}
-
-Constructor.
-
-\membersection{wxPropertyListPanel::\destruct{wxPropertyListPanel}}
-
-\func{void}{\destruct{wxPropertyListPanel}}{\void}
-
-Destructor.
-
diff --git a/contrib/docs/latex/deprecated/proplist.tex b/contrib/docs/latex/deprecated/proplist.tex
deleted file mode 100644
index ee6a7147a7..0000000000
--- a/contrib/docs/latex/deprecated/proplist.tex
+++ /dev/null
@@ -1,556 +0,0 @@
-\chapter{Property sheet classes}\label{proplist}
-
-\section{Introduction}\label{proplistintro}
-
-The Property Sheet Classes help the programmer to specify complex dialogs and
-their relationship with their associated data. By specifying data as a
-wxPropertySheet containing wxProperty objects, the programmer can use
-a range of available or custom wxPropertyView classes to allow the user to
-edit this data. Classes derived from wxPropertyView act as mediators between the
-wxPropertySheet and the actual window (and associated panel items).
-
-For example, the wxPropertyListView is a kind of wxPropertyView which displays
-data in a Visual Basic-style property list (see \helpref{the next section}{proplistappearance} for
-screen shots). This is a listbox containing names and values, with
-an edit control and other optional controls via which the user edits the selected
-data item.
-
-wxPropertyFormView is another kind of wxPropertyView which mediates between
-the data and a panel or dialog box which has already been created. This makes it a contender for
-the replacement of wxForm, since programmer-controlled layout is going to be much more
-satisfactory. If automatic layout is desired, then wxPropertyListView could be used instead.
-
-The main intention of this class library was to provide property {\it list} behaviour, but
-it has been generalised as much as possible so that the concept of a property sheet and its viewers
-can reduce programming effort in a range of user interface tasks.
-
-For further details on the classes and how they are used, please see \helpref{Property classes overview}{proplistpropertyoverview}.
-
-\subsection{The appearance and behaviour of a property list view}\label{proplistappearance}
-
-The property list, as seen in an increasing number of development tools
-such as Visual Basic and Delphi, is a convenient and compact method for
-displaying and editing a number of items without the need for one
-control per item, and without the need for designing a special form. The
-controls are as follows:
-
-\begin{itemize}\itemsep=0pt
-\item A listbox showing the properties and their current values, which has double-click
-properties dependent on the nature of the current property;
-\item a text editing area at the top of the display, allowing the user to edit
-the currently selected property if appropriate;
-\item `confirm' and `cancel' buttons to confirm or cancel an edit (for the property, not the
-whole sheet);
-\item an optional list that appears when the user can make a choice from several known possible values;
-\item a small Edit button to invoke `detailed editing' (perhaps showing or hiding the above value list, or
-maybe invoking a common dialog);
-\item optional OK/Close, Cancel and Help buttons for the whole dialog.
-\end{itemize}
-
-The concept of `detailed editing' versus quick editing gives the user a choice
-of editing mode, so novice and expert behaviour can be catered for, or the user can just
-use what he feels comfortable with.
-
-Behaviour alters depending on the kind of property being edited. For example, a boolean value has
-the following behaviour:
-
-\begin{itemize}\itemsep=0pt
-\item Double-clicking on the item toggles between true and false.
-\item Showing the value list enables the user to select true or false.
-\item The user may be able to type in the word true or false, or the edit control
-may be read-only to disallow this since it is error-prone.
-\end{itemize}
-
-A list of strings may pop up a dialog for editing them, a simple string just allows text editing,
-double-clicking a colour property may show a colour selector, double-clicking on a filename property may
-show a file selector (in addition to being able to type in the name in the edit control), etc.
-
-Note that the `type' of property, such as string or integer, does not
-necessarily determine the behaviour of the property. The programmer has
-to be able to specify different behaviours for the same type, depending
-on the meaning of the property. For example, a colour and a filename may
-both be strings, but their editing behaviour should be different. This
-is why objects of type wxPropertyValidator need to be used, to define
-behaviour for a given class of properties or even specific property
-name.  Objects of class wxPropertyView contain a list of property
-registries, which enable reuse of bunches of these validators in
-different circumstances. Or a wxProperty can be explicitly set to use a
-particular validator object. 
-
-The following screen shot of the property classes test program shows the
-user editing a string, which is constrained to be one of three possible
-values.
-
-\helponly{\image{}{prop1.bmp}}
-
-The second picture shows the user having entered a integer that
-was outside the range specified to the validator. Note that in this picture,
-the value list is hidden because it is not used when editing an integer.
-
-\helponly{\image{}{prop2.bmp}}
-
-\section{Headers}\label{proplistfiles}
-
-The property class library comprises the following files:
-
-\begin{itemize}\itemsep=0pt
-\item prop.h: base property class header
-\item proplist.h: wxPropertyListView and associated classes
-\item propform.h: wxPropertyListView and associated classes
-\end{itemize}
-
-\section{Topic overviews}\label{proplistoverviews}
-
-This chapter contains a selection of topic overviews.
-
-\subsection{Property classes overview}\label{proplistpropertyoverview}
-
-The property classes help a programmer to express relationships between
-data and physical windows, in particular:
-
-\begin{itemize}\itemsep=0pt
-\item the transfer of data to and from the physical controls;
-\item the behaviour of various controls and custom windows for particular
-types of data;
-\item the validation of data, notifying the user when incorrect data is entered,
-or even better, constraining the input so only valid data can be entered.
-\end{itemize}
-
-With a consistent framework, the programmer should be able to use existing
-components and design new ones in a principled manner, to solve many data entry
-requirements.
-
-Each datum is represented in a \helpref{wxProperty}{wxproperty}, which has a name and a value.
-Various C++ types are permitted in the value of a property, and the property can store a pointer
-to the data instead of a copy of the data. A \helpref{wxPropertySheet}{wxpropertysheet} represents a number of these properties.
-
-These two classes are independent from the way in which the data is visually manipulated. To
-mediate between property sheets and windows, the abstract class \helpref{wxPropertyView}{wxpropertyview} is
-available for programmers to derive new kinds of view. One kind of view that is available is the \helpref{wxPropertyListView}{wxpropertylistview},
-which displays the data in a Visual Basic-style list, with a small number of controls for editing
-the currently selected property. Another is \helpref{wxPropertyFormView}{wxpropertyformview} which
-mediates between an existing dialog or panel and the property sheet.
-
-The hard work of mediation is actually performed by validators, which are instances of classes
-derived from \helpref{wxPropertyValidator}{wxpropertyvalidator}. A validator is associated with
-a particular property and is responsible for
-responding to user interface events, and displaying, updating and checking the property value.
-Because a validator's behaviour depends largely on the kind of view being used, there has to be
-a separate hierarchy of validators for each class of view. So for wxPropertyListView, there is
-an abstract class \helpref{wxPropertyListValidator}{wxpropertylistvalidator} from which concrete
-classes are derived, such as \helpref{wxRealListValidator}{wxreallistvalidator} and
-\rtfsp\helpref{wxStringListValidator}{wxstringlistvalidator}.
-
-A validator can be explicitly set for a property, so there is no doubt which validator
-should be used to edit that property. However, it is also possible to define a registry
-of validators, and have the validator chosen on the basis of the {\it role} of the property.
-So a property with a ``filename" role would match the ``filename" validator, which pops
-up a file selector when the user double clicks on the property.
-
-You don't have to define your own frame or window classes: there are some predefined
-that will work with the property list view. See \helpref{Window classes}{proplistwindowclasses} for
-further details.
-
-\subsubsection{Example 1: Property list view}
-
-The following code fragment shows the essentials of creating a registry of
-standard validators, a property sheet containing some properties, and
-a property list view and dialog or frame. RegisterValidators will be
-called on program start, and PropertySheetTest is called in response to a
-menu command.
-
-Note how some properties are created with an explicit reference to
-a validator, and others are provided with a ``role'' which can be matched
-against a validator in the registry.
-
-The interface generated by this test program is shown in the section \helpref{Appearance and
-behaviour of a property list view}{proplistappearance}.
-
-\begin{verbatim}
-void RegisterValidators(void)
-{
-  myListValidatorRegistry.RegisterValidator((wxString)"real", new wxRealListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)"string", new wxStringListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)"integer", new wxIntegerListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)"bool", new wxBoolListValidator);
-}
-
-void PropertyListTest(Bool useDialog)
-{
-  wxPropertySheet *sheet = new wxPropertySheet;
-
-  sheet->AddProperty(new wxProperty("fred", 1.0, "real"));
-  sheet->AddProperty(new wxProperty("tough choice", (Bool)true, "bool"));
-  sheet->AddProperty(new wxProperty("ian", (long)45, "integer", new wxIntegerListValidator(-50, 50)));
-  sheet->AddProperty(new wxProperty("bill", 25.0, "real", new wxRealListValidator(0.0, 100.0)));
-  sheet->AddProperty(new wxProperty("julian", "one", "string"));
-  sheet->AddProperty(new wxProperty("bitmap", "none", "string", new wxFilenameListValidator("Select a bitmap file", "*.bmp")));
-  wxStringList *strings = new wxStringList("one", "two", "three", NULL);
-  sheet->AddProperty(new wxProperty("constrained", "one", "string", new wxStringListValidator(strings)));
-
-  wxPropertyListView *view =
-    new wxPropertyListView(NULL,
-     wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN);
-
-  wxDialogBox *propDialog = NULL;
-  wxPropertyListFrame *propFrame = NULL;
-  if (useDialog)
-  {
-    propDialog = new wxPropertyListDialog(view, NULL, "Property Sheet Test", true, -1, -1, 400, 500);
-  }
-  else
-  {
-    propFrame = new wxPropertyListFrame(view, NULL, "Property Sheet Test", -1, -1, 400, 500);
-  }
-  
-  view->AddRegistry(&myListValidatorRegistry);
-
-  if (useDialog)
-  {
-    view->ShowView(sheet, propDialog);
-    propDialog->Centre(wxBOTH);
-    propDialog->Show(true);
-  }
-  else
-  {
-    propFrame->Initialize();
-    view->ShowView(sheet, propFrame->GetPropertyPanel());
-    propFrame->Centre(wxBOTH);
-    propFrame->Show(true);
-  }
-}
-\end{verbatim}
-
-\subsubsection{Example 2: Property form view}
-
-This example is similar to Example 1, but uses a property form view to
-edit a property sheet using a predefined dialog box.
-
-\begin{verbatim}
-void RegisterValidators(void)
-{
-  myFormValidatorRegistry.RegisterValidator((wxString)"real", new wxRealFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)"string", new wxStringFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)"integer", new wxIntegerFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)"bool", new wxBoolFormValidator);
-}
-
-void PropertyFormTest(Bool useDialog)
-{
-  wxPropertySheet *sheet = new wxPropertySheet;
-
-  sheet->AddProperty(new wxProperty("fred", 25.0, "real", new wxRealFormValidator(0.0, 100.0)));
-  sheet->AddProperty(new wxProperty("tough choice", (Bool)true, "bool"));
-  sheet->AddProperty(new wxProperty("ian", (long)45, "integer", new wxIntegerFormValidator(-50, 50)));
-  sheet->AddProperty(new wxProperty("julian", "one", "string"));
-  wxStringList *strings = new wxStringList("one", "two", "three", NULL);
-  sheet->AddProperty(new wxProperty("constrained", "one", "string", new wxStringFormValidator(strings)));
-
-  wxPropertyFormView *view = new wxPropertyFormView(NULL);
-
-  wxDialogBox *propDialog = NULL;
-  wxPropertyFormFrame *propFrame = NULL;
-  if (useDialog)
-  {
-    propDialog = new wxPropertyFormDialog(view, NULL, "Property Form Test", true, -1, -1, 400, 300);
-  }
-  else
-  {
-    propFrame = new wxPropertyFormFrame(view, NULL, "Property Form Test", -1, -1, 400, 300);
-    propFrame->Initialize();
-  }
-  
-  wxPanel *panel = propDialog ? propDialog : propFrame->GetPropertyPanel();
-  panel->SetLabelPosition(wxVERTICAL);
-  
-  // Add items to the panel
-  
-  (void) new wxButton(panel, (wxFunction)NULL, "OK", -1, -1, -1, -1, 0, "ok");
-  (void) new wxButton(panel, (wxFunction)NULL, "Cancel", -1, -1, 80, -1, 0, "cancel");
-  (void) new wxButton(panel, (wxFunction)NULL, "Update", -1, -1, 80, -1, 0, "update");
-  (void) new wxButton(panel, (wxFunction)NULL, "Revert", -1, -1, -1, -1, 0, "revert");
-  panel->NewLine();
-  
-  // The name of this text item matches the "fred" property
-  (void) new wxText(panel, (wxFunction)NULL, "Fred", "", -1, -1, 90, -1, 0, "fred");
-  (void) new wxCheckBox(panel, (wxFunction)NULL, "Yes or no", -1, -1, -1, -1, 0, "tough choice");
-  (void) new wxSlider(panel, (wxFunction)NULL, "Sliding scale", 0, -50, 50, 100, -1, -1, wxHORIZONTAL, "ian");
-  panel->NewLine();
-  (void) new wxListBox(panel, (wxFunction)NULL, "Constrained", wxSINGLE, -1, -1, 100, 90, 0, NULL, 0, "constrained");
-
-  view->AddRegistry(&myFormValidatorRegistry);
-
-  if (useDialog)
-  {
-    view->ShowView(sheet, propDialog);
-    view->AssociateNames();
-    view->TransferToDialog();
-    propDialog->Centre(wxBOTH);
-    propDialog->Show(true);
-  }
-  else
-  {
-    view->ShowView(sheet, propFrame->GetPropertyPanel());
-    view->AssociateNames();
-    view->TransferToDialog();
-    propFrame->Centre(wxBOTH);
-    propFrame->Show(true);
-  }
-}
-\end{verbatim}
-
-\subsection{Validator classes overview}\label{proplistvalidatoroverview}
-
-Classes: \helpref{Validator classes}{proplistvalidatorclasses}
-
-The validator classes provide functionality for mediating between a wxProperty and
-the actual display. There is a separate family of validator classes for each
-class of view, since the differences in user interface for these views implies
-that little common functionality can be shared amongst validators.
-
-
-
-\subsubsection{wxPropertyValidator overview}\label{wxpropertyvalidatoroverview}
-
-Class: \helpref{wxPropertyValidator}{wxpropertyvalidator}
-
-This class is the root of all property validator classes. It contains a small
-amount of common functionality, including functions to convert between
-strings and C++ values.
-
-A validator is notionally an object which sits between a property and its displayed
-value, and checks that the value the user enters is correct, giving an error message
-if the validation fails. In fact, the validator does more than that, and is akin to
-a view class but at a finer level of detail. It is also responsible for
-loading the dialog box control with the value from the property, putting it back
-into the property, preparing special controls for editing the value, and
-may even invoke special dialogs for editing the value in a convenient way.
-
-In a property list dialog, there is quite a lot of scope for supplying custom dialogs,
-such as file or colour selectors. For a form dialog, there is less scope because
-there is no concept of `detailed editing' of a value: one control is associated with
-one property, and there is no provision for invoking further dialogs. The reader
-may like to work out how the form view could be extended to provide some of the
-functionality of the property list!
-
-Validator objects may be associated explicitly with a wxProperty, or they may be
-indirectly associated by virtue of a property `kind' that matches validators having
-that kind. In the latter case, such validators are stored in a validator registry
-which is passed to the view before the dialog is shown. If the validator takes
-arguments, such as minimum and maximum values in the case of a wxIntegerListValidator,
-then the validator must be associated explicitly with the property. The validator
-will be deleted when the property is deleted.
-
-\subsubsection{wxPropertyListValidator overview}\label{wxpropertylistvalidatoroverview}
-
-Class: \helpref{wxPropertyListValidator}{wxpropertylistvalidator}
-
-This class is the abstract base class for property list view validators.
-The list view acts upon a user interface containing a list of properties,
-a text item for direct property value editing, confirm/cancel buttons for the value,
-a pulldown list for making a choice between values, and OK/Cancel/Help buttons
-for the dialog (see \helpref{property list appearance}{proplistappearance}).
-
-By overriding virtual functions, the programmer can create custom
-behaviour for different kinds of property. Custom behaviour can use just the
-available controls on the property list dialog, or the validator can
-invoke custom editors with quite different controls, which pop up in
-`detailed editing' mode.
-
-See the detailed class documentation for the members you should override
-to give your validator appropriate behaviour.
-
-\subsubsection{wxPropertyFormValidator overview}\label{wxpropertyformvalidatoroverview}
-
-This class is the abstract base class for property form view validators.
-The form view acts upon an existing dialog box or panel, where either the
-panel item names correspond to property names, or the programmer has explicitly
-associated the panel item with the property.
-
-By overriding virtual functions, the programmer determines how
-values are displayed or retrieved, and the checking that the validator does.
-
-See the detailed class documentation for the members you should override
-to give your validator appropriate behaviour.
-
-\subsection{View classes overview}\label{proplistviewoverview}
-
-Classes: \helpref{View classes}{proplistviewclasses}
-
-An instance of a view class relates a property sheet with an actual window.
-Currently, there are two classes of view: wxPropertyListView and wxPropertyFormView.
-
-\subsubsection{wxPropertyView overview}\label{wxpropertyviewoverview}
-
-Class: \helpref{wxPropertyView}{wxpropertyview}
-
-This is the abstract base class for property views.
-
-\subsubsection{wxPropertyListView overview}\label{wxpropertylistviewoverview}
-
-Class: \helpref{wxPropertyListView}{wxpropertylistview}
-
-The property list view defines the relationship between a property sheet and
-a property list dialog or panel. It manages user interface events such as
-clicking on a property, pressing return in the text edit field, and clicking
-on Confirm or Cancel. These events cause member functions of the
-class to be called, and these in turn may call member functions of
-the appropriate validator to be called, to prepare controls, check the property value,
-invoke detailed editing, etc.
-
-\subsubsection{wxPropertyFormView overview}\label{wxpropertyformviewoverview}
-
-Class: \helpref{wxPropertyFormView}{wxpropertyformview}
-
-The property form view manages the relationship between a property sheet
-and an existing dialog or panel.
-
-You must first create a panel or dialog box for the view to work on.
-The panel should contain panel items with names that correspond to
-properties in your property sheet; or you can explicitly set the
-panel item for each property.
-
-Apart from any custom panel items that you wish to control independently
-of the property-editing items, wxPropertyFormView takes over the
-processing of item events. It can also control normal dialog behaviour such
-as OK, Cancel, so you should also create some standard buttons that the property view
-can recognise. Just create the buttons with standard names and the view
-will do the rest. The following button names are recognised:
-
-\begin{itemize}\itemsep=0pt
-\item {\bf ok}: indicates the OK button. Calls wxPropertyFormView::OnOk. By default,
-checks and updates the form values, closes and deletes the frame or dialog, then deletes the view.
-\item {\bf cancel}: indicates the Cancel button. Calls wxPropertyFormView::OnCancel. By default,
-closes and deletes the frame or dialog, then deletes the view.
-\item {\bf help}: indicates the Help button. Calls wxPropertyFormView::OnHelp. This needs
-to be overridden by the application for anything interesting to happen.
-\item {\bf revert}: indicates the Revert button. Calls wxPropertyFormView::OnRevert,
-which by default transfers the wxProperty values to the panel items (in effect
-undoing any unsaved changes in the items).
-\item {\bf update}: indicates the Revert button. Calls wxPropertyFormView::OnUpdate, which
-by defaults transfers the displayed values to the wxProperty objects.
-\end{itemize}
-
-\subsection{wxPropertySheet overview}\label{wxpropertysheetoverview}
-
-Classes: \helpref{wxPropertySheet}{wxpropertysheet}, \helpref{wxProperty}{wxproperty}, \helpref{wxPropertyValue}{wxpropertyvalue}
-
-A property sheet defines zero or more properties. This is a bit like an explicit representation of
-a C++ object. wxProperty objects can have values which are pointers to C++ values, or they
-can allocate their own storage for values.
-
-Because the property sheet representation is explicit and can be manipulated by
-a program, it is a convenient form to be used for a variety of
-editing purposes. wxPropertyListView and wxPropertyFormView are two classes that
-specify the relationship between a property sheet and a user interface. You could imagine
-other uses for wxPropertySheet, for example to generate a form-like user interface without
-the need for GUI programming. Or for storing the names and values of command-line switches, with the
-option to subsequently edit these values using a wxPropertyListView.
-
-A typical use for a property sheet is to represent values of an object
-which are only implicit in the current representation of it. For
-example, in Visual Basic and similar programming environments, you can
-`edit a button', or rather, edit the button's properties.  One of the
-properties you can edit is {\it width} - but there is no explicit
-representation of width in a wxWindows button; instead, you call SetSize
-and GetSize members. To translate this into a consistent,
-property-oriented scheme, we could derive a new class
-wxButtonWithProperties, which has two new functions: SetProperty and
-GetProperty.  SetProperty accepts a property name and a value, and calls
-an appropriate function for the property that is being passed.
-GetProperty accepts a property name, returning a property value. So
-instead of having to use the usual arbitrary set of C++ member functions
-to set or access attributes of a window, programmer deals merely with
-SetValue/GetValue, and property names and values.
-We now have a single point at which we can modify or query an object by specifying
-names and values at run-time. (The implementation of SetProperty and GetProperty
-is probably quite messy and involves a large if-then-else statement to
-test the property name and act accordingly.)
-
-When the user invokes the property editor for a wxButtonWithProperties, the system
-creates a wxPropertySheet with `imaginary' properties such as width, height, font size
-and so on. For each property, wxButtonWithProperties::GetProperty is called, and the result is
-passed to the corresponding wxProperty. The wxPropertySheet is passed to a wxPropertyListView
-as described elsewhere, and the user edits away. When the user has finished editing, the system calls
-wxButtonWithProperties::SetProperty to transfer the wxProperty value back into the button
-by way of an appropriate call, wxWindow::SetSize in the case of width and height properties.
-
-\section{Classes by category}\label{proplistclassesbycat}
-
-A classification of property sheet classes by category.
-
-\subsection{Data classes}
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxProperty}{wxproperty}
-\item \helpref{wxPropertyValue}{wxpropertyvalue}
-\item \helpref{wxPropertySheet}{wxpropertysheet}
-\end{itemize}
-
-\subsection{Validator classes}\label{proplistvalidatorclasses}
-
-Validators check that the values the user has entered for a property are
-valid. They can also define specific ways of entering data, such as a
-file selector for a filename, and they are responsible for transferring
-values between the wxProperty and the physical display. 
-
-Base classes:
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxPropertyValidator}{wxproperty}
-\item \helpref{wxPropertyListValidator}{wxpropertylistvalidator}
-\item \helpref{wxPropertyFormValidator}{wxpropertyformvalidator}
-\end{itemize}
-
-List view validators:
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxBoolListValidator}{wxboollistvalidator}
-\item \helpref{wxFilenameListValidator}{wxfilenamelistvalidator}
-\item \helpref{wxIntegerListValidator}{wxintegerlistvalidator}
-\item \helpref{wxListOfStringsListValidator}{wxlistofstringslistvalidator}
-\item \helpref{wxRealListValidator}{wxreallistvalidator}
-\item \helpref{wxStringListValidator}{wxstringlistvalidator}
-\end{itemize}
-
-Form view validators:
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxBoolFormValidator}{wxboolformvalidator}
-\item \helpref{wxIntegerFormValidator}{wxintegerformvalidator}
-\item \helpref{wxRealFormValidator}{wxrealformvalidator}
-\item \helpref{wxStringFormValidator}{wxstringformvalidator}
-\end{itemize}
-
-\subsection{View classes}\label{proplistviewclasses}
-
-View classes mediate between a property sheet and a physical window.
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxPropertyView}{wxpropertyview}
-\item \helpref{wxPropertyListView}{wxpropertylistview}
-\item \helpref{wxPropertyFormView}{wxpropertyformview}
-\end{itemize}
-
-\subsection{Window classes}\label{proplistwindowclasses}
-
-The class library defines some window classes that can be used as-is with a suitable
-view class and property sheet.
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxPropertyFormFrame}{wxpropertyformframe}
-\item \helpref{wxPropertyFormDialog}{wxpropertyformdialog}
-\item \helpref{wxPropertyFormPanel}{wxpropertyformpanel}
-\item \helpref{wxPropertyListFrame}{wxpropertylistframe}
-\item \helpref{wxPropertyListDialog}{wxpropertylistdialog}
-\item \helpref{wxPropertyListPanel}{wxpropertylistpanel}
-\end{itemize}
-
-\subsection{Registry classes}
-
-A validator registry is a list of validators that can be applied to properties in a property sheet.
-There may be one or more registries per property view.
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxPropertyValidatorRegistry}{wxpropertyvalidatorregistry}
-\end{itemize}
diff --git a/contrib/docs/latex/deprecated/propliva.tex b/contrib/docs/latex/deprecated/propliva.tex
deleted file mode 100644
index b75dfc782b..0000000000
--- a/contrib/docs/latex/deprecated/propliva.tex
+++ /dev/null
@@ -1,110 +0,0 @@
-\section{\class{wxPropertyListValidator}}\label{wxpropertylistvalidator}
-
-The {\bf wxPropertyListValidator} abstract class is the base class for
-deriving validators for property lists.
-
-\wxheading{See also}
-
-\helpref{wxPropertyListValidator overview}{wxpropertylistvalidatoroverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyListValidator::wxPropertyListValidator}
-
-\func{void}{wxPropertyListValidator}{\param{long}{ flags = wxPROP\_ALLOW\_TEXT\_EDITING}}
-
-Constructor.
-
-\membersection{wxPropertyListValidator::\destruct{wxPropertyListValidator}}
-
-\func{void}{\destruct{wxPropertyListValidator}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyListValidator::OnCheckValue}
-
-\func{bool}{OnCheckValue}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Called when the Tick (Confirm) button is pressed or focus is list. Return false if the value
-was invalid, which is a signal restores the old value. Return true if the value was valid.
-
-\membersection{wxPropertyListValidator::OnClearControls}
-
-\func{bool}{OnClearControls}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Allows the clearing (enabling, disabling) of property list controls, when the focus leaves the current property.
-
-\membersection{wxPropertyListValidator::OnClearDetailControls}
-
-\func{bool}{OnClearDetailControls}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Called when the focus is lost, if the validator is in detailed editing mode.
-
-\membersection{wxPropertyListValidator::OnDisplayValue}
-
-\func{bool}{OnDisplayValue}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Should display the value in the appropriate controls. The default implementation gets the
-textual value from the property and inserts it into the text edit control.
- 
-\membersection{wxPropertyListValidator::OnDoubleClick}
-
-\func{bool}{OnDoubleClick}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called when the property is double clicked. Extra functionality can be provided,
-such as cycling through possible values.
-
-\membersection{wxPropertyListValidator::OnEdit}
-
-\func{bool}{OnEdit}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Called when the Edit (detailed editing) button is pressed. The default implementation
-calls wxPropertyListView::BeginDetailedEditing; a filename validator (for example) overrides
-this function to show the file selector.
-
-\membersection{wxPropertyListValidator::OnPrepareControls}
-
-\func{bool}{OnPrepareControls}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called to allow the validator to setup the display, such enabling or disabling buttons, and
-setting the values and selection in the standard listbox control (the one optionally used for displaying
-value options).
-
-\membersection{wxPropertyListValidator::OnPrepareDetailControls}
-
-\func{bool}{OnPrepareDetailControls}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
- 
-Called when the property is edited `in detail', i.e. when the Edit button is pressed.
-
-\membersection{wxPropertyListValidator::OnRetrieveValue}
-
-\func{bool}{OnRetrieveValue}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called when Tick (Confirm) is pressed or focus is lost or view wants to update
-the property list. Should do the transfer from the property editing area to the property itself
-
-\membersection{wxPropertyListValidator::OnSelect}
-
-\func{bool}{OnSelect}{\param{bool}{ select}, \param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called when the property is selected or deselected: typically displays the value
-in the edit control (having chosen a suitable control to display: (non)editable text or listbox).
-
-\membersection{wxPropertyListValidator::OnValueListSelect}
-
-\func{bool}{OnValueListSelect}{\param{wxProperty *}{property}, \param{wxPropertyListView *}{view},
- \param{wxWindow *}{parentWindow}}
-
-Called when the value listbox is selected. The default behaviour is to copy
-string to text control, and retrieve the value into the property.
-
diff --git a/contrib/docs/latex/deprecated/proplosv.tex b/contrib/docs/latex/deprecated/proplosv.tex
deleted file mode 100644
index 601788a796..0000000000
--- a/contrib/docs/latex/deprecated/proplosv.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-\section{\class{wxListOfStringsListValidator}}\label{wxlistofstringslistvalidator}
-
-This class validates a list of strings for a list view. When editing the property,
-a dialog box is presented for adding, deleting or editing entries in the list.
-At present no constraints may be supplied.
-
-You can construct a string list property value by constructing a wxStringList object.
-
-For example:
-
-\begin{verbatim}
-  myListValidatorRegistry.RegisterValidator((wxString)"stringlist",
-      new wxListOfStringsListValidator);
-
-  wxStringList *strings = new wxStringList("earth", "fire", "wind", "water", NULL);
-
-  sheet->AddProperty(new wxProperty("fred", strings, "stringlist"));
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxListOfStringsListValidator::wxListofStringsListValidator}
-
-\func{void}{wxListOfStringsListValidator}{\param{long}{ flags=0}}
-
-Constructor.
-
diff --git a/contrib/docs/latex/deprecated/proplstv.tex b/contrib/docs/latex/deprecated/proplstv.tex
deleted file mode 100644
index a59fb2578a..0000000000
--- a/contrib/docs/latex/deprecated/proplstv.tex
+++ /dev/null
@@ -1,111 +0,0 @@
-\section{\class{wxPropertyListView}}\label{wxpropertylistview}
-
-The {\bf wxPropertyListView} class shows a wxPropertySheet as a Visual Basic-style property list.
-
-\wxheading{See also}
-
-\helpref{wxPropertyListView overview}{wxpropertylistviewoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyListView::wxPropertyListView}
-
-\func{void}{wxPropertyListView}{ \param{wxPanel*} propPanel = NULL, \param{long}{ flags = wxPROP\_BUTTON\_DEFAULT}}
-
-Constructor.
-
-The {\it flags} argument can be a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item wxPROP\_BUTTON\_CLOSE
-\item wxPROP\_BUTTON\_OK
-\item wxPROP\_BUTTON\_CANCEL
-\item wxPROP\_BUTTON\_CHECK\_CROSS
-\item wxPROP\_BUTTON\_HELP
-\item wxPROP\_DYNAMIC\_VALUE\_FIELD
-\item wxPROP\_PULLDOWN
-\end{itemize}
-
-\membersection{wxPropertyListView::\destruct{wxPropertyListView}}
-
-\func{void}{\destruct{wxPropertyListView}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyListView::AssociatePanel}\label{wxpropertylistviewassociatepanel}
-
-\func{void}{AssociatePanel}{\param{wxPanel *}{panel}}
-
-Associates the window on which the controls will be displayed, with the view (sets an internal pointer to the window).
-
-\membersection{wxPropertyListView::BeginShowingProperty}\label{wxpropertylistviewbeginshowingproperty}
-
-\func{bool}{BeginShowingProperty}{\param{wxProperty *}{property}}
-
-Finds the appropriate validator and loads the property into the controls, by calling
-wxPropertyValidator::OnPrepareControls and then wxPropertyListView::DisplayProperty.
-
-\membersection{wxPropertyListView::DisplayProperty}\label{wxpropertylistviewdisplayproperty}
-
-\func{bool}{DisplayProperty}{\param{wxProperty *}{property}}
-
-Calls wxPropertyValidator::OnDisplayValue for the current property's validator. This function
-gets called by wxPropertyListView::BeginShowingProperty, which is in turn called
-from ShowProperty, called by OnPropertySelect, called by the listbox callback when selected.
-
-\membersection{wxPropertyListView::EndShowingProperty}\label{wxpropertylistviewendshowingproperty}
-
-\func{bool}{EndShowingProperty}{\param{wxProperty *}{property}}
-
-Finds the appropriate validator and unloads the property from the controls, by calling
-wxPropertyListView::RetrieveProperty, wxPropertyValidator::OnClearControls and (if we're in
-detailed editing mode) wxPropertyValidator::OnClearDetailControls.
-
-\membersection{wxPropertyListView::GetPanel}\label{wxpropertylistviewgetpanel}
-
-\func{wxPanel *}{GetPanel}{\void}
-
-Returns the panel associated with the view.
-
-\membersection{wxPropertyListView::GetManagedWindow}\label{wxpropertylistviewgetmanagedwindow}
-
-\func{wxWindow *}{GetManagedWindow}{\void}
-
-Returns the managed window (a frame or dialog) associated with the view.
-
-\membersection{wxPropertyListView::GetWindowCancelButton}\label{wxpropertylistviewgetwindowcancelbutton}
-
-\func{wxButton *}{GetWindowCancelButton}{\void}
-
-Returns the window cancel button, if any.
-
-\membersection{wxPropertyListView::GetWindowCloseButton}\label{wxpropertylistviewgetwindowclosebutton}
-
-\func{wxButton *}{GetWindowCloseButton}{\void}
-
-Returns the window close or OK button, if any.
-
-\membersection{wxPropertyListView::GetWindowHelpButton}\label{wxpropertylistviewgetwindowhelpbutton}
-
-\func{wxButton *}{GetWindowHelpButton}{\void}
-
-Returns the window help button, if any.
-
-\membersection{wxPropertyListView::SetManagedWindow}\label{wxpropertylistviewsetmanagedwindow}
-
-\func{void}{SetManagedWindow}{\param{wxWindow *}{win}}
-
-Sets the managed window (a frame or dialog) associated with the view.
-
-\membersection{wxPropertyListView::UpdatePropertyDisplayInList}\label{wxpropertylistviewupdatepropdisplay}
-
-\func{bool}{UpdatePropertyDisplayInList}{\param{wxProperty *}{property}}
-
-Updates the display for the given changed property.
-
-\membersection{wxPropertyListView::UpdatePropertyList}\label{wxpropertylistviewupdateproplist}
-
-\func{bool}{UpdatePropertyList}{\param{bool }{clearEditArea = true}}
-
-Updates the whole property list display.
-
diff --git a/contrib/docs/latex/deprecated/propregv.tex b/contrib/docs/latex/deprecated/propregv.tex
deleted file mode 100644
index 59a87d3cf0..0000000000
--- a/contrib/docs/latex/deprecated/propregv.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\section{\class{wxPropertyValidatorRegistry}}\label{wxpropertyvalidatorregistry}
-
-The {\bf wxPropertyValidatorRegistry} class is used for storing validators,
-indexed by the `role name' of the property, by which groups of property
-can be identified for the purpose of validation and editing.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyValidatorRegistry::wxPropertyValidatorRegistry}
-
-\func{void}{wxPropertyValidatorRegistry}{\void}
-
-Constructor.
-
-\membersection{wxPropertyValidatorRegistry::\destruct{wxPropertyValidatorRegistry}}
-
-\func{void}{\destruct{wxPropertyValidatorRegistry}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyValidatorRegistry::Clear}
-
-\func{void}{ClearRegistry}{\void}
-
-Clears the registry, deleting the validators.
-
-\membersection{wxPropertyValidatorRegistry::GetValidator}
-
-\func{wxPropertyValidator *}{GetValidator}{\param{wxString\& }{roleName}}
-
-Retrieve a validator by the property role name.
-
-\membersection{wxPropertyValidatorRegistry::RegisterValidator}\label{wxpropertyvalidatorregistervalidator}
-
-\func{void}{RegisterValidator}{\param{wxString\& }{roleName}, \param{wxPropertyValidator *}{validator}}
-
-Register a validator with the registry. {\it roleName} is a name indicating the
-role of the property, such as ``filename''. Later, when a validator is chosen for
-editing a property, this role name is matched against the class names of the property,
-if the property does not already have a validator explicitly associated with it.
-
-
diff --git a/contrib/docs/latex/deprecated/proprfva.tex b/contrib/docs/latex/deprecated/proprfva.tex
deleted file mode 100644
index 7713336e72..0000000000
--- a/contrib/docs/latex/deprecated/proprfva.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\section{\class{wxRealFormValidator}}\label{wxrealformvalidator}
-
-This class validates a range of real values for form views. The associated panel item must be a wxText.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxRealFormValidator::wxRealFormValidator}
-
-\func{void}{wxRealFormValidator}{\param{float }{min=0.0}, \param{float }{max=0.0},
- \param{long}{ flags=0}}
-
-Constructor. Assigning zero to minimum and maximum values indicates that there is no range to check.
-
diff --git a/contrib/docs/latex/deprecated/proprlva.tex b/contrib/docs/latex/deprecated/proprlva.tex
deleted file mode 100644
index 1745a273d0..0000000000
--- a/contrib/docs/latex/deprecated/proprlva.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\section{\class{wxRealListValidator}}\label{wxreallistvalidator}
-
-This class validates a range of real values for property lists.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\helpref{wxPropertySheet overview}{wxpropertysheetoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxRealListValidator::wxRealListValidator}
-
-\func{void}{wxRealListValidator}{\param{float }{min=0.0}, \param{float }{max=0.0},
- \param{long}{ flags=wxPROP\_ALLOW\_TEXT\_EDITING}}
-
-Constructor. Assigning zero to minimum and maximum values indicates that there is no range to check.
-
diff --git a/contrib/docs/latex/deprecated/propsht.tex b/contrib/docs/latex/deprecated/propsht.tex
deleted file mode 100644
index 241c09d6fd..0000000000
--- a/contrib/docs/latex/deprecated/propsht.tex
+++ /dev/null
@@ -1,83 +0,0 @@
-\section{\class{wxPropertySheet}}\label{wxpropertysheet}
-
-The {\bf wxPropertySheet} class is used for storing a number of
-wxProperty objects (essentially names and values).
-
-\wxheading{See also}
-
-\helpref{wxPropertySheet overview}{wxpropertysheetoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertySheet::wxPropertySheet}
-
-\func{void}{wxPropertySheet}{\param{const wxString}{ name = ""}}
-
-Constructor. Sets property sheet's name to name if present.
-
-\membersection{wxPropertySheet::\destruct{wxPropertySheet}}
-
-\func{void}{\destruct{wxPropertySheet}}{\void}
-
-Destructor. Destroys all contained properties.
-
-\membersection{wxPropertySheet::AddProperty}\label{wxpropertysheetaddproperty}
-
-\func{void}{AddProperty}{\param{wxProperty *}{property}}
-
-Adds a property to the sheet.
-
-\membersection{wxPropertySheet::Clear}\label{wxpropertysheetclear}
-
-\func{void}{Clear}{\void}
-
-Clears all the properties from the sheet (deleting them).
-
-\membersection{wxPropertySheet::GetName}\label{wxpropertysheetgetname}
-
-\func{wxString}{GetName}{\void}
-
-Gets the sheet's name.
-
-\membersection{wxPropertySheet::GetProperty}\label{wxpropertysheetgetproperty}
-
-\func{wxProperty *}{GetProperty}{\param{wxString}{ name}}
-
-Gets a property by name.
-
-\membersection{wxPropertySheet::GetProperties}\label{wxpropertysheetgetproperties}
-
-\func{wxList\&}{GetProperties}{\void}
-
-Returns a reference to the internal list of properties.
-
-\membersection{wxPropertySheet::HasProperty}\label{wxpropertysheethasproperty}
-
-\func{bool}{HasProperty}{\param{wxString}{ propname}}
-
-Returns true if sheet contains property propname.
-
-\membersection{wxPropertySheet::RemoveProperty}\label{wxpropertysheetremoveproperty}
-
-\func{void}{RemoveProperty}{\param{wxString}{ propname}}
-
-Removes property propname from sheet, deleting it.
-
-\membersection{wxPropertySheet::SetName}\label{wxpropertysheetsetname}
-
-\func{void}{SetName}{\param{wxString}{ sheetname}}
-
-Set the sheet's name to sheetname
-
-\membersection{wxPropertySheet::SetProperty}\label{wxpropertysheetsetproperty}
-
-\func{bool}{SetProperty}{\param{wxString}{ propname}, \param{wxPropertyValue}{ value}}
-
-Sets property propname to value. Returns false if property is not a member of sheet.
-
-\membersection{wxPropertySheet::SetAllModified}
-
-\func{void}{SetAllModified}{\param{bool}{ flag}}
-
-Sets the `modified' flag of each property value.
-
diff --git a/contrib/docs/latex/deprecated/propslv.tex b/contrib/docs/latex/deprecated/propslv.tex
deleted file mode 100644
index cc4f6578dd..0000000000
--- a/contrib/docs/latex/deprecated/propslv.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\section{\class{wxStringListValidator}}\label{wxstringlistvalidator}
-
-This class validates a string value, with an optional choice of possible values.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxStringListValidator::wxStringListValidator}
-
-\func{void}{wxStringListValidator}{\param{wxStringList *}{list=NULL}, \param{long}{ flags=0}}
-
-Constructor. Supply a list of strings to indicate a choice, or no strings to allow the
-user to freely edit the string. The string list will be deleted when the validator is deleted.
-
-
diff --git a/contrib/docs/latex/deprecated/propstfv.tex b/contrib/docs/latex/deprecated/propstfv.tex
deleted file mode 100644
index 53e3571d57..0000000000
--- a/contrib/docs/latex/deprecated/propstfv.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\section{\class{wxStringFormValidator}}\label{wxstringformvalidator}
-
-This class validates a string value for a form view, with an optional choice of possible values.
-The associated panel item must be a wxText, wxListBox or wxChoice. For wxListBox and wxChoice items,
-if the item is empty, the validator attempts to initialize the item from the strings in
-the validator.
-
-\wxheading{See also}
-
-\helpref{Validator classes}{proplistvalidatorclasses}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxStringFormValidator::wxStringFormValidator}
-
-\func{void}{wxStringFormValidator}{\param{wxStringList *}{list=NULL}, \param{long}{ flags=0}}
-
-Constructor. Supply a list of strings to indicate a choice, or no strings to allow the
-user to freely edit the string. The string list will be deleted when the validator is deleted.
-
diff --git a/contrib/docs/latex/deprecated/propval.tex b/contrib/docs/latex/deprecated/propval.tex
deleted file mode 100644
index c1c2fd412b..0000000000
--- a/contrib/docs/latex/deprecated/propval.tex
+++ /dev/null
@@ -1,242 +0,0 @@
-\section{\class{wxPropertyValue}}\label{wxpropertyvalue}
-
-The {\bf wxPropertyValue} class represents the value of a property,
-and is normally associated with a wxProperty object.
-
-A wxPropertyValue has one of the following types:
-
-\begin{itemize}\itemsep=0pt
-\item wxPropertyValueNull
-\item wxPropertyValueInteger
-\item wxPropertyValueReal
-\item wxPropertyValueBool
-\item wxPropertyValueString
-\item wxPropertyValueList
-\item wxPropertyValueIntegerPtr
-\item wxPropertyValueRealPtr
-\item wxPropertyValueBoolPtr
-\item wxPropertyValueStringPtr
-\end{itemize}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyValue::wxPropertyValue}
-
-\func{void}{wxPropertyValue}{\void}
-
-Default constructor.
-
-\func{void}{wxPropertyValue}{\param{const wxPropertyValue\& }{copyFrom}}
-
-Copy constructor.
-
-\func{void}{wxPropertyValue}{\param{char *}{val}}
-
-Construction from a string value.
-
-\func{void}{wxPropertyValue}{\param{long}{ val}}
-
-Construction from an integer value. You may need to cast to (long) to
-avoid confusion with other constructors (such as the bool constructor).
-
-\func{void}{wxPropertyValue}{\param{bool}{ val}}
-
-Construction from a boolean value.
-
-\func{void}{wxPropertyValue}{\param{float}{ val}}
-
-Construction from a floating point value.
-
-\func{void}{wxPropertyValue}{\param{double}{ val}}
-
-Construction from a floating point value.
-
-\func{void}{wxPropertyValue}{\param{wxList *}{ val}}
-
-Construction from a list of wxPropertyValue objects. The
-list, but not each contained wxPropertyValue, will be deleted
-by the constructor. The wxPropertyValues will be assigned to
-this wxPropertyValue list. In other words, so do not delete wxList or
-its data after calling this constructor.
-
-\func{void}{wxPropertyValue}{\param{wxStringList *}{ val}}
-
-Construction from a list of strings. The list (including the strings
-contained in it) will be deleted by the constructor, so do not
-destroy {\it val} explicitly.
-
-\func{void}{wxPropertyValue}{\param{char **}{val}}
-
-Construction from a string pointer.
-
-\func{void}{wxPropertyValue}{\param{long *}{val}}
-
-Construction from an integer pointer.
-
-\func{void}{wxPropertyValue}{\param{bool *}{val}}
-
-Construction from an boolean pointer.
-
-\func{void}{wxPropertyValue}{\param{float *}{val}}
-
-Construction from a floating point pointer.
-
-The last four constructors use pointers to various C++ types, and do not
-store the types themselves; this allows the values to stand in for actual
-data values defined elsewhere.
-
-\membersection{wxPropertyValue::\destruct{wxPropertyValue}}
-
-\func{void}{\destruct{wxPropertyValue}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyValue::Append}
-
-\func{void}{Append}{\param{wxPropertyValue *}{expr}}
-
-Appends a property value to the list.
-
-\membersection{wxPropertyValue::BoolValue}
-
-\func{bool}{BoolValue}{\void}
-
-Returns the boolean value.
-
-\membersection{wxPropertyValue::BoolValuePtr}
-
-\func{bool *}{BoolValuePtr}{\void}
-
-Returns the pointer to the boolean value.
-
-\membersection{wxPropertyValue::ClearList}
-
-\func{void}{ClearList}{\void}
-
-Deletes the contents of the list.
-
-\membersection{wxPropertyValue::Delete}
-
-\func{void}{Delete}{\param{wxPropertyValue *}{expr}}
-
-Deletes {\it expr} from this list.
-
-\membersection{wxPropertyValue::GetFirst}
-
-\func{wxPropertyValue *}{GetFirst}{\void}
-
-Gets the first value in the list.
-
-\membersection{wxPropertyValue::GetLast}
-
-\func{wxPropertyValue *}{GetFirst}{\void}
-
-Gets the last value in the list.
-
-\membersection{wxPropertyValue::GetModified}
-
-\func{bool}{GetModified}{\void}
-
-Returns true if the value was modified since being created
-(or since SetModified was called).
-
-\membersection{wxPropertyValue::GetNext}
-
-\func{wxPropertyValue *}{GetNext}{\void}
-
-Gets the next value in the list (the one after `this').
-
-\membersection{wxPropertyValue::GetStringRepresentation}
-
-\func{wxString}{GetStringRepresentation}{\void}
-
-Gets a string representation of the value.
-
-\membersection{wxPropertyValue::IntegerValue}
-
-\func{long}{IntegerValue}{\void}
-
-Returns the integer value.
-
-\membersection{wxPropertyValue::Insert}
-
-\func{void}{Insert}{\param{wxPropertyValue *}{expr}}
-
-Inserts a property value at the front of a list.
-
-\membersection{wxPropertyValue::IntegerValuePtr}
-
-\func{long *}{IntegerValuePtr}{\void}
-
-Returns the pointer to the integer value.
-
-\membersection{wxPropertyValue::Nth}
-
-\func{wxPropertyValue *}{Nth}{\param{int}{ n}}
-
-Returns the nth value of a list expression (starting from zero).
-
-\membersection{wxPropertyValue::Number}
-
-\func{int}{Number}{\void}
-
-Returns the number of elements in a list expression.
-
-\membersection{wxPropertyValue::RealValue}
-
-\func{float}{RealValue}{\void}
-
-Returns the floating point value.
-
-\membersection{wxPropertyValue::RealValuePtr}
-
-\func{float *}{RealValuePtr}{\void}
-
-Returns the pointer to the floating point value.
-
-\membersection{wxPropertyValue::SetModified}
-
-\func{void}{SetModified}{\param{bool}{ flag}}
-
-Sets the `modified' flag.
-
-\membersection{wxPropertyValue::StringValue}
-
-\func{char *}{StringValue}{\void}
-
-Returns the string value.
-
-\membersection{wxPropertyValue::StringValuePtr}
-
-\func{char **}{StringValuePtr}{\void}
-
-Returns the pointer to the string value.
-
-\membersection{wxPropertyValue::Type}
-
-\func{wxPropertyValueType}{Type}{\void}
-
-Returns the value type.
-
-\membersection{wxPropertyValue::operator $=$}
-
-\func{void}{operator $=$}{\param{const wxPropertyValue\& }{val}}
-
-\func{void}{operator $=$}{\param{const char *}{val}}
-
-\func{void}{operator $=$}{\param{const long }{val}}
-
-\func{void}{operator $=$}{\param{const bool }{val}}
-
-\func{void}{operator $=$}{\param{const float }{val}}
-
-\func{void}{operator $=$}{\param{const char **}{val}}
-
-\func{void}{operator $=$}{\param{const long *}{val}}
-
-\func{void}{operator $=$}{\param{const bool *}{val}}
-
-\func{void}{operator $=$}{\param{const float *}{val}}
-
-Assignment operators.
-
diff --git a/contrib/docs/latex/deprecated/propvald.tex b/contrib/docs/latex/deprecated/propvald.tex
deleted file mode 100644
index 69404e4cd2..0000000000
--- a/contrib/docs/latex/deprecated/propvald.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-\section{\class{wxPropertyValidator}}\label{wxpropertyvalidator}
-
-The {\bf wxPropertyValidator} abstract class is the base class for deriving
-validators for properties.
-
-\wxheading{See also}
-
-\helpref{wxPropertyValidator overview}{wxpropertyvalidatoroverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyValidator::wxPropertyValidator}
-
-\func{void}{wxPropertyValidator}{\param{long}{ flags = 0}}
-
-Constructor.
-
-\membersection{wxPropertyValidator::\destruct{wxPropertyValidator}}
-
-\func{void}{\destruct{wxPropertyValidator}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyValidator::GetFlags}
-
-\func{long}{GetFlags}{\void}
-
-Returns the flags for the validator.
-
-\membersection{wxPropertyValidator::GetValidatorProperty}
-
-\func{wxProperty *}{GetValidatorProperty}{\void}
-
-Gets the property for the validator.
-
-\membersection{wxPropertyValidator::SetValidatorProperty}
-
-\func{void}{SetValidatorProperty}{\param{wxProperty *}{property}}
-
-Sets the property for the validator.
-
diff --git a/contrib/docs/latex/deprecated/propview.tex b/contrib/docs/latex/deprecated/propview.tex
deleted file mode 100644
index ad74d1ab1a..0000000000
--- a/contrib/docs/latex/deprecated/propview.tex
+++ /dev/null
@@ -1,111 +0,0 @@
-\section{\class{wxPropertyView}}\label{wxpropertyview}
-
-The {\bf wxPropertyView} abstract class is the base class for views
-of property sheets, acting as intermediaries between properties and
-actual windows.
-
-\wxheading{See also}
-
-\helpref{wxPropertyView overview}{wxpropertyviewoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPropertyView::wxPropertyView}
-
-\func{void}{wxPropertyView}{\param{long}{ flags = wxPROP\_BUTTON\_DEFAULT}}
-
-Constructor.
-
-The {\it flags} argument can be a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item wxPROP\_BUTTON\_CLOSE
-\item wxPROP\_BUTTON\_OK
-\item wxPROP\_BUTTON\_CANCEL
-\item wxPROP\_BUTTON\_CHECK\_CROSS
-\item wxPROP\_BUTTON\_HELP
-\item wxPROP\_DYNAMIC\_VALUE\_FIELD
-\item wxPROP\_PULLDOWN
-\end{itemize}
-
-\membersection{wxPropertyView::\destruct{wxPropertyView}}
-
-\func{void}{\destruct{wxPropertyView}}{\void}
-
-Destructor.
-
-\membersection{wxPropertyView::AddRegistry}\label{wxpropertyviewaddregistry}
-
-\func{void}{AddRegistry}{\param{wxPropertyValidatorRegistry *}{registry}}
-
-Adds a registry (list of property validators) the view's list of registries, which is initially empty.
-
-\membersection{wxPropertyView::FindPropertyValidator}\label{wxpropertyviewfindpropertyvalidator}
-
-\func{wxPropertyValidator *}{FindPropertyValidator}{\param{wxProperty *}{property}}
-
-Finds the property validator that is most appropriate to this property.
-
-\membersection{wxPropertyView::GetPropertySheet}\label{wxpropertyviewgetpropertysheet}
-
-\func{wxPropertySheet *}{GetPropertySheet}{\void}
-
-Gets the property sheet for this view.
-
-\membersection{wxPropertyView::GetRegistryList}\label{wxpropertyviewgetregistrylist}
-
-\func{wxList\&}{GetRegistryList}{\void}
-
-Returns a reference to the list of property validator registries.
-
-\membersection{wxPropertyView::OnOk}\label{wxpropertyviewonok}
-
-\func{void}{OnOk}{\void}
-
-Virtual function that will be called when the OK button on the physical window is pressed (if it exists).
-
-\membersection{wxPropertyView::OnCancel}\label{wxpropertyviewoncancel}
-
-\func{void}{OnCancel}{\void}
-
-Virtual function that will be called when the Cancel button on the physical window is pressed (if it exists).
-
-\membersection{wxPropertyView::OnClose}\label{wxpropertyviewonclose}
-
-\func{bool}{OnClose}{\void}
-
-Virtual function that will be called when the physical window is closed. The default implementation returns false.
-
-\membersection{wxPropertyView::OnHelp}\label{wxpropertyviewonhelp}
-
-\func{void}{OnHelp}{\void}
-
-Virtual function that will be called when the Help button on the physical window is pressed (if it exists).
-
-\membersection{wxPropertyView::OnPropertyChanged}\label{wxpropertyviewonpropertychanged}
-
-\func{void}{OnPropertyChanged}{\param{wxProperty *}{property}}
-
-Virtual function called by a view or validator when a property's value changed. Validators
-must be written correctly for this to be called. You can override this function
-to respond immediately to property value changes.
-
-\membersection{wxPropertyView::OnUpdateView}\label{wxpropertyviewonupdateview}
-
-\func{bool}{OnUpdateView}{\void}
-
-Called by the viewed object to update the view. The default implementation just returns
-false.
-
-\membersection{wxPropertyView::SetPropertySheet}\label{wxpropertyviewsetpropertysheet}
-
-\func{void}{SetPropertySheet}{\param{wxPropertySheet *}{sheet}}
-
-Sets the property sheet for this view.
-
-\membersection{wxPropertyView::ShowView}\label{wxpropertyviewshowview}
-
-\func{void}{ShowView}{\param{wxPropertySheet *}{sheet}, \param{wxPanel *}{panel}}
-
-Associates this view with the given panel, and shows the view.
-
diff --git a/contrib/docs/latex/deprecated/tex2rtf.ini b/contrib/docs/latex/deprecated/tex2rtf.ini
deleted file mode 100644
index 17aa9cf057..0000000000
--- a/contrib/docs/latex/deprecated/tex2rtf.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-;;; Tex2RTF initialisation file, using NO style sheet for HTML. See
-;;; tex2rtf_css.ini for a version using a style sheet. You can use
-;;; -macros tex2rtf.ini to specify the ini file.
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-contentsDepth = 2
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "wxWindows Deprecated Classes Manual"
-truncateFilenames = yes
-combineSubSections = yes
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-htmlWorkshopFiles = true
-htmlIndex = true
-
-; Finally, a way to specify face names
-htmlFaceName = "Arial, Lucida, Helvetica"
-
-\textasciitilde [0]{{\tt\~}}
-\textasciicircum [0]{{\tt\^}}
-\textbackslash [0]{{\tt$\backslash$}}
-\gifsep [0]{\par}
-ignoreInput = "ltx.tex"
-; htmlStylesheet = "wx.css"
-
-\overview [2] {\helpref{#1}{#2}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-\wxheading [1]{{\bf \htmlignore{\fcol{blue}{#1}}\htmlonly{\fcol{red}{#1}}}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-\bftt [1] {\bf{\tt{#1}}}
-\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-%\pythonnote [1] {}
-\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1}
-%\perlnote [1] {}
-
-; make tex2rtf understand \hbox{} macro:
-\hbox [1] {#1}
diff --git a/contrib/docs/latex/deprecated/topics.tex b/contrib/docs/latex/deprecated/topics.tex
deleted file mode 100644
index 283c08c295..0000000000
--- a/contrib/docs/latex/deprecated/topics.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\chapter{Topic overviews}\label{overviews}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This chapter contains a selection of topic overviews.
-
-\input texpr.tex
-\input tresourc.tex
-
diff --git a/contrib/docs/latex/deprecated/treelay.tex b/contrib/docs/latex/deprecated/treelay.tex
deleted file mode 100644
index 711d8b1adb..0000000000
--- a/contrib/docs/latex/deprecated/treelay.tex
+++ /dev/null
@@ -1,327 +0,0 @@
-\section{\class{wxTreeLayout}}\label{wxtreelayout}
-
-wxTreeLayout provides layout of simple trees with one root node, drawn left-to-right,
-with user-defined spacing between nodes.
-
-wxTreeLayout is an abstract class that must be subclassed. The programmer
-defines various member functions which will access whatever data structures
-are appropriate for the application, and wxTreeLayout uses these when laying
-out the tree.
-
-Nodes are identified by long integer identifiers. The derived class
-communicates the actual tree structure to wxTreeLayout by defining \helpref{wxTreeLayout::GetChildren}{wxtreelayoutgetchildren}\rtfsp
-and \helpref{wxTreeLayout::GetNodeParent}{wxtreelayoutgetnodeparent} functions.
-
-The application should call \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout} to do the tree
-layout. Depending on how the derived class has been defined, either
-\rtfsp\helpref{wxTreeLayout::Draw}{wxtreelayoutdraw} must be called (for example by the OnPaint member
-of a wxScrolledWindow) or the application-defined drawing code should be called
-as normal.
-
-For example, if you have an image drawing system already defined, you
-may want wxTreeLayout to position existing node images in that system. So you
-just need a way for wxTreeLayout to set the node image positions according to
-the layout algorithm, and the rest will be done by your own image drawing
-system.
-
-The algorithm is due to Gabriel Robins \cite{robins87}, a linear-time
-algorithm originally implemented in LISP for AI applications.
-
-The original algorithm has been modified so that both X and Y planes
-are calculated simultaneously, increasing efficiency slightly. The basic
-code is only a page or so long.
-
-\helponly{Below is the example tree generated by the program test.cc.
-
-\begin{figure}
-$$\image{11cm;0cm}{treetst.ps}$$
-\caption{Example tree}\label{exampletree}
-\end{figure}
-}
-
-\wxheading{Derived from}
-
-wxObject
-
-\wxheading{See also}
-
-\helpref{wxTreeLayoutStored}{wxtreelayoutstored}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxTreeLayout::wxTreeLayout}
-
-\func{}{wxTreeLayout}{\void}
-
-Constructor.
-
-\membersection{wxTreeLayout::ActivateNode}\label{wxtreelayoutactivatenode}
-
-\func{void}{ActivateNode}{\param{long}{ id}, \param{bool }{active}}
-
-Define this so wxTreeLayout can turn nodes on and off for drawing purposes
-(not all nodes may be connected in the tree). See also \helpref{wxTreeLayout::NodeActive}{wxtreelayoutnodeactive}.
-
-\membersection{wxTreeLayout::CalcLayout}
-
-\func{void}{CalcLayout}{\param{long}{ id}, \param{int}{ level}}
-
-Private function for laying out a branch.
-
-\membersection{wxTreeLayout::DoLayout}\label{wxtreelayoutdolayout}
-
-\func{void}{DoLayout}{\param{wxDC\&}{ dc}, \param{long}{ topNode = -1}}
-
-Calculates the layout for the tree, optionally specifying the top node.
-
-\membersection{wxTreeLayout::Draw}\label{wxtreelayoutdraw}
-
-\func{void}{Draw}{\param{wxDC\&}{ dc}}
-
-Call this to let wxTreeLayout draw the tree itself, once the layout has been
-calculated with \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout}.
-
-\membersection{wxTreeLayout::DrawBranch}
-
-\func{void}{DrawBranch}{\param{long}{ from}, \param{long}{ to}, \param{wxDC\&}{ dc}}
-
-Defined by wxTreeLayout to draw an arc between two nodes.
-
-\membersection{wxTreeLayout::DrawBranches}
-
-\func{void}{DrawBranches}{\param{wxDC\&}{ dc}}
-
-Defined by wxTreeLayout to draw the arcs between nodes.
-
-\membersection{wxTreeLayout::DrawNode}
-
-\func{void}{DrawNode}{\param{long}{ id}, \param{wxDC\&}{ dc}}
-
-Defined by wxTreeLayout to draw a node.
-
-\membersection{wxTreeLayout::DrawNodes}
-
-\func{void}{DrawNodes}{\param{wxDC\&}{ dc}}
-
-Defined by wxTreeLayout to draw the nodes.
-
-\membersection{wxTreeLayout::GetChildren}\label{wxtreelayoutgetchildren}
-
-\func{void}{GetChildren}{\param{long}{ id}, \param{wxList \&}{list}}
-
-Must be defined to return the children of node {\it id} in the given list
-of integers.
-
-\membersection{wxTreeLayout::GetNextNode}\label{wxtreelayoutgetnextnode}
-
-\func{long}{GetNextNode}{\param{long}{ id}}
-
-Must be defined to return the next node after {\it id}, so that wxTreeLayout can
-iterate through all relevant nodes. The ordering is not important.
-The function should return -1 if there are no more nodes.
-
-\membersection{wxTreeLayout::GetNodeName}
-
-\constfunc{wxString}{GetNodeName}{\param{long}{ id}}
-
-May optionally be defined to get a node's name (for example if leaving
-the drawing to wxTreeLayout).
-
-\membersection{wxTreeLayout::GetNodeSize}
-
-\constfunc{void}{GetNodeSize}{\param{long}{ id}, \param{long*}{ x}, \param{long*}{ y}}
-
-Can be defined to indicate a node's size, or left to wxTreeLayout to use the
-name as an indication of size.
-
-\membersection{wxTreeLayout::GetNodeParent}\label{wxtreelayoutgetnodeparent}
-
-\constfunc{long}{GetNodeParent}{\param{long}{ id}}
-
-Must be defined to return the parent node of {\it id}.
-The function should return -1 if there is no parent.
-
-\membersection{wxTreeLayout::GetNodeX}
-
-\constfunc{long}{GetNodeX}{\param{long}{ id}}
-
-Must be defined to return the current X position of the node. Note that
-coordinates are assumed to be at the top-left of the node so some conversion
-may be necessary for your application.
-
-\membersection{wxTreeLayout::GetNodeY}
-
-\constfunc{long}{GetNodeY}{\param{long}{ id}}
-
-Must be defined to return the current Y position of the node. Note that
-coordinates are assumed to be at the top-left of the node so some conversion
-may be necessary for your application.
-
-\membersection{wxTreeLayout::GetLeftMargin}
-
-\constfunc{long}{GetLeftMargin}{\void}
-
-Gets the left margin set with \helpref{wxTreeLayout::SetMargins}{wxtreelayoutsetmargins}.
-
-\membersection{wxTreeLayout::GetOrientation}
-
-\constfunc{bool}{GetOrientation}{\void}
-
-Gets the orientation: true means top-to-bottom, false means left-to-right (the default).
-
-\membersection{wxTreeLayout::GetTopMargin}
-
-\constfunc{long}{GetTopMargin}{\void}
-
-Gets the top margin set with \helpref{wxTreeLayout::SetMargins}{wxtreelayoutsetmargins}.
-
-\membersection{wxTreeLayout::GetTopNode}
-
-\constfunc{long}{GetTopNode}{\void}
-
-wxTreeLayout calls this to get the top of the tree. Don't redefine this; call
-\rtfsp\helpref{wxTreeLayout::SetTopNode}{wxtreelayoutsettopnode} instead before calling \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout}.
-
-\membersection{wxTreeLayout::GetXSpacing}
-
-\constfunc{long}{GetXSpacing}{\void}
-
-Gets the horizontal spacing between nodes.
-
-\membersection{wxTreeLayout::GetYSpacing}
-
-\constfunc{long}{GetYSpacing}{\void}
-
-Gets the vertical spacing between nodes.
-
-\membersection{wxTreeLayout::Initialize}
-
-\func{void}{Initialize}{\void}
-
-Initializes wxTreeLayout. Call from application or overridden {\bf Initialize}
-or constructor.
-
-\membersection{wxTreeLayout::NodeActive}\label{wxtreelayoutnodeactive}
-
-\func{bool}{NodeActive}{\param{long}{ id}}
-
-Define this so wxTreeLayout can know which nodes are to be drawn (not all
-nodes may be connected in the tree). See also \helpref{wxTreeLayout::ActivateNode}{wxtreelayoutactivatenode}.
-
-\membersection{wxTreeLayout::SetNodeName}
-
-\func{void}{SetNodeName}{\param{long}{ id}, \param{const wxString\& }{ name}}
-
-May optionally be defined to set a node's name.
-
-\membersection{wxTreeLayout::SetNodeX}
-
-\func{void}{SetNodeX}{\param{long}{ id}, \param{long}{ x}}
-
-Must be defined to set the current X position of the node. Note that
-coordinates are assumed to be at the top-left of the node so some conversion
-may be necessary for your application.
-
-\membersection{wxTreeLayout::SetNodeY}
-
-\func{void}{SetNodeY}{\param{long}{ id}, \param{long}{ y}}
-
-Must be defined to set the current Y position of the node. Note that
-coordinates are assumed to be at the top-left of the node so some conversion
-may be necessary for your application.
-
-\membersection{wxTreeLayout::SetOrientation}
-
-\func{void}{SetOrientation}{\param{bool}{ orientation}}
-
-Sets the tree orientation: true means top-to-bottom, false means left-to-right (the default).
-
-\membersection{wxTreeLayout::SetTopNode}\label{wxtreelayoutsettopnode}
-
-\func{void}{SetTopNode}{\param{long}{ id}}
-
-Call this to identify the top of the tree to wxTreeLayout.
-
-\membersection{wxTreeLayout::SetSpacing}
-
-\func{void}{SetSpacing}{\param{long}{ x}, \param{long}{ y}}
-
-Sets the horizontal and vertical spacing between nodes in the tree.
-
-\membersection{wxTreeLayout::SetMargins}\label{wxtreelayoutsetmargins}
-
-\func{void}{SetMargins}{\param{long}{ x}, \param{long}{ y}}
-
-Sets the left and top margins of the whole tree.
-
-\section{\class{wxTreeLayoutStored}}\label{wxtreelayoutstored}
-
-wxTreeLayoutStored provides storage for node labels, position and client data. It also provides hit-testing
-(which node a mouse event occurred on). It is usually a more convenient class to use than wxTreeLayout.
-
-\wxheading{Derived from}
-
-\helpref{wxTreeLayout}{wxtreelayout}\\
-\helpref{wxObject}{wxobject}
-
-\wxheading{See also}
-
-\helpref{wxTreeLayout}{wxtreelayout}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxTreeLayoutStored::wxTreeLayoutStored}
-
-\func{}{wxTreeLayoutStored}{\param{int }{noNodes = 200}}
-
-Constructor. Specify the maximum number of nodes to be allocated.
-
-\membersection{wxTreeLayoutStored::AddChild}\label{wxtreelayoutstoredaddchild}
-
-\func{long}{AddChild}{\param{const wxString\&}{ name}, \param{const wxString\&}{ parent = ""}}
-
-Adds a child with a given parent, returning the node id.
-
-\membersection{wxTreeLayoutStored::GetClientData}\label{wxtreelayoutstoredgetclientdata}
-
-\constfunc{long}{GetClientData}{\param{long}{ id}}
-
-Gets the client data for the given node.
-
-\membersection{wxTreeLayoutStored::GetNode}\label{wxtreelayoutstoredgetnode}
-
-\constfunc{wxStoredNode*}{GetNode}{\param{long}{ id}}
-
-Returns the wxStoredNode object for the given node id.
-
-\membersection{wxTreeLayoutStored::GetNodeCount}\label{wxtreelayoutstoredgetnodecount}
-
-\constfunc{int}{GetNodeCount}{\void}
-
-Returns the current number of nodes.
-
-\membersection{wxTreeLayoutStored::GetNumNodes}\label{wxtreelayoutstoredgetnumnodes}
-
-\constfunc{int}{GetNumNodes}{\void}
-
-Returns the maximum number of nodes.
-
-\membersection{wxTreeLayoutStored::HitTest}\label{wxtreelayoutstoredhittest}
-
-\func{wxString}{HitTest}{\param{wxMouseEvent\&}{ event}, \param{wxDC\& }{dc}}
-
-Returns a string with the node name corresponding to the position of the mouse event, or the empty string if no node
-was detected.
-
-\membersection{wxTreeLayoutStored::NameToId}\label{wxtreelayoutstorednametoid}
-
-\func{long}{NameToId}{\param{const wxString\&}{ name}}
-
-Returns the id for the given node name, or -1 if there was no such node.
-
-\membersection{wxTreeLayoutStored::SetClientData}\label{wxtreelayoutstoredsetclientdata}
-
-\func{void}{SetClientData}{\param{long}{ id}, \param{long}{ clientData}}
-
-Sets client data for the given node.
-
diff --git a/contrib/docs/latex/deprecated/tresourc.tex b/contrib/docs/latex/deprecated/tresourc.tex
deleted file mode 100644
index 53ddab1ea9..0000000000
--- a/contrib/docs/latex/deprecated/tresourc.tex
+++ /dev/null
@@ -1,335 +0,0 @@
-\section{The wxWindows resource system}\label{resourceformats}
-
-wxWindows has an optional {\it resource file} facility,
-which allows separation of dialog, menu, bitmap and icon specifications
-from the application code.
-
-{\bf NOTE:} this format is now deprecated in favour of the XML-based \helpref{XRC resource system}{xrcoverview}.
-However it is still available if wxUSE\_RESOURCES is enabled.
-
-The format is similar in principle to the Windows resource file (whose ASCII form is
-suffixed .RC and whose binary form is suffixed .RES). The wxWindows resource
-file is currently ASCII-only, suffixed .WXR. Note that under Windows,
-the .WXR file does not {\it replace} the native Windows resource file,
-it merely supplements it. There is no existing native resource format in X
-(except for the defaults file, which has limited expressive power).
-
-For details of functions for manipulating resource files and loading
-user interface elements, see \helpref{wxWindows resource functions}{resourcefuncs}.
-
-You can use Dialog Editor to create resource files. Unfortunately neither
-Dialog Editor nor the .WXR format currently cover all wxWindows controls;
-some are missing, such as wxSpinCtrl, wxSpinButton, wxListCtrl, wxTreeCtrl and others.
-
-Note that in later versions of wxWindows, this resource format will be replaced
-by XML specifications that can also include sizers.
-
-\subsection{The format of a .WXR file}
-
-A wxWindows resource file may look a little odd at first. It is C++
-compatible, comprising mostly of static string variable declarations with
-wxExpr syntax within the string.
-
-Here's a sample .WXR file:
-
-\begin{verbatim}
-/*
- * wxWindows Resource File
- *
- */
-
-#include "noname.ids"
-
-static char *my_resource = "bitmap(name = 'my_resource',\
-  bitmap = ['myproject', wxBITMAP_TYPE_BMP_RESOURCE, 'WINDOWS'],\
-  bitmap = ['myproject.xpm', wxBITMAP_TYPE_XPM, 'X']).";
-
-static char *menuBar11 = "menu(name = 'menuBar11',\
-  menu = \
-  [\
-    ['&File', 1, '', \
-      ['&Open File', 2, 'Open a file'],\
-      ['&Save File', 3, 'Save a file'],\
-      [],\
-      ['E&xit', 4, 'Exit program']\
-    ],\
-    ['&Help', 5, '', \
-      ['&About', 6, 'About this program']\
-    ]\
-  ]).";
-
-static char *project_resource = "icon(name = 'project_resource',\
-  icon = ['project', wxBITMAP_TYPE_ICO_RESOURCE, 'WINDOWS'],\
-  icon = ['project_data', wxBITMAP_TYPE_XBM, 'X']).";
-
-static char *panel3 = "dialog(name = 'panel3',\
-  style = '',\
-  title = 'untitled',\
-  button_font = [14, 'wxSWISS', 'wxNORMAL', 'wxBOLD', 0],\
-  label_font = [10, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
-  x = 0, y = 37, width = 292, height = 164,\
-  control = [1000, wxButton, 'OK', '', 'button5', 23, 34, -1, -1, 'my_resource'],\
-  control = [1001, wxStaticText, 'A Label', '', 'message7', 166, 61, -1, -1, 'my_resource'],\
-  control = [1002, wxTextCtrl, 'Text', 'wxTE_MULTITEXT', 'text8', 24, 110, -1, -1]).";
-\end{verbatim}
-
-As you can see, C++-style comments are allowed, and apparently include files
-are supported too: but this is a special case, where the included file
-is a file of defines shared by the C++ application code and resource file
-to relate identifiers (such as FILE\_OPEN) to integers.
-
-Each {\it resource object} is of standard \helpref{wxExpr}{wxexpr} syntax, that is,
-an object name such as {\bf dialog} or {\bf icon}, then an open
-parenthesis, a list of comma-delimited attribute/value pairs, a closing
-parenthesis, and a full stop. Backslashes are required to escape newlines,
-for the benefit of C++ syntax. If double quotation marks are used to
-delimit strings, they need to be escaped with backslash within a C++ string
-(so it is easier to use single quotation marks instead).
-
-\normalbox{{\it A note on string syntax:} A string that begins with
-an alphabetic character, and contains only alphanumeric characters,
-hyphens and underscores, need not be quoted at all. Single quotes and double
-quotes may be used to delimit more complex strings. In fact, single-quoted
-and no-quoted strings are actually called {\it words}, but are treated
-as strings for the purpose of the resource system.}
-
-A resource file like this is typically included in the application main file,
-as if it were a normal C++ file. This eliminates the need for a separate
-resource file to be distributed alongside the executable. However, the
-resource file can be dynamically loaded if desired (useful for non-C++
-languages such as Python).
-
-Once included, the resources need to be `parsed' (interpreted), because
-so far the data is just a number of static string variables. The function\rtfsp
-{\bf ::wxResourceParseData} is called early on in initialization of the application
-(usually in {\bf wxApp::OnInit}) with a variable as argument. This may need to be
-called a number of times, one for each variable. However, more than one
-resource `object' can be stored in one string variable at a time, so you can
-get all your resources into one variable if you want to.
-
-{\bf ::wxResourceParseData} parses the contents of the resource, ready for use
-by functions such as {\bf ::wxResourceCreateBitmap} and {\bf wxPanel::LoadFromResource}.
-
-If a wxWindows resource object (such as a bitmap resource) refers to a
-C++ data structure, such as static XPM data, a further call ({\bf ::wxResourceRegisterBitmapData}) needs
-to be made on initialization to tell
-wxWindows about this data. The wxWindows resource object will refer to a
-string identifier, such as `project\_data' in the example file above.
-This identifier will be looked up in a table to get the C++ static data
-to use for the bitmap or icon.
-
-In the C++ fragment below, the WXR resource file is included,
-and appropriate resource initialization is carried out in {\bf OnInit}.
-Note that at this stage, no actual wxWindows dialogs, menus, bitmaps or
-icons are created; their `templates' are merely being set up for later
-use.
-
-\begin{verbatim}
-/*
- * File:    project.cpp
- * Purpose: main application module
- */
-
-#include "wx/wx.h"
-#include "project.h"
-
-// Includes the dialog, menu etc. resources
-#include "project.wxr"
-
-// Includes XPM data
-#include "project.xpm"
-
-IMPLEMENT_APP(AppClass)
-
-// Called to initialize the program
-bool AppClass::OnInit()
-{
-  wxResourceRegisterBitmapData("project_data", project_bits, project_width, project_height);
-
-  wxResourceParseData(menuBar11);
-  wxResourceParseData(my_resource);
-  wxResourceParseData(project_resource);
-  wxResourceParseData(panel3);
-  ...
-
-  return true;
-}
-\end{verbatim}
-
-The following code shows a dialog:
-
-\begin{verbatim}
-  // project.wxr contains dialog1
-  MyDialog *dialog = new MyDialog;
-  if (dialog->LoadFromResource(this, "dialog1"))
-  {
-    wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("text3", dialog);
-    if (text)
-      text->SetValue("wxWindows resource demo");
-    dialog->ShowModal();
-  }
-  dialog->Destroy();
-\end{verbatim}
-
-Please see also the resource sample.
-
-\subsection{Dialog resource format}
-
-A dialog resource object may be used for either panels or dialog boxes, and
-consists of the following attributes. In the following, a {\it font specification}\rtfsp
-is a list consisting of point size, family, style, weight, underlined, optional facename.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitemruled{Attribute}{Value}
-\twocolitem{id}{The integer identifier of the resource.}
-\twocolitem{name}{The name of the resource.}
-\twocolitem{style}{Optional dialog box or panel window style.}
-\twocolitem{title}{The title of the dialog box (unused if a panel).}.
-\twocolitem{modal}{Whether modal: 1 if modal, 0 if modeless, absent if a panel resource.}
-\twocolitem{use\_dialog\_units}{If 1, use dialog units (dependent on the dialog font size) for control sizes and positions.}
-\twocolitem{use\_system\_defaults}{If 1, override colours and fonts to use system settings instead.}
-\twocolitem{button\_font}{The font used for control buttons: a list comprising point size (integer),
-family (string), font style (string), font weight (string) and underlining (0 or 1).}
-\twocolitem{label\_font}{The font used for control labels: a list comprising point size (integer),
-family (string), font style (string), font weight (string) and underlining (0 or 1). Now obsolete; use button\_font instead.}
-\twocolitem{x}{The x position of the dialog or panel.}
-\twocolitem{y}{The y position of the dialog or panel.}
-\twocolitem{width}{The width of the dialog or panel.}
-\twocolitem{height}{The height of the dialog or panel.}
-\twocolitem{background\_colour}{The background colour of the dialog or panel.}
-\twocolitem{label\_colour}{The default label colour for the children of the dialog or panel. Now obsolete; use button\_colour instead.}
-\twocolitem{button\_colour}{The default button text colour for the children of the dialog or panel.}
-\end{twocollist}
-
-Then comes zero or more attributes named `control' for each control
-(panel item) on the dialog or panel. The value is a list of further
-elements. In the table below, the names in the first column correspond to
-the first element of the value list, and the second column details the
-remaining elements of the list. Note that titles for some controls are obsolete
-(they don't have titles), but the syntax is retained for backward compatibility.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitemruled{Control}{Values}
-\twocolitem{wxButton}{id (integer), title (string), window style (string), name (string), x, y, width, height, button bitmap resource (optional string), button font spec}
-\twocolitem{wxCheckBox}{id (integer), title (string), window style (string), name (string), x, y, width, height, default value (optional integer, 1 or 0), label font spec}
-\twocolitem{wxChoice}{id (integer), title (string), window style (string), name (string), x, y, width, height, values (optional list of strings), label font spec, button font spec}
-\twocolitem{wxComboBox}{id (integer), title (string), window style (string), name (string), x, y, width, height, default text value, values (optional list of strings), label font spec, button font spec}
-\twocolitem{wxGauge}{id (integer), title (string), window style (string), name (string), x, y, width, height, value (optional integer), range (optional integer), label font spec, button font spec}
-\twocolitem{wxStaticBox}{id (integer), title (string), window style (string), name (string), x, y, width, height, label font spec}
-\twocolitem{wxListBox}{id (integer), title (string), window style (string), name (string), x, y, width, height, values (optional list of strings), multiple (optional string, wxSINGLE or wxMULTIPLE),
-label font spec, button font spec}
-\twocolitem{wxStaticText}{id (integer), title (string), window style (string), name (string), x, y, width, height, message bitmap resource (optional string), label font spec}
-\twocolitem{wxRadioBox}{id (integer), title (string), window style (string), name (string), x, y, width, height, values (optional list of strings), number of rows or cols,
-label font spec, button font spec}
-\twocolitem{wxRadioButton}{id (integer), title (string), window style (string), name (string), x, y, width, height, default value (optional integer, 1 or 0), label font spec}
-\twocolitem{wxScrollBar}{id (integer), title (string), window style (string), name (string), x, y, width, height, value (optional integer),
-page length (optional integer), object length (optional integer), view length (optional integer)}
-\twocolitem{wxSlider}{id (integer), title (string), window style (string), name (string), x, y, width, height, value (optional integer), minimum (optional integer), maximum (optional integer),
-label font spec, button font spec}
-\twocolitem{wxTextCtrl}{id (integer), title (string), window style (string), name (string), x, y, width, height, default value (optional string),
-label font spec, button font spec}
-\end{twocollist}
-
-\subsection{Menubar resource format}
-
-A menubar resource object consists of the following attributes.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitemruled{Attribute}{Value}
-\twocolitem{name}{The name of the menubar resource.}
-\twocolitem{menu}{A list containing all the menus, as detailed below.}
-\end{twocollist}
-
-The value of the {\bf menu} attribute is a list of menu item specifications, where each menu
-item specification is itself a list comprising:
-
-\begin{itemize}\itemsep=0pt
-\item title (a string)
-\item menu item identifier (a string or non-zero integer, see below)
-\item help string (optional)
-\item 0 or 1 for the `checkable' parameter (optional)
-\item optionally, further menu item specifications if this item is a pulldown menu.
-\end{itemize}
-
-If the menu item specification is the empty list ([]), this is interpreted as a menu separator.
-
-If further (optional) information is associated with each menu item in a future release of wxWindows,
-it will be placed after the help string and before the optional pulldown menu specifications.
-
-Note that the menu item identifier must be an integer if the resource is being
-included as C++ code and then parsed on initialisation. Unfortunately,\rtfsp
-\#define substitution is not performed inside strings, and
-therefore the program cannot know the mapping. However, if the .WXR file
-is being loaded dynamically, wxWindows will attempt to replace string
-identifiers with \#defined integers, because it is able to parse
-the included \#defines.
-
-\subsection{Bitmap resource format}
-
-A bitmap resource object consists of a name attribute, and one or more {\bf bitmap} attributes.
-There can be more than one of these to allow specification of bitmaps that are optimum for the
-platform and display.
-
-\begin{itemize}\itemsep=0pt
-\item Bitmap name or filename.
-\item Type of bitmap; for example, wxBITMAP\_TYPE\_BMP\_RESOURCE. See class reference under {\bf wxBitmap} for
-a full list).
-\item Platform this bitmap is valid for; one of WINDOWS, X, MAC and ANY.
-\item Number of colours (optional).
-\item X resolution (optional).
-\item Y resolution (optional).
-\end{itemize}
-
-\subsection{Icon resource format}
-
-An icon resource object consists of a name attribute, and one or more {\bf icon} attributes.
-There can be more than one of these to allow specification of icons that are optimum for the
-platform and display.
-
-\begin{itemize}\itemsep=0pt
-\item Icon name or filename.
-\item Type of icon; for example, wxBITMAP\_TYPE\_ICO\_RESOURCE. See class reference under {\bf wxBitmap} for
-a full list).
-\item Platform this bitmap is valid for; one of WINDOWS, X, MAC and ANY.
-\item Number of colours (optional).
-\item X resolution (optional).
-\item Y resolution (optional).
-\end{itemize}
-
-\subsection{Resource format design issues}
-
-The .WXR file format is a recent addition and subject to change.
-The use of an ASCII resource file format may seem rather inefficient, but this
-choice has a number of advantages:
-
-\begin{itemize}\itemsep=0pt
-\item Since it is C++ compatible, it can be included into an application's source code,
-eliminating the problems associated with distributing a separate resource file
-with the executable. However, it can also be loaded dynamically from a file, which will be required
-for non-C++ programs that use wxWindows.
-\item No extra binary file format and separate converter need be maintained for the wxWindows project
-(although others are welcome to add the equivalent of the Windows `rc' resource
-parser and a binary format).
-\item It would be difficult to append a binary resource component onto an executable
-in a portable way.
-\item The file format is essentially the \helpref{wxExpr}{wxexpr} object format, for which
-a parser already exists, so parsing is easy. For those programs that use wxExpr
-anyway, the size overhead of the parser is minimal.
-\end{itemize}
-
-The disadvantages of the approach include:
-
-\begin{itemize}\itemsep=0pt
-\item Parsing adds a small execution overhead to program initialization.
-\item Under 16-bit Windows especially, global data is at a premium.
-Using a .RC resource table for some wxWindows resource data may be a partial solution,
-although .RC strings are limited to 255 characters.
-\item Without a resource preprocessor, it is not possible to substitute integers
-for identifiers (so menu identifiers have to be written as integers in the resource
-object, in addition to providing \#defines for application code convenience).
-\end{itemize}
-
-\subsection{Compiling the resource system}
-
-To enable the resource system, set {\bf wxUSE\_WX\_RESOURCES} to 1 in setup.h.
-
diff --git a/contrib/docs/latex/fl/back.gif b/contrib/docs/latex/fl/back.gif
deleted file mode 100644
index 88a3740f91..0000000000
Binary files a/contrib/docs/latex/fl/back.gif and /dev/null differ
diff --git a/contrib/docs/latex/fl/baglayout.tex b/contrib/docs/latex/fl/baglayout.tex
deleted file mode 100644
index 1ac0d1d018..0000000000
--- a/contrib/docs/latex/fl/baglayout.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbar.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{BagLayout}}\label{baglayout}
-
-
-BagLayout lays out items in left-to-right order from
-top to bottom.
-
-\wxheading{Derived from}
-
-\helpref{LayoutManagerBase}{layoutmanagerbase}
-
-\wxheading{Include files}
-
-<wx/fl/dyntbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{BagLayout::Layout}\label{baglayoutlayout}
-
-\func{void}{Layout}{\param{const wxSize\& }{parentDim}, \param{wxSize\& }{resultingDim}, \param{wxLayoutItemArrayT\& }{items}, \param{int }{horizGap}, \param{int }{vertGap}}
-
-Constructor.
-
diff --git a/contrib/docs/latex/fl/bariterator.tex b/contrib/docs/latex/fl/bariterator.tex
deleted file mode 100644
index e8ed66afc6..0000000000
--- a/contrib/docs/latex/fl/bariterator.tex
+++ /dev/null
@@ -1,58 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{wxBarIterator}}\label{wxbariterator}
-
-
-Used for traversing through all bars of all rows in the pane.
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxBarIterator::wxBarIterator}\label{wxbariteratorwxbariterator}
-
-\func{}{wxBarIterator}{\param{RowArrayT\& }{rows}}
-
-Constructor, taking row array.
-
-
-\membersection{wxBarIterator::BarInfo}\label{wxbariteratorbarinfo}
-
-\func{cbBarInfo\&}{BarInfo}{\void}
-
-Gets the current bar information.
-
-
-\membersection{wxBarIterator::Next}\label{wxbariteratornext}
-
-\func{bool}{Next}{\void}
-
-Advances the iterator and returns TRUE if a bar is available.
-
-
-\membersection{wxBarIterator::Reset}\label{wxbariteratorreset}
-
-\func{void}{Reset}{\void}
-
-Resets the iterator to the start of the first row.
-
-
-\membersection{wxBarIterator::RowInfo}\label{wxbariteratorrowinfo}
-
-\func{cbRowInfo\&}{RowInfo}{\void}
-
-Returns a reference to the currently traversed row.
-
diff --git a/contrib/docs/latex/fl/body.tex b/contrib/docs/latex/fl/body.tex
deleted file mode 100644
index e2cb8e4c09..0000000000
--- a/contrib/docs/latex/fl/body.tex
+++ /dev/null
@@ -1,269 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Name:        body.tex
-%% Purpose:     FL documenation
-%% Author:      wxWidgets Team
-%% Modified by:
-%% Created:
-%% RCS-ID:      $Id$
-%% Copyright:   (c) wxWidgets Team
-%% License:     wxWindows license
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Introduction}\label{introduction}
-\pagenumbering{arabic}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{What is FL?}\label{whatisfl}
-
-This manual describes FL (Frame Layout), a
-class library for managing sophisticated window layout,
-with panes that can be moved around the main window
-and customized. FL handles many decoration and dragging
-issues, giving applications the kind of docking facilities
-that Visual C++ and Netscape Navigator possess.
-
-FL was written by Aleksandras Gluchovas, and is heavily used in
-wxWorkshop which he also wrote the bulk of.
-
-{\bf Please note} that this guide is in its infancy, and contributions
-from FL users are very welcome.
-
-The following screenshot (from fl\_demo1) shows a frame with a number of
-bars that can be dragged around. The vertical grippers with
-two lines allow a bar to be dragged in that row, changing the
-ordering of the bar if necessary.
-The dotted grippers (as in Netscape Navigator) allow
-a whole row to be moved, again changing the position of the row
-if required. While moving a bar or row, immediate feedback
-is given as the moving bar displaces other bars.
-
-Other features: the splitter bar shows a dotted thick line as
-it's dragged. Single-clicking on a row handle minimizes it to
-a horizontal tab which is given its own narrow row. This allows
-the user to temporarily hide a row while allowing quick access
-to it when required.
-
-A close button (x) hides a bar completely. You can get it back again
-by right-clicking and selecting the appropriate menu item.
-
-A left, right, up or down arrow button expands the pane in that direction.
-
-\center{\image{}{screen01.bmp}}
-
-\section{Compiling and using FL}
-
-FL can be found under the 'contrib' hierarchy, in the following directories:
-
-\begin{verbatim}
-  contrib/src/fl
-  contrib/include/wx/fl
-  contrib/samples/fl
-  contrib/docs/latex/fl
-  docs/html/fl
-  docs/htmlhelp/fl.chm
-  docs/pdf/fl.pdf
-  docs/winhelp/fl.hlp
-\end{verbatim}
-
-To compile FL:
-
-\begin{itemize}\itemsep=0pt
-\item Under Windows using VC++, open the flVC.dsw project
-and compile.
-\item Under Unix, FL should be configured when you configured
-wxWindows. Make FL by changing directory to contrib/src/fl and
-type 'make'. {\bf Note:} there is currently a
-problem with the wxWindows build system that means that
-only the static version of library can be built at present.
-\end{itemize}
-
-To use FL:
-
-\begin{itemize}\itemsep=0pt
-\item Under Windows using VC++, link with fl[d].lib.
-\item Under Unix, link with libfl[d].a.
-\end{itemize}
-
-\section{FL concepts}
-
-These are typical steps when adding FL functionality to your application.
-
-\begin{itemize}\itemsep=0pt
-\item include the appropriate header files;
-\item create a new \helpref{wxFrameLayout}{wxframelayout} passing the top-level frame and the window that
-is interpreted as the main 'client' window;
-\item set an updates manager for optimizing drag operations;
-\item add plugins for implementing various features;
-\item add bars;
-\item enable floating mode for the layout if required;
-\item delete the frame layout in the main frame's destructor.
-\end{itemize}
-
-The following is taken from fl\_demo1 and shows the main code implementing the
-user interface as illustrated in \helpref{What is FL?}{whatisfl}.
-
-\begin{verbatim}
-// fl headers
-#include "wx/fl/controlbar.h"     // core API
-
-// extra plugins
-#include "wx/fl/barhintspl.h"    // bevel for bars with "X"s and grooves
-#include "wx/fl/rowdragpl.h"     // NC-look with draggable rows
-#include "wx/fl/cbcustom.h"      // customization plugin
-#include "wx/fl/hintanimpl.h"
-
-// beauty-care
-#include "wx/fl/gcupdatesmgr.h"  // smooth d&d
-#include "wx/fl/antiflickpl.h"   // double-buffered repaint of decorations
-#include "wx/fl/dyntbar.h"       // auto-layout toolbar
-#include "wx/fl/dyntbarhnd.h"    // control-bar dimension handler for it
-
-MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, wxID_ANY, "wxWindows 2.0 wxFrameLayout Test Application", wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxRESIZE_BORDER | wxSYSTEM_MENU  | wxCAPTION,
-          "freimas" )
-{
-    mpClientWnd = CreateTextCtrl( "Client window" );
-
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-
-    mpLayout->SetUpdatesManager( new cbGCUpdatesMgr() );
-
-    // setup plugins for testing
-    mpLayout->PushDefaultPlugins();
-
-    mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // fancy "X"es and bevel for bars
-    mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbRowDragPlugin  ) );
-    mpLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
-
-    // drop in some bars
-    cbDimInfo sizes0( 200,45, // when docked horizontally
-                      200,85, // when docked vertically
-                      175,35, // when floated
-                      FALSE,  // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    );
-
-    cbDimInfo sizes1( 150,35, // when docked horizontally
-                      150,85, // when docked vertically
-                      175,35, // when floated
-                      TRUE,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    );
-
-    cbDimInfo sizes2( 175,45, // when docked horizontally
-                      175,37, // when docked vertically
-                      170,35, // when floated
-                      TRUE,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4,      // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl("Hello"),  // bar window
-                      sizes0, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      0,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      "InfoViewer1",            // name for reference in customization pop-ups
-                      TRUE
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl("Bye"),    // bar window
-                      sizes0, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      1,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      "InfoViewer2",            // name for reference in customization pop-ups
-                      TRUE
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl("Fixed0"), // bar window
-                      sizes1, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      0,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      "ToolBar1",               // name for reference in customization pop-ups
-                      TRUE
-                    );
-
-    wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
-
-    pToolBar->Create( this, -1 );
-
-    // 1001-1006 ids of command events fired by added tool-buttons
-
-    pToolBar->AddTool( 1001, BMP_DIR "new.bmp" );
-    pToolBar->AddTool( 1002, BMP_DIR "open.bmp" );
-    pToolBar->AddTool( 1003, BMP_DIR "save.bmp" );
-
-    pToolBar->AddTool( 1004, BMP_DIR "cut.bmp" );
-    pToolBar->AddTool( 1005, BMP_DIR "copy.bmp" );
-    pToolBar->AddTool( 1006, BMP_DIR "paste.bmp" );
-
-    mpLayout->AddBar( pToolBar,             // bar window (can be NULL)
-                      sizes2, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
-                      0,                    // insert into 0th row (vert. position)
-                      0,                    // offset from the start of row (in pixels)
-                      "ToolBar2",           // name for reference in customization pop-ups
-                      FALSE
-                    );
-
-    mpLayout->EnableFloating( TRUE ); // off, thinking about wxGtk...
-}
-
-MyFrame::~MyFrame()
-{
-    if ( mpLayout)
-        delete mpLayout; // should be destroyed manually
-}
-\end{verbatim}
-
-\section{Controlling dragging behaviour}\label{controllingdragbehav}
-
-Various pane-dragging behaviours are supported. FL can
-show an outline of where the window would be docked
-if you stopped dragging at that point.
-
-This is a list of properties of interest in the cbCommonPaneProperties
-structure:
-
-\begin{verbatim}
-    bool mRealTimeUpdatesOn;     // default: ON
-    bool mOutOfPaneDragOn;       // default: ON
-    bool mExactDockPredictionOn; // default: OFF
-    bool mNonDestructFrictionOn; // default: OFF
-\end{verbatim}
-
-To get behaviour similar to Microsoft's DevStudio drag-ghost behaviour,
-mRealTimeUpdatesOn have to be set to FALSE, for example:
-
-\begin{verbatim}
-    cbCommonPaneProperties props;
-    ....
-    ....
-    props.mRealTimeUpdatesOn = FALSE;
-    fl->SetPaneProperties( props, wxALL_PANES );
-\end{verbatim}
-
-{\it mOutOfPaneDragOn} specifies whether bars can be dragged
-away from this pane. (Note: this may not currently be working.)
-
-{\it mExactDockPredictionOn} is only relevant when {\it mRealTimeUpdatesOn} is FALSE,
-and then the hint rectangle behaves a little jumpily. It tries to show
-exatly how the bar would look and where it would be docked if the dragging finished right
-now, i.e. the final position, with all the 'friction-physics' calculated.
-Otherwise the hint flies smothly above the surface only hinting whether the bar
-will be docked vertically or horizontally if dropped now.
-This is a feature you won't find anywhere else!
-
-{\it mNonDestructFirctionOn} causes the bars not being dragged
-to stay where they are, while the currently dragged one is 'diving'
-through the underlaying panes, docking itself in and out in real time.
-Otherwise the stationary bars would be pushed around messing up the composition permanently.
-This flag is irelevant when {\it mRealTimeUpdatesOn} is FALSE, as the ghost-rect
-does not do any docking until the drag finishes.
diff --git a/contrib/docs/latex/fl/bullet.bmp b/contrib/docs/latex/fl/bullet.bmp
deleted file mode 100644
index 6481f5143b..0000000000
Binary files a/contrib/docs/latex/fl/bullet.bmp and /dev/null differ
diff --git a/contrib/docs/latex/fl/category.tex b/contrib/docs/latex/fl/category.tex
deleted file mode 100644
index 4241b7ff04..0000000000
--- a/contrib/docs/latex/fl/category.tex
+++ /dev/null
@@ -1,92 +0,0 @@
-\chapter{Classes by category}\label{classesbycat}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-A classification of FL classes by category.
-
-{\large {\bf Plugin classes}}
-
-Plugins can be added to frame layouts to extend behaviour.
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{cbAntiflickerPlugin}{cbantiflickerplugin}}{Double-buffering class}
-\twocolitem{\helpref{cbBarDragPlugin}{cbbardragplugin}}{Implements drag behaviour.}
-\twocolitem{\helpref{cbBarHintsPlugin}{cbbarhintsplugin}}{Implements bar decoration and sizing behaviour.}
-\twocolitem{\helpref{cbHintAnimationPlugin}{cbhintanimationplugin}}{Draws animated hints when the user drags a pane.}
-\twocolitem{\helpref{cbPaneDrawPlugin}{cbpanedrawplugin}}{Implements most of MFC-style control bar implementation.}
-\twocolitem{\helpref{cbPluginBase}{cbpluginbase}}{Abstract base class for all control-bar related plugins.}
-\twocolitem{\helpref{cbRowDragPlugin}{cbrowdragplugin}}{Implements row-dragging functionality.}
-\twocolitem{\helpref{cbRowLayoutPlugin}{cbrowlayoutplugin}}{Implements row layout functionality.}
-\twocolitem{\helpref{cbSimpleCustomizationPlugin}{cbsimplecustomizationplugin}}{Enables customization of a bar.}
-\twocolitem{\helpref{cbBarSpy}{cbbarspy}}{Helper class used for spying for unhandled mouse events on control bars and forwarding them to the frame layout.}
-\end{twocollist}
-
-{\large {\bf Window classes}}
-
-Windows classes (note that the mini-button implementations are not true windows
-in that they do not derive from wxWindow).
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxToolWindow}{wxtoolwindow}}{A small frame that paints its own titlebar.}
-\twocolitem{\helpref{cbFloatedBarWindow}{cbfloatedbarwindow}}{A kind of wxToolWindow implementing floating windows.}
-\twocolitem{\helpref{cbMiniButton}{cbminibutton}}{Base class for wxToolWindow titlebar buttons.}
-\twocolitem{\helpref{cbCloseBox}{cbclosebox}}{Close button for wxToolWindow titlebar.}
-\twocolitem{\helpref{cbCollapseBox}{cbcollapsebox}}{Collapse button for wxToolWindow titlebar.}
-\twocolitem{\helpref{cbDockBox}{cbdockbox}}{Dock button for wxToolWindow titlebar.}
-\twocolitem{\helpref{cbCloseBox}{cbclosebox}}{Close button for wxToolWindow titlebar.}
-\twocolitem{\helpref{wxNewBitmapButton}{wxnewbitmapbutton}}{Alternative bitmap button class.}
-\end{twocollist}
-
-{\large {\bf Layout management classes}}
-
-These classes relate to the layout management framework.
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{cbDockPane}{cbdockpane}}{Manages containment and control of bars in a prent frame.}
-\twocolitem{\helpref{BagLayout}{baglayout}}{BagLayout lays out items in left-to-right order from top to bottom.}
-\twocolitem{\helpref{cbUpdatesManagerBase}{cbupdatesmanagerbase}}{An abstract interface for display update optimization logic.}
-\twocolitem{\helpref{cbSimpleUpdatesMgr}{cbsimpleupdatesmgr}}{Implements optimized logic for refreshing areas of frame layout that need to be updated.}
-\twocolitem{\helpref{cbGCUpdatesMgr}{cbgcupdatesmgr}}{Implements optimized logic for refresh, based on a garbage collection algorithm.}
-\twocolitem{\helpref{GarbageCollector}{garbagecollector}}{A garbage collection algorithm for use in display refresh optimization.}
-\twocolitem{\helpref{wxFrameLayout}{wxframelayout}}{Manages containment and docking of control bars, which can be docked along the top, bottom, right, or left side of the parent frame.}
-\end{twocollist}
-
-{\large {\bf Event classes}}
-
-Events are used to decouple parts of the layout framework. For event macros and identifiers,
-please see the topic \helpref{Event macros and identifiers}{events}.
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{cbCustomizeBarEvent}{cbcustomizebarevent}}{Class for bar customization events.}
-\twocolitem{\helpref{cbCustomizeLayoutEvent}{cbcustomizelayoutevent}}{Class for layout customization events.}
-\twocolitem{\helpref{cbDrawBarDecorEvent}{cbdrawbardecorevent}}{Class for bar decoration drawing events.}
-\twocolitem{\helpref{cbDrawBarHandlesEvent}{cbdrawbarhandlesevent}}{Class for bar handles drawing events.}
-\twocolitem{\helpref{cbDrawHintRectEvent}{cbdrawhintrectevent}}{Class for hint-rectangle drawing events.}
-\twocolitem{\helpref{cbDrawPaneBkGroundEvent}{cbdrawpanebkgroundevent}}{Class for pane background drawing events.}
-\twocolitem{\helpref{cbDrawPaneDecorEvent}{cbdrawpanedecorevent}}{Class for pane decoration drawing events.}
-\twocolitem{\helpref{cbDrawRowBkGroundEvent}{cbdrawrowbkgroundevent}}{Class for row background drawing events.}
-\twocolitem{\helpref{cbDrawRowDecorEvent}{cbdrawrowdecorevent}}{Class for row decoration drawing events.}
-\twocolitem{\helpref{cbDrawRowHandlesEvent}{cbdrawrowhandlesevent}}{Class for row handles drawing events.}
-\twocolitem{\helpref{cbFinishDrawInAreaEvent}{cbfinishdrawinareaevent}}{Class for finish drawing in area events.}
-\twocolitem{\helpref{cbInsertBarEvent}{cbinsertbarevent}}{Class for bar insertion events.}
-\twocolitem{\helpref{cbLayoutRowEvent}{cblayoutrowevent}}{Class for single row layout events.}
-\twocolitem{\helpref{cbLayoutRowsEvent}{cblayoutrowsevent}}{Class for multiple rows layout events.}
-\twocolitem{\helpref{cbLeftDClickEvent}{cbleftdclickevent}}{Class for mouse left double click events.}
-\twocolitem{\helpref{cbLeftDownEvent}{cbleftdownevent}}{Class for mouse left down events.}
-\twocolitem{\helpref{cbLeftUpEvent}{cbleftupevent}}{Class for mouse left up events.}
-\twocolitem{\helpref{cbMotionEvent}{cbmotionevent}}{Class for mouse motion events.}
-\twocolitem{\helpref{cbPluginEvent}{cbpluginevent}}{Base class for all control-bar plugin events.}
-\twocolitem{\helpref{cbRemoveBarEvent}{cbremovebarevent}}{Class for bar removal events.}
-\twocolitem{\helpref{cbResizeBarEvent}{cbresizebarevent}}{Class for bar resize events.}
-\twocolitem{\helpref{cbResizeRowEvent}{cbresizerowevent}}{Class for row resize events.}
-\twocolitem{\helpref{cbRightDownEvent}{cbrightdownevent}}{Class for mouse right down events.}
-\twocolitem{\helpref{cbRightUpEvent}{cbrightupevent}}{Class for mouse right up events.}
-\twocolitem{\helpref{cbSizeBarWndEvent}{cbsizebarwndevent}}{Class for bar window resize events.}
-\twocolitem{\helpref{cbStartBarDraggingEvent}{cbstartbardraggingevent}}{Class for start-bar-dragging events.}
-\twocolitem{\helpref{cbStartDrawInAreaEvent}{cbstartdrawinareaevent}}{Class for start drawing in area events.}
-\end{twocollist}
-
diff --git a/contrib/docs/latex/fl/cbantiflickerplugin.tex b/contrib/docs/latex/fl/cbantiflickerplugin.tex
deleted file mode 100644
index 785892b3e3..0000000000
--- a/contrib/docs/latex/fl/cbantiflickerplugin.tex
+++ /dev/null
@@ -1,88 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% antiflickpl.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbAntiflickerPlugin}}\label{cbantiflickerplugin}
-
-
-Implements double-buffering to reduce flicker.
-Bitmap and memory DC buffers are shared 'resources' among all instances of
-antiflicker plugins within the application.
-
-Locking for multithreaded applications is not yet implemented.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/antiflickpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbAntiflickerPlugin::cbAntiflickerPlugin}\label{cbantiflickerplugincbantiflickerplugin}
-
-\func{}{cbAntiflickerPlugin}{\void}
-
-Default constructor.
-
-
-\func{}{cbAntiflickerPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor taking frame layout panel, and pane mask.
-
-
-\membersection{cbAntiflickerPlugin::\destruct{cbAntiflickerPlugin}}\label{cbantiflickerplugindtor}
-
-\func{}{\destruct{cbAntiflickerPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbAntiflickerPlugin::AllocNewBuffer}\label{cbantiflickerpluginallocnewbuffer}
-
-\func{wxDC*}{AllocNewBuffer}{\param{const wxRect\& }{forArea}}
-
-Allocates a suitable buffer.
-
-
-\membersection{cbAntiflickerPlugin::FindSuitableBuffer}\label{cbantiflickerpluginfindsuitablebuffer}
-
-\func{wxDC*}{FindSuitableBuffer}{\param{const wxRect\& }{forArea}}
-
-Finds a suitable buffer. Returns NULL if a suitable buffer is not present.
-
-
-\membersection{cbAntiflickerPlugin::GetClientDC}\label{cbantiflickerplugingetclientdc}
-
-\func{wxDC\&}{GetClientDC}{\void}
-
-Gets the client device context.
-
-
-\membersection{cbAntiflickerPlugin::GetWindowDC}\label{cbantiflickerplugingetwindowdc}
-
-\func{wxDC\&}{GetWindowDC}{\void}
-
-Gets the window device context.
-
-
-\membersection{cbAntiflickerPlugin::OnFinishDrawInArea}\label{cbantiflickerpluginonfinishdrawinarea}
-
-\func{void}{OnFinishDrawInArea}{\param{cbFinishDrawInAreaEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbAntiflickerPlugin::OnStartDrawInArea}\label{cbantiflickerpluginonstartdrawinarea}
-
-\func{void}{OnStartDrawInArea}{\param{cbStartDrawInAreaEvent\& }{event}}
-
-Handler for plugin event.
-
diff --git a/contrib/docs/latex/fl/cbbardimhandlerbase.tex b/contrib/docs/latex/fl/cbbardimhandlerbase.tex
deleted file mode 100644
index 1487c7abb1..0000000000
--- a/contrib/docs/latex/fl/cbbardimhandlerbase.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{cbBarDimHandlerBase}}\label{cbbardimhandlerbase}
-
-
-Abstract interface for bar-size handler classes.
-These objects receive notifications whenever the docking
-state of the bar is changed, thus they provide the possibility
-to adjust the values in cbDimInfo::mSizes accordingly.
-Specific handlers can be hooked up to specific types of bar.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbBarDimHandlerBase::cbBarDimHandlerBase}\label{cbbardimhandlerbasecbbardimhandlerbase}
-
-\func{}{cbBarDimHandlerBase}{\void}
-
-to multiple bars, it's instance is
-reference-counted
-Default constructor. The initial reference count is 0, since
-the handler is not used until the first invocation of AddRef().
-
-
-\membersection{cbBarDimHandlerBase::AddRef}\label{cbbardimhandlerbaseaddref}
-
-\func{void}{AddRef}{\void}
-
-Increments the reference count.
-
-
-\membersection{cbBarDimHandlerBase::OnChangeBarState}\label{cbbardimhandlerbaseonchangebarstate}
-
-\func{void}{OnChangeBarState}{\param{cbBarInfo* }{pBar}, \param{int }{newState}}
-
-Responds to "bar-state-changes" notifications.
-
-
-\membersection{cbBarDimHandlerBase::OnResizeBar}\label{cbbardimhandlerbaseonresizebar}
-
-\func{void}{OnResizeBar}{\param{cbBarInfo* }{pBar}, \param{const wxSize\& }{given}, \param{wxSize\& }{preferred}}
-
-Responds to bar resize notifications.
-
-
-\membersection{cbBarDimHandlerBase::RemoveRef}\label{cbbardimhandlerbaseremoveref}
-
-\func{void}{RemoveRef}{\void}
-
-Decrements the reference count, and if the count is at zero,
-delete 'this'.
-
diff --git a/contrib/docs/latex/fl/cbbardragplugin.tex b/contrib/docs/latex/fl/cbbardragplugin.tex
deleted file mode 100644
index 518880ef86..0000000000
--- a/contrib/docs/latex/fl/cbbardragplugin.tex
+++ /dev/null
@@ -1,246 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% bardragpl.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbBarDragPlugin}}\label{cbbardragplugin}
-
-
-Plugin class implementing bar dragging.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/bardragpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbBarDragPlugin::cbBarDragPlugin}\label{cbbardragplugincbbardragplugin}
-
-\func{}{cbBarDragPlugin}{\void}
-
-Default constructor.
-
-
-\func{}{cbBarDragPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor taking a parent frame, and flag. See cbPluginBase.
-
-
-\membersection{cbBarDragPlugin::\destruct{cbBarDragPlugin}}\label{cbbardragplugindtor}
-
-\func{}{\destruct{cbBarDragPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbBarDragPlugin::AdjustHintRect}\label{cbbardragpluginadjusthintrect}
-
-\func{void}{AdjustHintRect}{\param{wxPoint\& }{mousePos}}
-
-the thicker rectangle is drawn using hatched brush,
-the default border width for this rectangle is 8 pix.
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::CalcOnScreenDims}\label{cbbardragplugincalconscreendims}
-
-\func{void}{CalcOnScreenDims}{\param{wxRect\& }{rect}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::ClipPosInFrame}\label{cbbardragpluginclipposinframe}
-
-\func{void}{ClipPosInFrame}{\param{wxPoint\& }{pos}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::ClipRectInFrame}\label{cbbardragplugincliprectinframe}
-
-\func{void}{ClipRectInFrame}{\param{wxRect\& }{rect}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::DoDrawHintRect}\label{cbbardragplugindodrawhintrect}
-
-\func{void}{DoDrawHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal implementation function.
-Draw the hint rectangle.
-
-
-\membersection{cbBarDragPlugin::DrawHintRect}\label{cbbardragplugindrawhintrect}
-
-\func{void}{DrawHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal implementation function.
-Draw the visual hint while dragging.
-
-
-\membersection{cbBarDragPlugin::EraseHintRect}\label{cbbardragpluginerasehintrect}
-
-\func{void}{EraseHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal implementation function.
-Erase the visual hint while dragging.
-
-
-\membersection{cbBarDragPlugin::FinishTracking}\label{cbbardragpluginfinishtracking}
-
-\func{void}{FinishTracking}{\void}
-
-Internal implementation function.
-Stop showing the visual hint while dragging.
-
-
-\membersection{cbBarDragPlugin::GetBarHeightInPane}\label{cbbardragplugingetbarheightinpane}
-
-\func{int}{GetBarHeightInPane}{\param{cbDockPane* }{pPane}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::GetBarWidthInPane}\label{cbbardragplugingetbarwidthinpane}
-
-\func{int}{GetBarWidthInPane}{\param{cbDockPane* }{pPane}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::GetDistanceToPane}\label{cbbardragplugingetdistancetopane}
-
-\func{int}{GetDistanceToPane}{\param{cbDockPane* }{pPane}, \param{wxPoint\& }{mousePos}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::HitTestPanes}\label{cbbardragpluginhittestpanes}
-
-\func{cbDockPane*}{HitTestPanes}{\param{wxRect\& }{rect}}
-
-Internal implementation function. Finds the pane
-under the specified rectangle.
-
-
-\func{cbDockPane*}{HitTestPanes}{\param{wxPoint\& }{pos}}
-
-Internal implementation function. Finds the pane
-under the specified point.
-
-
-\membersection{cbBarDragPlugin::HitsPane}\label{cbbardragpluginhitspane}
-
-\func{bool}{HitsPane}{\param{cbDockPane* }{pPane}, \param{wxRect\& }{rect}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::IsInClientArea}\label{cbbardragpluginisinclientarea}
-
-\func{bool}{IsInClientArea}{\param{wxPoint\& }{mousePos}}
-
-Internal implementation function.
-
-
-\func{bool}{IsInClientArea}{\param{wxRect\& }{rect}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::IsInOtherPane}\label{cbbardragpluginisinotherpane}
-
-\func{bool}{IsInOtherPane}{\param{wxPoint\& }{mousePos}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::OnDrawHintRect}\label{cbbardragpluginondrawhintrect}
-
-\func{void}{OnDrawHintRect}{\param{cbDrawHintRectEvent\& }{event}}
-
-Handles event, which originates from itself.
-
-
-\membersection{cbBarDragPlugin::OnLButtonDown}\label{cbbardragpluginonlbuttondown}
-
-\func{void}{OnLButtonDown}{\param{cbLeftDownEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbBarDragPlugin::OnLButtonUp}\label{cbbardragpluginonlbuttonup}
-
-\func{void}{OnLButtonUp}{\param{cbLeftUpEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbBarDragPlugin::OnLDblClick}\label{cbbardragpluginonldblclick}
-
-\func{void}{OnLDblClick}{\param{cbLeftDClickEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbBarDragPlugin::OnMouseMove}\label{cbbardragpluginonmousemove}
-
-\func{void}{OnMouseMove}{\param{cbMotionEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbBarDragPlugin::OnStartBarDragging}\label{cbbardragpluginonstartbardragging}
-
-\func{void}{OnStartBarDragging}{\param{cbStartBarDraggingEvent\& }{event}}
-
-Handler for plugin event.
-
-
-\membersection{cbBarDragPlugin::RectToScr}\label{cbbardragpluginrecttoscr}
-
-\func{void}{RectToScr}{\param{wxRect\& }{frameRect}, \param{wxRect\& }{scrRect}}
-
-Internal implementation function.
-Converts the given rectangle from window to screen coordinates.
-
-
-\membersection{cbBarDragPlugin::ShowHint}\label{cbbardragpluginshowhint}
-
-\func{void}{ShowHint}{\param{bool }{prevWasInClient}}
-
-Internal implementation function.
-Show the hint; called within OnMouseMove.
-
-
-\membersection{cbBarDragPlugin::StartTracking}\label{cbbardragpluginstarttracking}
-
-\func{void}{StartTracking}{\void}
-
-on-screen hint-tracking related methods
-Internal implementation function.
-Start showing a visual hint while dragging.
-
-
-\membersection{cbBarDragPlugin::StickToPane}\label{cbbardragpluginsticktopane}
-
-\func{void}{StickToPane}{\param{cbDockPane* }{pPane}, \param{wxPoint\& }{mousePos}}
-
-Internal implementation function.
-
-
-\membersection{cbBarDragPlugin::UnstickFromPane}\label{cbbardragpluginunstickfrompane}
-
-\func{void}{UnstickFromPane}{\param{cbDockPane* }{pPane}, \param{wxPoint\& }{mousePos}}
-
-Internal implementation function.
-
diff --git a/contrib/docs/latex/fl/cbbarhintsplugin.tex b/contrib/docs/latex/fl/cbbarhintsplugin.tex
deleted file mode 100644
index 13a3cbf001..0000000000
--- a/contrib/docs/latex/fl/cbbarhintsplugin.tex
+++ /dev/null
@@ -1,155 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% barhintspl.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{cbBarHintsPlugin}}\label{cbbarhintsplugin}
-
-
-This class intercepts bar-decoration and sizing events, and draws 3D hints
-around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/barhintspl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbBarHintsPlugin::cbBarHintsPlugin}\label{cbbarhintsplugincbbarhintsplugin}
-
-\func{}{cbBarHintsPlugin}{\void}
-
-Default constructor.
-
-
-\func{}{cbBarHintsPlugin}{\param{wxFrameLayout* }{pLayout}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor, taking parent frame and pane mask flag.
-
-
-\membersection{cbBarHintsPlugin::\destruct{cbBarHintsPlugin}}\label{cbbarhintsplugindtor}
-
-\func{}{\destruct{cbBarHintsPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbBarHintsPlugin::CreateBoxes}\label{cbbarhintsplugincreateboxes}
-
-\func{void}{CreateBoxes}{\void}
-
-Helper function: creates close and collapse boxes.
-
-
-\membersection{cbBarHintsPlugin::DoDrawHint}\label{cbbarhintsplugindodrawhint}
-
-\func{void}{DoDrawHint}{\param{wxDC\& }{dc}, \param{wxRect\& }{rect}, \param{int }{pos}, \param{int }{boxOfs}, \param{int }{grooveOfs}, \param{bool }{isFixed}}
-
-Helper function: draws a hint.
-
-
-\membersection{cbBarHintsPlugin::Draw3DBox}\label{cbbarhintsplugindraw3dbox}
-
-\func{void}{Draw3DBox}{\param{wxDC\& }{dc}, \param{const wxPoint\& }{pos}, \param{bool }{pressed}}
-
-Helper function: draws a 3D box.
-
-
-\membersection{cbBarHintsPlugin::DrawCloseBox}\label{cbbarhintsplugindrawclosebox}
-
-\func{void}{DrawCloseBox}{\param{wxDC\& }{dc}, \param{const wxPoint\& }{pos}, \param{bool }{pressed}}
-
-Helper function: draws a close box.
-
-
-\membersection{cbBarHintsPlugin::DrawCollapseBox}\label{cbbarhintsplugindrawcollapsebox}
-
-\func{void}{DrawCollapseBox}{\param{wxDC\& }{dc}, \param{const wxPoint\& }{pos}, \param{bool }{atLeft}, \param{bool }{disabled}, \param{bool }{pressed}}
-
-Helper function: draws a collapse box.
-
-
-\membersection{cbBarHintsPlugin::DrawGrooves}\label{cbbarhintsplugindrawgrooves}
-
-\func{void}{DrawGrooves}{\param{wxDC\& }{dc}, \param{const wxPoint\& }{pos}, \param{int }{length}}
-
-Helper function: draws grooves.
-
-
-\membersection{cbBarHintsPlugin::ExcludeHints}\label{cbbarhintspluginexcludehints}
-
-\func{void}{ExcludeHints}{\param{wxRect\& }{rect}, \param{cbBarInfo\& }{info}}
-
-Helper function.
-
-
-\membersection{cbBarHintsPlugin::GetHintsLayout}\label{cbbarhintsplugingethintslayout}
-
-\func{void}{GetHintsLayout}{\param{wxRect\& }{rect}, \param{cbBarInfo\& }{info}, \param{int\& }{boxOfs}, \param{int\& }{grooveOfs}, \param{int\& }{pos}}
-
-Helper function: gets the layout of a hint.
-
-
-\membersection{cbBarHintsPlugin::HitTestHints}\label{cbbarhintspluginhittesthints}
-
-\func{int}{HitTestHints}{\param{cbBarInfo\& }{info}, \param{const wxPoint\& }{pos}}
-
-Helper function: returns information about the hint under the given position.
-
-
-\membersection{cbBarHintsPlugin::OnDrawBarDecorations}\label{cbbarhintspluginondrawbardecorations}
-
-\func{void}{OnDrawBarDecorations}{\param{cbDrawBarDecorEvent\& }{event}}
-
-Handles a plugin event.
-
-
-\membersection{cbBarHintsPlugin::OnInitPlugin}\label{cbbarhintspluginoninitplugin}
-
-\func{void}{OnInitPlugin}{\void}
-
-Called to initialize this plugin.
-
-
-\membersection{cbBarHintsPlugin::OnLeftDown}\label{cbbarhintspluginonleftdown}
-
-\func{void}{OnLeftDown}{\param{cbLeftDownEvent\& }{event}}
-
-Handles a plugin event.
-
-
-\membersection{cbBarHintsPlugin::OnLeftUp}\label{cbbarhintspluginonleftup}
-
-\func{void}{OnLeftUp}{\param{cbLeftUpEvent\& }{event}}
-
-Handles a plugin event.
-
-
-\membersection{cbBarHintsPlugin::OnMotion}\label{cbbarhintspluginonmotion}
-
-\func{void}{OnMotion}{\param{cbMotionEvent\& }{event}}
-
-Handles a plugin event.
-
-
-\membersection{cbBarHintsPlugin::OnSizeBarWindow}\label{cbbarhintspluginonsizebarwindow}
-
-\func{void}{OnSizeBarWindow}{\param{cbSizeBarWndEvent\& }{event}}
-
-Handles a plugin event.
-
-
-\membersection{cbBarHintsPlugin::SetGrooveCount}\label{cbbarhintspluginsetgroovecount}
-
-\func{void}{SetGrooveCount}{\param{int }{nGrooves}}
-
-Set the number of grooves to be shown in the pane.
-
diff --git a/contrib/docs/latex/fl/cbbarinfo.tex b/contrib/docs/latex/fl/cbbarinfo.tex
deleted file mode 100644
index 48664eb0cc..0000000000
--- a/contrib/docs/latex/fl/cbbarinfo.tex
+++ /dev/null
@@ -1,52 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbBarInfo}}\label{cbbarinfo}
-
-
-Helper class used internally by the wxFrameLayout class.
-Holds and manages bar information.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbBarInfo::cbBarInfo}\label{cbbarinfocbbarinfo}
-
-\func{}{cbBarInfo}{\void}
-
-Constructor.
-
-
-\membersection{cbBarInfo::\destruct{cbBarInfo}}\label{cbbarinfodtor}
-
-\func{}{\destruct{cbBarInfo}}{\void}
-
-Destructor.
-
-
-\membersection{cbBarInfo::IsExpanded}\label{cbbarinfoisexpanded}
-
-\constfunc{bool}{IsExpanded}{\void}
-
-Returns TRUE if this bar is expanded.
-
-
-\membersection{cbBarInfo::IsFixed}\label{cbbarinfoisfixed}
-
-\constfunc{bool}{IsFixed}{\void}
-
-Returns TRUE if this bar is fixed.
-
diff --git a/contrib/docs/latex/fl/cbbarshapedata.tex b/contrib/docs/latex/fl/cbbarshapedata.tex
deleted file mode 100644
index 6b4bf87330..0000000000
--- a/contrib/docs/latex/fl/cbbarshapedata.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbBarShapeData}}\label{cbbarshapedata}
-
-
-Used for storing the original bar's positions in the row, when the 'non-destructive-friction'
-option is turned on.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
diff --git a/contrib/docs/latex/fl/cbbarspy.tex b/contrib/docs/latex/fl/cbbarspy.tex
deleted file mode 100644
index da87a05660..0000000000
--- a/contrib/docs/latex/fl/cbbarspy.tex
+++ /dev/null
@@ -1,72 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{cbBarSpy}}\label{cbbarspy}
-
-
-Helper class, used for spying for unhandled mouse events on control bars
-and forwarding them to the frame layout.
-
-\wxheading{Derived from}
-
-\helpref{wxEvtHandler}{wxevthandler}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef cbBarInfo* BarInfoPtrT
-\end{verbatim}}
-forward declarations
-
-{\small \begin{verbatim}
-typedef cbRowInfo* RowInfoPtrT
-\end{verbatim}}
-enumeration of hittest results, see cbDockPane::HitTestPaneItems(..)
-\begin{verbatim}
-enum CB_HITTEST_RESULT
-{
-    CB_NO_ITEMS_HITTED,
-
-    CB_UPPER_ROW_HANDLE_HITTED,
-    CB_LOWER_ROW_HANDLE_HITTED,
-    CB_LEFT_BAR_HANDLE_HITTED,
-    CB_RIGHT_BAR_HANDLE_HITTED,
-    CB_BAR_CONTENT_HITTED
-}
-\end{verbatim}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbBarSpy::cbBarSpy}\label{cbbarspycbbarspy}
-
-\func{}{cbBarSpy}{\param{wxFrameLayout* }{pPanel}}
-
-Constructor, taking a parent pane.
-
-
-\func{}{cbBarSpy}{\void}
-
-Default constructor.
-
-
-\membersection{cbBarSpy::ProcessEvent}\label{cbbarspyprocessevent}
-
-\func{bool}{ProcessEvent}{\param{wxEvent\& }{event}}
-
-Performs special event processing.
-
-
-\membersection{cbBarSpy::SetBarWindow}\label{cbbarspysetbarwindow}
-
-\func{void}{SetBarWindow}{\param{wxWindow* }{pWnd}}
-
-Sets the bar window.
-
diff --git a/contrib/docs/latex/fl/cbclosebox.tex b/contrib/docs/latex/fl/cbclosebox.tex
deleted file mode 100644
index e3210833e9..0000000000
--- a/contrib/docs/latex/fl/cbclosebox.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbCloseBox}}\label{cbclosebox}
-
-
-cbCloseBox is a window close button, used in a wxToolWindow titlebar.
-
-\wxheading{Derived from}
-
-\helpref{cbMiniButton}{cbminibutton}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbCloseBox::Draw}\label{cbcloseboxdraw}
-
-\func{void}{Draw}{\param{wxDC\& }{dc}}
-
-Draws the close button appearance.
-
diff --git a/contrib/docs/latex/fl/cbcollapsebox.tex b/contrib/docs/latex/fl/cbcollapsebox.tex
deleted file mode 100644
index b1f75db4fd..0000000000
--- a/contrib/docs/latex/fl/cbcollapsebox.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbCollapseBox}}\label{cbcollapsebox}
-
-
-cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
-
-\wxheading{Derived from}
-
-\helpref{cbMiniButton}{cbminibutton}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbCollapseBox::Draw}\label{cbcollapseboxdraw}
-
-\func{void}{Draw}{\param{wxDC\& }{dc}}
-
-Draws the collapse button appearance.
-
diff --git a/contrib/docs/latex/fl/cbcommonpaneproperties.tex b/contrib/docs/latex/fl/cbcommonpaneproperties.tex
deleted file mode 100644
index 0ef8e1d741..0000000000
--- a/contrib/docs/latex/fl/cbcommonpaneproperties.tex
+++ /dev/null
@@ -1,58 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-\section{\class{cbCommonPaneProperties}}\label{cbcommonpaneproperties}
-
-A structure holding configuration options,
-which are usually the same for all panes in
-a frame layout. For an explanation of the data members, please
-see \helpref{Controlling dragging behaviour}{controllingdragbehav}.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\begin{verbatim}
-class cbCommonPaneProperties : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
-
-    // Look-and-feel configuration
-
-    bool mRealTimeUpdatesOn;     // default: ON
-    bool mOutOfPaneDragOn;       // default: ON
-    bool mExactDockPredictionOn; // default: OFF
-    bool mNonDestructFrictionOn; // default: OFF
-
-    bool mShow3DPaneBorderOn;    // default: ON
-
-    // The following properties are reserved for the "future"
-
-    bool mBarFloatingOn;         // default: OFF
-    bool mRowProportionsOn;      // default: OFF
-    bool mColProportionsOn;      // default: ON
-    bool mBarCollapseIconsOn;    // default: OFF
-    bool mBarDragHintsOn;        // default: OFF
-
-    // Minimal dimensions for not-fixed bars in this pane (16x16 default)
-
-    wxSize mMinCBarDim;
-
-    // Width/height of resizing sash
-
-    int    mResizeHandleSize;
-
-    // Default constructor.
-
-    cbCommonPaneProperties(void);
-};
-\end{verbatim}
-
diff --git a/contrib/docs/latex/fl/cbcustomizebarevent.tex b/contrib/docs/latex/fl/cbcustomizebarevent.tex
deleted file mode 100644
index 701ef965d7..0000000000
--- a/contrib/docs/latex/fl/cbcustomizebarevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbCustomizeBarEvent}}\label{cbcustomizebarevent}
-
-
-Class for bar customization events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbCustomizeBarEvent::cbCustomizeBarEvent}\label{cbcustomizebareventcbcustomizebarevent}
-
-\func{}{cbCustomizeBarEvent}{\param{cbBarInfo* }{pBar}, \param{const wxPoint\& }{clickPos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, mouse position, and pane.
-
diff --git a/contrib/docs/latex/fl/cbcustomizelayoutevent.tex b/contrib/docs/latex/fl/cbcustomizelayoutevent.tex
deleted file mode 100644
index a7e1d81b10..0000000000
--- a/contrib/docs/latex/fl/cbcustomizelayoutevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbCustomizeLayoutEvent}}\label{cbcustomizelayoutevent}
-
-
-Class for layout customization events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbCustomizeLayoutEvent::cbCustomizeLayoutEvent}\label{cbcustomizelayouteventcbcustomizelayoutevent}
-
-\func{}{cbCustomizeLayoutEvent}{\param{const wxPoint\& }{clickPos}}
-
-Constructor, taking mouse position.
-
diff --git a/contrib/docs/latex/fl/cbdiminfo.tex b/contrib/docs/latex/fl/cbdiminfo.tex
deleted file mode 100644
index 97aa565c43..0000000000
--- a/contrib/docs/latex/fl/cbdiminfo.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{cbDimInfo}}\label{cbdiminfo}
-
-
-Helper class used internally by the wxFrameLayout class.
-Holds and manages information about bar dimensions.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDimInfo::cbDimInfo}\label{cbdiminfocbdiminfo}
-
-\func{}{cbDimInfo}{\param{cbBarDimHandlerBase* }{pDimHandler}, \param{bool }{isFixed}}
-
-Constructor.
-isFixed is TRUE if vertical/horizontal dimensions cannot be manually adjusted
-by the user using resizing handles. If FALSE, the frame-layout
-automatically places resizing handles among bars that do are not fixed.
-
-
-\func{}{cbDimInfo}{\param{int }{dh\_x}, \param{int }{dh\_y}, \param{int }{dv\_x}, \param{int }{dv\_y}, \param{int }{f\_x}, \param{int }{f\_y}, \param{bool }{isFixed = TRUE}, \param{int }{horizGap = 6}, \param{int }{vertGap = 6}, \param{cbBarDimHandlerBase* }{pDimHandler = NULL}}
-
-Constructor taking dimenstion information.
-dh\_x, dh\_y are the dimensions when docked horizontally.
-dv\_x, dv\_y are the dimensions when docked vertically.
-f\_x, f\_y are the dimensions when floating.
-For information on isFixed, see comments above.
-horizGap is the left/right gap, separating decorations
-from the bar's actual wndow, filled with the frame's background colour.
-The dimension is given in the frame's coordinates.
-vertGap is the top/bottom gap, separating decorations
-from the bar's actual wndow, filled with the frame's background colour.
-The dimension is given in the frame's coordinates.
-
-
-\func{}{cbDimInfo}{\param{int }{x}, \param{int }{y}, \param{bool }{isFixed = TRUE}, \param{int }{gap = 6}, \param{cbBarDimHandlerBase* }{pDimHandler = NULL}}
-
-Constructor.
-
-
-\func{}{cbDimInfo}{\void}
-
-Default constructor.
-
-
-\membersection{cbDimInfo::\destruct{cbDimInfo}}\label{cbdiminfodtor}
-
-\func{}{\destruct{cbDimInfo}}{\void}
-
-Destructor. Destroys handler automatically, if present.
-
-
-\membersection{cbDimInfo::GetDimHandler}\label{cbdiminfogetdimhandler}
-
-\func{cbBarDimHandlerBase*}{GetDimHandler}{\void}
-
-Returns the handler, if any.
-
-
-\membersection{cbDimInfo::operator=}\label{cbdiminfooperatorassign}
-
-\func{const cbDimInfo\& operator}{operator=}{\param{const cbDimInfo\& }{other}}
-
-Assignment operator.
-
diff --git a/contrib/docs/latex/fl/cbdockbox.tex b/contrib/docs/latex/fl/cbdockbox.tex
deleted file mode 100644
index e89edc9158..0000000000
--- a/contrib/docs/latex/fl/cbdockbox.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbDockBox}}\label{cbdockbox}
-
-
-cbDockBox is a window dock button, used in a wxToolWindow titlebar.
-
-\wxheading{Derived from}
-
-\helpref{cbMiniButton}{cbminibutton}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDockBox::Draw}\label{cbdockboxdraw}
-
-\func{void}{Draw}{\param{wxDC\& }{dc}}
-
-Draws the dock button appearance.
-
diff --git a/contrib/docs/latex/fl/cbdockpane.tex b/contrib/docs/latex/fl/cbdockpane.tex
deleted file mode 100644
index 315e76c709..0000000000
--- a/contrib/docs/latex/fl/cbdockpane.tex
+++ /dev/null
@@ -1,578 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbDockPane}}\label{cbdockpane}
-
-
-This class manages containment and control of control bars
-along one of the four edges of the parent frame.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDockPane::cbDockPane}\label{cbdockpanecbdockpane}
-
-\func{}{cbDockPane}{\param{int }{alignment}, \param{wxFrameLayout* }{pPanel}}
-
-Constructor, taking alignment and layout panel.
-
-
-\func{}{cbDockPane}{\void}
-
-public members Default constructor.
-
-
-\membersection{cbDockPane::\destruct{cbDockPane}}\label{cbdockpanedtor}
-
-\func{}{\destruct{cbDockPane}}{\void}
-
-Destructor.
-
-
-\membersection{cbDockPane::BarPresent}\label{cbdockpanebarpresent}
-
-\func{bool}{BarPresent}{\param{cbBarInfo* }{pBar}}
-
-Returns TRUE if the given bar is present in this pane.
-
-
-\membersection{cbDockPane::CalcLengthRatios}\label{cbdockpanecalclengthratios}
-
-\func{void}{CalcLengthRatios}{\param{cbRowInfo* }{pInRow}}
-
-Calculate lengths.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::ContractBar}\label{cbdockpanecontractbar}
-
-\func{void}{ContractBar}{\param{cbBarInfo* }{pBar}}
-
-Contracts the bar.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::DoInsertBar}\label{cbdockpanedoinsertbar}
-
-\func{void}{DoInsertBar}{\param{cbBarInfo* }{pBar}, \param{int }{rowNo}}
-
-Inserts the bar at the given row number.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::DrawHorizHandle}\label{cbdockpanedrawhorizhandle}
-
-\func{void}{DrawHorizHandle}{\param{wxDC\& }{dc}, \param{int }{x}, \param{int }{y}, \param{int }{width}}
-
-Row/bar resizing related helper-method.
-
-
-\membersection{cbDockPane::DrawVertHandle}\label{cbdockpanedrawverthandle}
-
-\func{void}{DrawVertHandle}{\param{wxDC\& }{dc}, \param{int }{x}, \param{int }{y}, \param{int }{height}}
-
-protected really (accessed only by plugins) Row/bar resizing related helper-method.
-
-
-\membersection{cbDockPane::ExpandBar}\label{cbdockpaneexpandbar}
-
-\func{void}{ExpandBar}{\param{cbBarInfo* }{pBar}}
-
-Expands the bar.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::FinishDrawInArea}\label{cbdockpanefinishdrawinarea}
-
-\func{void}{FinishDrawInArea}{\param{const wxRect\& }{area}}
-
-Generates cbFinishDrawInAreaEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::FrameToPane}\label{cbdockpaneframetopane}
-
-\func{void}{FrameToPane}{\param{int* }{x}, \param{int* }{y}}
-
-Coordinate translation between parent's frame and this pane.
-Internal function called by plugins.
-
-
-\func{void}{FrameToPane}{\param{wxRect* }{pRect}}
-
-Coordinate translation between parent's frame and this pane.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetAlignment}\label{cbdockpanegetalignment}
-
-\func{int}{GetAlignment}{\void}
-
-Returns the alignment for this pane. The value is one of
-FL\_ALIGN\_TOP, FL\_ALIGN\_BOTTOM, FL\_ALIGN\_LEFT, FL\_ALIGN\_RIGHT.
-
-
-\membersection{cbDockPane::GetBarInfoByWindow}\label{cbdockpanegetbarinfobywindow}
-
-\func{cbBarInfo*}{GetBarInfoByWindow}{\param{wxWindow* }{pBarWnd}}
-
-Finds the bar information by corresponding window.
-
-
-\membersection{cbDockPane::GetBarResizeRange}\label{cbdockpanegetbarresizerange}
-
-\func{void}{GetBarResizeRange}{\param{cbBarInfo* }{pBar}, \param{int* }{from}, \param{int* }{till}, \param{bool }{forLeftHandle}}
-
-Returns the bar's resize range.
-
-
-\membersection{cbDockPane::GetDockingState}\label{cbdockpanegetdockingstate}
-
-\func{int}{GetDockingState}{\void}
-
-Returns wxCBAR\_DOCKED\_HORIZONTALLY if the alignment is top or bottom,
-or wxCBAR\_DOCKED\_VERTICALLY otherwise.
-
-
-\membersection{cbDockPane::GetFirstRow}\label{cbdockpanegetfirstrow}
-
-\func{cbRowInfo*}{GetFirstRow}{\void}
-
-Returns the first row.
-
-
-\membersection{cbDockPane::GetMinimalRowHeight}\label{cbdockpanegetminimalrowheight}
-
-\func{int}{GetMinimalRowHeight}{\param{cbRowInfo* }{pRow}}
-
-Returns the minimal row height for the given row.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetNotFixedBarsCount}\label{cbdockpanegetnotfixedbarscount}
-
-\func{int}{GetNotFixedBarsCount}{\param{cbRowInfo* }{pRow}}
-
-Returns the number of bars whose size is not fixed.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetPaneHeight}\label{cbdockpanegetpaneheight}
-
-\func{int}{GetPaneHeight}{\void}
-
-Returns the height in the pane's coordinates.
-
-
-\membersection{cbDockPane::GetRealRect}\label{cbdockpanegetrealrect}
-
-\func{wxRect\&}{GetRealRect}{\void}
-
-Returns the bounds of the pane, in parent coordinates.
-
-
-\membersection{cbDockPane::GetRow}\label{cbdockpanegetrow}
-
-\func{cbRowInfo*}{GetRow}{\param{int }{row}}
-
-protected really (accessed only by plugins) Returns the row info for a row index. Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetRowAt}\label{cbdockpanegetrowat}
-
-\func{int}{GetRowAt}{\param{int }{paneY}}
-
-Returns the row at the given vertical position.
-Returns -1 if the row is not present at given vertical position.
-Internal function called by plugins.
-
-
-\func{int}{GetRowAt}{\param{int }{upperY}, \param{int }{lowerY}}
-
-Returns the row between the given vertical positions.
-Returns -1 if the row is not present.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetRowIndex}\label{cbdockpanegetrowindex}
-
-\func{int}{GetRowIndex}{\param{cbRowInfo* }{pRow}}
-
-Returns the row index for the given row info.  Internal function called by plugins.
-
-
-\membersection{cbDockPane::GetRowList}\label{cbdockpanegetrowlist}
-
-\func{RowArrayT\&}{GetRowList}{\void}
-
-Returns an array of rows. Used by updates-managers.
-
-
-\membersection{cbDockPane::GetRowResizeRange}\label{cbdockpanegetrowresizerange}
-
-\func{void}{GetRowResizeRange}{\param{cbRowInfo* }{pRow}, \param{int* }{from}, \param{int* }{till}, \param{bool }{forUpperHandle}}
-
-Returns the row's resize range.
-
-
-\membersection{cbDockPane::GetRowShapeData}\label{cbdockpanegetrowshapedata}
-
-\func{void}{GetRowShapeData}{\param{cbRowInfo* }{pRow}, \param{wxList* }{pLst}}
-
-Returns row shape data.
-cbBarShapeData objects will be added to the given pLst.
-cbBarShapeData is used for storing the original bar's positions in the row,
-when the 'non-destructive-friction' option is turned on.
-
-
-\membersection{cbDockPane::GetRowY}\label{cbdockpanegetrowy}
-
-\func{int}{GetRowY}{\param{cbRowInfo* }{pRow}}
-
-Gets the vertical position at the given row.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HasNotFixedBarsLeft}\label{cbdockpanehasnotfixedbarsleft}
-
-\func{bool}{HasNotFixedBarsLeft}{\param{cbBarInfo* }{pBar}}
-
-Returns TRUE if there are any variable-sized rows to the left of this one.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HasNotFixedBarsRight}\label{cbdockpanehasnotfixedbarsright}
-
-\func{bool}{HasNotFixedBarsRight}{\param{cbBarInfo* }{pBar}}
-
-Returns TRUE if there are any variable-sized rows to the right of this one.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HasNotFixedRowsAbove}\label{cbdockpanehasnotfixedrowsabove}
-
-\func{bool}{HasNotFixedRowsAbove}{\param{cbRowInfo* }{pRow}}
-
-Returns TRUE if there are any variable-sized rows above this one.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HasNotFixedRowsBelow}\label{cbdockpanehasnotfixedrowsbelow}
-
-\func{bool}{HasNotFixedRowsBelow}{\param{cbRowInfo* }{pRow}}
-
-Returns TRUE if there are any variable-sized rows below this one.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HasPoint}\label{cbdockpanehaspoint}
-
-\func{bool}{HasPoint}{\param{const wxPoint\& }{pos}, \param{int }{x}, \param{int }{y}, \param{int }{width}, \param{int }{height}}
-
-Returns TRUE if pos is within the given rectangle.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::HitTestPaneItems}\label{cbdockpanehittestpaneitems}
-
-\func{int}{HitTestPaneItems}{\param{const wxPoint\& }{pos}, \param{cbRowInfo** }{ppRow}, \param{cbBarInfo** }{ppBar}}
-
-Returns the result of hit-testing items in the pane.
-See CB\_HITTEST\_RESULT enumerated type.
-pos is the position in this pane's coordinates.
-
-
-\membersection{cbDockPane::InitLinksForRow}\label{cbdockpaneinitlinksforrow}
-
-\func{void}{InitLinksForRow}{\param{cbRowInfo* }{pRow}}
-
-Sets up links between bars.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::InitLinksForRows}\label{cbdockpaneinitlinksforrows}
-
-\func{void}{InitLinksForRows}{\void}
-
-Sets up links between bars.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::InsertBar}\label{cbdockpaneinsertbar}
-
-\func{void}{InsertBar}{\param{cbBarInfo* }{pBarInfo}}
-
-Inserts bar and sets its position according to the preferred settings
-given in pBarInfo.
-
-
-\func{void}{InsertBar}{\param{cbBarInfo* }{pBar}, \param{const wxRect\& }{rect}}
-
-Inserts the bar into this pane. rect is given in the parent frame's coordinates.
-
-
-\func{void}{InsertBar}{\param{cbBarInfo* }{pBar}, \param{cbRowInfo* }{pIntoRow}}
-
-Inserts the bar into the given row, with dimensions and position
-stored in pBarInfo->mBounds. Returns the node of inserted bar.
-
-
-\membersection{cbDockPane::InsertRow}\label{cbdockpaneinsertrow}
-
-\func{void}{InsertRow}{\param{cbRowInfo* }{pRow}, \param{cbRowInfo* }{pBeforeRow}}
-
-Inserts a row. Does not refresh the inserted row immediately.
-If pBeforeRowNode is NULL, the row is appended to the end of pane's row list.
-
-
-\membersection{cbDockPane::IsFixedSize}\label{cbdockpaneisfixedsize}
-
-\func{bool}{IsFixedSize}{\param{cbBarInfo* }{pInfo}}
-
-Returns TRUE if the bar's dimension information indicates a fixed size.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::IsHorizontal}\label{cbdockpaneishorizontal}
-
-\func{bool}{IsHorizontal}{\void}
-
-Returns TRUE if the pane is aligned to the top or bottom.
-
-
-\membersection{cbDockPane::MatchesMask}\label{cbdockpanematchesmask}
-
-\func{bool}{MatchesMask}{\param{int }{paneMask}}
-
-Returns TRUE if the given mask matches the pane's mask.
-
-
-\membersection{cbDockPane::PaintBar}\label{cbdockpanepaintbar}
-
-\func{void}{PaintBar}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}}
-
-Calls PaintBarDecorations and PaintBarHandles.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintBarDecorations}\label{cbdockpanepaintbardecorations}
-
-\func{void}{PaintBarDecorations}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}}
-
-protected really (accessed only by plugins) Generates a cbDrawBarDecorEvent and sends it to the layout to paint the bar decorations.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintBarHandles}\label{cbdockpanepaintbarhandles}
-
-\func{void}{PaintBarHandles}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}}
-
-Generates a cbDrawBarHandlesEvent and sends it to the layout to paint the bar handles.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintPane}\label{cbdockpanepaintpane}
-
-\func{void}{PaintPane}{\param{wxDC\& }{dc}}
-
-Paints the pane background, the row background and decorations,
-and finally the pane decorations.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintPaneBackground}\label{cbdockpanepaintpanebackground}
-
-\func{void}{PaintPaneBackground}{\param{wxDC\& }{dc}}
-
-Generates cbDrawPaneBkGroundEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintPaneDecorations}\label{cbdockpanepaintpanedecorations}
-
-\func{void}{PaintPaneDecorations}{\param{wxDC\& }{dc}}
-
-Generates cbDrawPaneDecorEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintRow}\label{cbdockpanepaintrow}
-
-\func{void}{PaintRow}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Calls PaintRowBackground, PaintRowDecorations, PaintRowHandles.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintRowBackground}\label{cbdockpanepaintrowbackground}
-
-\func{void}{PaintRowBackground}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Generates cbDrawRowBkGroundEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintRowDecorations}\label{cbdockpanepaintrowdecorations}
-
-\func{void}{PaintRowDecorations}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Calls PaintBarDecorations for each row.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaintRowHandles}\label{cbdockpanepaintrowhandles}
-
-\func{void}{PaintRowHandles}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Generates cbDrawRowHandlesEvent and cbDrawRowDecorEvent and sends them to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::PaneToFrame}\label{cbdockpanepanetoframe}
-
-\func{void}{PaneToFrame}{\param{wxRect* }{pRect}}
-
-Coordinate translation between parent's frame and this pane.
-Internal function called by plugins.
-
-
-\func{void}{PaneToFrame}{\param{int* }{x}, \param{int* }{y}}
-
-Coordinate translation between parent's frame and this pane.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::RecalcLayout}\label{cbdockpanerecalclayout}
-
-\func{void}{RecalcLayout}{\void}
-
-Generates events to perform layout calculations.
-
-
-\membersection{cbDockPane::RecalcRowLayout}\label{cbdockpanerecalcrowlayout}
-
-\func{void}{RecalcRowLayout}{\param{cbRowInfo* }{pRow}}
-
-Generates a cbLayoutRowEvent event to recalculate row layouts.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::RemoveBar}\label{cbdockpaneremovebar}
-
-\func{void}{RemoveBar}{\param{cbBarInfo* }{pBar}}
-
-Removes the bar from this pane. Does not destroy the bar.
-
-
-\membersection{cbDockPane::RemoveRow}\label{cbdockpaneremoverow}
-
-\func{void}{RemoveRow}{\param{cbRowInfo* }{pRow}}
-
-Removes the row from this pane. Does not destroy the row object.
-
-
-\membersection{cbDockPane::ResizeBar}\label{cbdockpaneresizebar}
-
-\func{void}{ResizeBar}{\param{cbBarInfo* }{pBar}, \param{int }{ofs}, \param{bool }{forLeftHandle}}
-
-Row/bar resizing related helper-method.
-
-
-\membersection{cbDockPane::ResizeRow}\label{cbdockpaneresizerow}
-
-\func{void}{ResizeRow}{\param{cbRowInfo* }{pRow}, \param{int }{ofs}, \param{bool }{forUpperHandle}}
-
-Row/bar resizing related helper-method.
-
-
-\membersection{cbDockPane::SetBoundsInParent}\label{cbdockpanesetboundsinparent}
-
-\func{void}{SetBoundsInParent}{\param{const wxRect\& }{rect}}
-
-Set the position and dimensions of the pane in the parent frame's coordinates.
-
-
-\membersection{cbDockPane::SetMargins}\label{cbdockpanesetmargins}
-
-\func{void}{SetMargins}{\param{int }{top}, \param{int }{bottom}, \param{int }{left}, \param{int }{right}}
-
-Sets pane's margins in frame's coordinate orientations.
-
-
-\membersection{cbDockPane::SetPaneWidth}\label{cbdockpanesetpanewidth}
-
-\func{void}{SetPaneWidth}{\param{int }{width}}
-
-Sets pane's width in the pane's coordinates (including margins).
-
-
-\membersection{cbDockPane::SetRowHeight}\label{cbdockpanesetrowheight}
-
-\func{void}{SetRowHeight}{\param{cbRowInfo* }{pRow}, \param{int }{newHeight}}
-
-Sets the row height for the given height. newHeight includes the height of row handles, if present.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::SetRowShapeData}\label{cbdockpanesetrowshapedata}
-
-\func{void}{SetRowShapeData}{\param{cbRowInfo* }{pRowNode}, \param{wxList* }{pLst}}
-
-Sets the shape data for the given row, using the data provided in pLst.
-cbBarShapeData is used for storing the original bar's positions in the row,
-when the 'non-destructive-friction' option is turned on.
-
-
-\membersection{cbDockPane::SizeBar}\label{cbdockpanesizebar}
-
-\func{void}{SizeBar}{\param{cbBarInfo* }{pBar}}
-
-Generates a cbSizeBarWndEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::SizePaneObjects}\label{cbdockpanesizepaneobjects}
-
-\func{void}{SizePaneObjects}{\void}
-
-Calls SizeRowObjects for each row.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::SizeRowObjects}\label{cbdockpanesizerowobjects}
-
-\func{void}{SizeRowObjects}{\param{cbRowInfo* }{pRow}}
-
-Calls SizeBar for each bar in the row.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::StartDrawInArea}\label{cbdockpanestartdrawinarea}
-
-\func{wxDC*}{StartDrawInArea}{\param{const wxRect\& }{area}}
-
-Generates cbStartDrawInAreaEvent and sends it to the layout.
-Internal function called by plugins.
-
-
-\membersection{cbDockPane::SyncRowFlags}\label{cbdockpanesyncrowflags}
-
-\func{void}{SyncRowFlags}{\param{cbRowInfo* }{pRow}}
-
-Sets up flags in the row information structure, so that
-they match the changed state of row items correctly.
-Internal function called by plugins.
-
diff --git a/contrib/docs/latex/fl/cbdrawbardecorevent.tex b/contrib/docs/latex/fl/cbdrawbardecorevent.tex
deleted file mode 100644
index da0e868429..0000000000
--- a/contrib/docs/latex/fl/cbdrawbardecorevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawBarDecorEvent}}\label{cbdrawbardecorevent}
-
-
-Class for bar decoration drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawBarDecorEvent::cbDrawBarDecorEvent}\label{cbdrawbardecoreventcbdrawbardecorevent}
-
-\func{}{cbDrawBarDecorEvent}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, device context, and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex b/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex
deleted file mode 100644
index c82fec05f2..0000000000
--- a/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawBarHandlesEvent}}\label{cbdrawbarhandlesevent}
-
-
-Class for bar handles drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawBarHandlesEvent::cbDrawBarHandlesEvent}\label{cbdrawbarhandleseventcbdrawbarhandlesevent}
-
-\func{}{cbDrawBarHandlesEvent}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, device context, and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawhintrectevent.tex b/contrib/docs/latex/fl/cbdrawhintrectevent.tex
deleted file mode 100644
index 2e9fc05edd..0000000000
--- a/contrib/docs/latex/fl/cbdrawhintrectevent.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawHintRectEvent}}\label{cbdrawhintrectevent}
-
-
-Class for hint-rectangle drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawHintRectEvent::cbDrawHintRectEvent}\label{cbdrawhintrecteventcbdrawhintrectevent}
-
-\func{}{cbDrawHintRectEvent}{\param{const wxRect\& }{rect}, \param{bool }{isInClient}, \param{bool }{eraseRect}, \param{bool }{lastTime}}
-
-e.g. with fat/hatched border
-Constructor, taking hint rectangle and three flags.
-
diff --git a/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex b/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex
deleted file mode 100644
index 8cc5ee9b2e..0000000000
--- a/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawPaneBkGroundEvent}}\label{cbdrawpanebkgroundevent}
-
-
-Class for pane background drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawPaneBkGroundEvent::cbDrawPaneBkGroundEvent}\label{cbdrawpanebkgroundeventcbdrawpanebkgroundevent}
-
-\func{}{cbDrawPaneBkGroundEvent}{\param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking device context and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawpanedecorevent.tex b/contrib/docs/latex/fl/cbdrawpanedecorevent.tex
deleted file mode 100644
index 444aaabc8e..0000000000
--- a/contrib/docs/latex/fl/cbdrawpanedecorevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawPaneDecorEvent}}\label{cbdrawpanedecorevent}
-
-
-Class for pane decoration drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawPaneDecorEvent::cbDrawPaneDecorEvent}\label{cbdrawpanedecoreventcbdrawpanedecorevent}
-
-\func{}{cbDrawPaneDecorEvent}{\param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking device context and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex b/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex
deleted file mode 100644
index e2f0541b3e..0000000000
--- a/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawRowBkGroundEvent}}\label{cbdrawrowbkgroundevent}
-
-
-Class for row background drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawRowBkGroundEvent::cbDrawRowBkGroundEvent}\label{cbdrawrowbkgroundeventcbdrawrowbkgroundevent}
-
-\func{}{cbDrawRowBkGroundEvent}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking row information, device context, and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawrowdecorevent.tex b/contrib/docs/latex/fl/cbdrawrowdecorevent.tex
deleted file mode 100644
index 5069d16241..0000000000
--- a/contrib/docs/latex/fl/cbdrawrowdecorevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawRowDecorEvent}}\label{cbdrawrowdecorevent}
-
-
-Class for row decoration drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawRowDecorEvent::cbDrawRowDecorEvent}\label{cbdrawrowdecoreventcbdrawrowdecorevent}
-
-\func{}{cbDrawRowDecorEvent}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking row information, device context, and pane.
-
diff --git a/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex b/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex
deleted file mode 100644
index 17a2609b1c..0000000000
--- a/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbDrawRowHandlesEvent}}\label{cbdrawrowhandlesevent}
-
-
-Class for row handles drawing events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDrawRowHandlesEvent::cbDrawRowHandlesEvent}\label{cbdrawrowhandleseventcbdrawrowhandlesevent}
-
-\func{}{cbDrawRowHandlesEvent}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking row information, device context, and pane.
-
diff --git a/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex b/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex
deleted file mode 100644
index a58025a447..0000000000
--- a/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex
+++ /dev/null
@@ -1,37 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbarhnd.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbDynToolBarDimHandler}}\label{cbdyntoolbardimhandler}
-
-
-Dynamic toolbar dimension handler.
-
-\wxheading{Derived from}
-
-\helpref{cbBarDimHandlerBase}{cbbardimhandlerbase}
-
-\wxheading{Include files}
-
-<wx/fl/dyntbarhnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbDynToolBarDimHandler::OnChangeBarState}\label{cbdyntoolbardimhandleronchangebarstate}
-
-\func{void}{OnChangeBarState}{\param{cbBarInfo* }{pBar}, \param{int }{newState}}
-
-Called when the bar changes state.
-
-
-\membersection{cbDynToolBarDimHandler::OnResizeBar}\label{cbdyntoolbardimhandleronresizebar}
-
-\func{void}{OnResizeBar}{\param{cbBarInfo* }{pBar}, \param{const wxSize\& }{given}, \param{wxSize\& }{preferred}}
-
-Called when a bar is resized.
-
diff --git a/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex b/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex
deleted file mode 100644
index df53b9ec6d..0000000000
--- a/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbFinishDrawInAreaEvent}}\label{cbfinishdrawinareaevent}
-
-
-Class for finish drawing in area events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbFinishDrawInAreaEvent::cbFinishDrawInAreaEvent}\label{cbfinishdrawinareaeventcbfinishdrawinareaevent}
-
-\func{}{cbFinishDrawInAreaEvent}{\param{const wxRect\& }{area}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking rectangular area and pane.
-
diff --git a/contrib/docs/latex/fl/cbfloatedbarwindow.tex b/contrib/docs/latex/fl/cbfloatedbarwindow.tex
deleted file mode 100644
index a35d769581..0000000000
--- a/contrib/docs/latex/fl/cbfloatedbarwindow.tex
+++ /dev/null
@@ -1,89 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbFloatedBarWindow}}\label{cbfloatedbarwindow}
-
-
-cbFloatedBarWindow is a kind of wxToolWindow,
-implementing floating toolbars.
-
-\wxheading{Derived from}
-
-\helpref{wxToolWindow}{wxtoolwindow}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbFloatedBarWindow::cbFloatedBarWindow}\label{cbfloatedbarwindowcbfloatedbarwindow}
-
-\func{}{cbFloatedBarWindow}{\void}
-
-Default constructor.
-
-
-\membersection{cbFloatedBarWindow::GetBar}\label{cbfloatedbarwindowgetbar}
-
-\func{cbBarInfo*}{GetBar}{\void}
-
-Returns the bar information for this window.
-
-
-\membersection{cbFloatedBarWindow::GetPreferredSize}\label{cbfloatedbarwindowgetpreferredsize}
-
-\func{wxSize}{GetPreferredSize}{\param{const wxSize\& }{given}}
-
-Overridden function returning the preferred size.
-
-
-\membersection{cbFloatedBarWindow::HandleTitleClick}\label{cbfloatedbarwindowhandletitleclick}
-
-\func{bool}{HandleTitleClick}{\param{wxMouseEvent\& }{event}}
-
-Overridden function responding to mouse button clicks on the titlebar.
-
-
-\membersection{cbFloatedBarWindow::OnDblClick}\label{cbfloatedbarwindowondblclick}
-
-\func{void}{OnDblClick}{\param{wxMouseEvent\& }{event}}
-
-Responds to double-click mouse events.
-
-
-\membersection{cbFloatedBarWindow::OnMiniButtonClicked}\label{cbfloatedbarwindowonminibuttonclicked}
-
-\func{void}{OnMiniButtonClicked}{\param{int }{btnIdx}}
-
-Overridden function responding to mouse clicks on mini-buttons.
-
-
-\membersection{cbFloatedBarWindow::PositionFloatedWnd}\label{cbfloatedbarwindowpositionfloatedwnd}
-
-\func{void}{PositionFloatedWnd}{\param{int }{scrX}, \param{int }{scrY}, \param{int }{width}, \param{int }{height}}
-
-Position the floating window. The given coordinates
-are those of the bar itself; the floated container window's
-position and size are ajusted accordingly.
-
-
-\membersection{cbFloatedBarWindow::SetBar}\label{cbfloatedbarwindowsetbar}
-
-\func{void}{SetBar}{\param{cbBarInfo* }{pBar}}
-
-Sets the bar information for this window.
-
-
-\membersection{cbFloatedBarWindow::SetLayout}\label{cbfloatedbarwindowsetlayout}
-
-\func{void}{SetLayout}{\param{wxFrameLayout* }{pLayout}}
-
-Sets the layout for this window.
-
diff --git a/contrib/docs/latex/fl/cbgcupdatesmgr.tex b/contrib/docs/latex/fl/cbgcupdatesmgr.tex
deleted file mode 100644
index 482d271a60..0000000000
--- a/contrib/docs/latex/fl/cbgcupdatesmgr.tex
+++ /dev/null
@@ -1,131 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% gcupdatesmgr.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbGCUpdatesMgr}}\label{cbgcupdatesmgr}
-
-
-This class implements optimized logic for refreshing
-the areas of frame layout that actually need to be updated.
-It is used as the default updates manager by wxFrameLayout.
-
-It is called 'Garbage Collecting' updates manager because
-its implementation tries to find out dependencies between bars,
-and to order them into a 'hierarchy'. This hierarchical sorting resembles
-the implementation of heap-garbage collectors, which resolve
-dependencies between references.
-
-Example: there are situations where the order in which the user
-moves windows does matter.
-
-\begin{verbatim}
-  case 1)
-     ------            ---
-     | A     |             |B|
-        ------     --->      | |
-            ---               --- ------
-            |B|                   | A  |
-            | |                   ------
-            ---
-                        (future)
-       (past)
-\end{verbatim}
-
-Past/future positions of A and B windows completely overlap, i.e.
-depend on each other, and there is no solution for
-moving the windows without refreshing both of them
--- we have a cyclic dependency here. The garbage collection algorithm will
-find this cyclic dependecy and will force refresh after movement.
-
-\begin{verbatim}
-  case 2)
-
-     ------
-     | A     |
-        ------     --->
-            ---
-            |B|                              ------
-            | |                              | A  |
-            ---                              ------
-                         ---
-                         |B|
-                         | |
-                         ---
-
-                        (future)
-       (past)
-\end{verbatim}
-
-In this case past/future positions do not overlap, so
-it is enough only to move windows without refreshing them.
-Garbage collection will 'notice' this.
-
-There is also a third case, when overlapping is partial.
-In this case the refreshing can also be avoided by
-moving windows in the order of 'most-dependant' towards the
-'least-dependent'. GC handles this automatically, by
-sorting windows by their dependency-level (or 'hierarchy').
-
-See garbagec.h for more details of this method; garbagec.h/cpp
-implement sorting of generic dependencies and does not deal
-with graphical objects directly.
-
-Summary: garbage collection improves performance when complex or large
-windows are moved around, by reducing the number of repaints. It also helps
-to avoid dirty non-client areas of moved windows
-in some special cases of 'overlapping anomalies'.
-
-\wxheading{Derived from}
-
-\helpref{cbSimpleUpdatesMgr}{cbsimpleupdatesmgr}
-
-\wxheading{Include files}
-
-<wx/fl/gcupdatesmgr.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbGCUpdatesMgr::cbGCUpdatesMgr}\label{cbgcupdatesmgrcbgcupdatesmgr}
-
-\func{}{cbGCUpdatesMgr}{\void}
-
-Default constructor.
-
-
-\func{}{cbGCUpdatesMgr}{\param{wxFrameLayout* }{pPanel}}
-
-Constructor, taking a frame layout.
-
-
-\membersection{cbGCUpdatesMgr::AddItem}\label{cbgcupdatesmgradditem}
-
-\func{void}{AddItem}{\param{wxList\& }{itemList}, \param{cbBarInfo* }{pBar}, \param{cbDockPane* }{pPane}, \param{wxRect\& }{curBounds}, \param{wxRect\& }{prevBounds}}
-
-Internal function for repositioning items.
-
-
-\membersection{cbGCUpdatesMgr::DoRepositionItems}\label{cbgcupdatesmgrdorepositionitems}
-
-\func{void}{DoRepositionItems}{\param{wxList\& }{items}}
-
-Internal function for repositioning items.
-
-
-\membersection{cbGCUpdatesMgr::OnStartChanges}\label{cbgcupdatesmgronstartchanges}
-
-\func{void}{OnStartChanges}{\void}
-
-Receives notifications from the frame layout.
-
-
-\membersection{cbGCUpdatesMgr::UpdateNow}\label{cbgcupdatesmgrupdatenow}
-
-\func{void}{UpdateNow}{\void}
-
-Refreshes the parts of the frame layout which need an update.
-
diff --git a/contrib/docs/latex/fl/cbhiddenbarinfo.tex b/contrib/docs/latex/fl/cbhiddenbarinfo.tex
deleted file mode 100644
index 7d47e8052a..0000000000
--- a/contrib/docs/latex/fl/cbhiddenbarinfo.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% rowdragpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbHiddenBarInfo}}\label{cbhiddenbarinfo}
-
-
-Internal helper class.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/rowdragpl.h>
-
-\wxheading{Data structures}
-
diff --git a/contrib/docs/latex/fl/cbhintanimationplugin.tex b/contrib/docs/latex/fl/cbhintanimationplugin.tex
deleted file mode 100644
index d2e63303f6..0000000000
--- a/contrib/docs/latex/fl/cbhintanimationplugin.tex
+++ /dev/null
@@ -1,93 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% hintanimpl.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{cbHintAnimationPlugin}}\label{cbhintanimationplugin}
-
-
-A plugin to draw animated hints when the user drags a pane.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/hintanimpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbHintAnimationPlugin::cbHintAnimationPlugin}\label{cbhintanimationplugincbhintanimationplugin}
-
-\func{}{cbHintAnimationPlugin}{\void}
-
-Default constructor.
-
-
-\func{}{cbHintAnimationPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor, taking a layout panel and pane mask.
-
-
-\membersection{cbHintAnimationPlugin::\destruct{cbHintAnimationPlugin}}\label{cbhintanimationplugindtor}
-
-\func{}{\destruct{cbHintAnimationPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbHintAnimationPlugin::DoDrawHintRect}\label{cbhintanimationplugindodrawhintrect}
-
-\func{void}{DoDrawHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal function for drawing a hint rectangle.
-
-
-\membersection{cbHintAnimationPlugin::DrawHintRect}\label{cbhintanimationplugindrawhintrect}
-
-\func{void}{DrawHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal function for drawing a hint rectangle.
-
-
-\membersection{cbHintAnimationPlugin::EraseHintRect}\label{cbhintanimationpluginerasehintrect}
-
-\func{void}{EraseHintRect}{\param{wxRect\& }{rect}, \param{bool }{isInClientRect}}
-
-Internal function for erasing a hint rectangle.
-
-
-\membersection{cbHintAnimationPlugin::FinishTracking}\label{cbhintanimationpluginfinishtracking}
-
-\func{void}{FinishTracking}{\void}
-
-Internal function for finishing tracking.
-
-
-\membersection{cbHintAnimationPlugin::OnDrawHintRect}\label{cbhintanimationpluginondrawhintrect}
-
-\func{void}{OnDrawHintRect}{\param{cbDrawHintRectEvent\& }{event}}
-
-Event handler respoding to hint draw events.
-
-
-\membersection{cbHintAnimationPlugin::RectToScr}\label{cbhintanimationpluginrecttoscr}
-
-\func{void}{RectToScr}{\param{wxRect\& }{frameRect}, \param{wxRect\& }{scrRect}}
-
-Internal function for translating coordinates.
-
-
-\membersection{cbHintAnimationPlugin::StartTracking}\label{cbhintanimationpluginstarttracking}
-
-\func{void}{StartTracking}{\void}
-
-speed is constant. Default: TRUE
-TBD:: get/set methods for above members
-Internal function for starting tracking.
-
diff --git a/contrib/docs/latex/fl/cbhintanimtimer.tex b/contrib/docs/latex/fl/cbhintanimtimer.tex
deleted file mode 100644
index ec375e8b22..0000000000
--- a/contrib/docs/latex/fl/cbhintanimtimer.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% hintanimpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbHintAnimTimer}}\label{cbhintanimtimer}
-
-
-A private helper class.
-
-\wxheading{Derived from}
-
-\helpref{wxTimer}{wxtimer}
-
-\wxheading{Include files}
-
-<wx/fl/hintanimpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbHintAnimTimer::cbHintAnimTimer}\label{cbhintanimtimercbhintanimtimer}
-
-\func{}{cbHintAnimTimer}{\void}
-
-
-\membersection{cbHintAnimTimer::Init}\label{cbhintanimtimerinit}
-
-\func{bool}{Init}{\param{cbHintAnimationPlugin* }{pAnimPl}, \param{bool }{reinit}}
-
-
-\membersection{cbHintAnimTimer::MorphPoint}\label{cbhintanimtimermorphpoint}
-
-\func{void}{MorphPoint}{\param{wxPoint\& }{origin}, \param{MorphInfoT\& }{info}, \param{wxPoint\& }{point}}
-
-
-\membersection{cbHintAnimTimer::Notify}\label{cbhintanimtimernotify}
-
-\func{void}{Notify}{\void}
-
diff --git a/contrib/docs/latex/fl/cbinsertbarevent.tex b/contrib/docs/latex/fl/cbinsertbarevent.tex
deleted file mode 100644
index c8018e40af..0000000000
--- a/contrib/docs/latex/fl/cbinsertbarevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbInsertBarEvent}}\label{cbinsertbarevent}
-
-
-Class for bar insertion events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbInsertBarEvent::cbInsertBarEvent}\label{cbinsertbareventcbinsertbarevent}
-
-\func{}{cbInsertBarEvent}{\param{cbBarInfo* }{pBar}, \param{cbRowInfo* }{pIntoRow}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, row information, and pane.
-
diff --git a/contrib/docs/latex/fl/cblayoutrowevent.tex b/contrib/docs/latex/fl/cblayoutrowevent.tex
deleted file mode 100644
index 6d076005ac..0000000000
--- a/contrib/docs/latex/fl/cblayoutrowevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbLayoutRowEvent}}\label{cblayoutrowevent}
-
-
-Class for single row layout events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbLayoutRowEvent::cbLayoutRowEvent}\label{cblayoutroweventcblayoutrowevent}
-
-\func{}{cbLayoutRowEvent}{\param{cbRowInfo* }{pRow}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking row information and pane.
-
diff --git a/contrib/docs/latex/fl/cblayoutrowsevent.tex b/contrib/docs/latex/fl/cblayoutrowsevent.tex
deleted file mode 100644
index 1932e1fd78..0000000000
--- a/contrib/docs/latex/fl/cblayoutrowsevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbLayoutRowsEvent}}\label{cblayoutrowsevent}
-
-
-Class for multiple rows layout events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbLayoutRowsEvent::cbLayoutRowsEvent}\label{cblayoutrowseventcblayoutrowsevent}
-
-\func{}{cbLayoutRowsEvent}{\param{cbDockPane* }{pPane}}
-
-Constructor, taking pane.
-
diff --git a/contrib/docs/latex/fl/cbleftdclickevent.tex b/contrib/docs/latex/fl/cbleftdclickevent.tex
deleted file mode 100644
index fbfa4d4793..0000000000
--- a/contrib/docs/latex/fl/cbleftdclickevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbLeftDClickEvent}}\label{cbleftdclickevent}
-
-
-Class for mouse left double click events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbLeftDClickEvent::cbLeftDClickEvent}\label{cbleftdclickeventcbleftdclickevent}
-
-\func{}{cbLeftDClickEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbleftdownevent.tex b/contrib/docs/latex/fl/cbleftdownevent.tex
deleted file mode 100644
index ba56025df1..0000000000
--- a/contrib/docs/latex/fl/cbleftdownevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbLeftDownEvent}}\label{cbleftdownevent}
-
-
-Class for mouse left down events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbLeftDownEvent::cbLeftDownEvent}\label{cbleftdowneventcbleftdownevent}
-
-\func{}{cbLeftDownEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbleftupevent.tex b/contrib/docs/latex/fl/cbleftupevent.tex
deleted file mode 100644
index c4ceeeb329..0000000000
--- a/contrib/docs/latex/fl/cbleftupevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbLeftUpEvent}}\label{cbleftupevent}
-
-
-Class for mouse left up events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbLeftUpEvent::cbLeftUpEvent}\label{cbleftupeventcbleftupevent}
-
-\func{}{cbLeftUpEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbminibutton.tex b/contrib/docs/latex/fl/cbminibutton.tex
deleted file mode 100644
index cf8d09f30c..0000000000
--- a/contrib/docs/latex/fl/cbminibutton.tex
+++ /dev/null
@@ -1,109 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{cbMiniButton}}\label{cbminibutton}
-
-
-cbMiniButton is the base class for a small button that can be placed in a wxToolWindow
-titlebar.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbMiniButton::cbMiniButton}\label{cbminibuttoncbminibutton}
-
-\func{}{cbMiniButton}{\void}
-
-Default constructor.
-
-
-\membersection{cbMiniButton::Draw}\label{cbminibuttondraw}
-
-\func{void}{Draw}{\param{wxDC\& }{dc}}
-
-Draws the button. Override this to implement
-the desired appearance.
-
-
-\membersection{cbMiniButton::Enable}\label{cbminibuttonenable}
-
-\func{void}{Enable}{\param{bool }{enable}}
-
-Enable or disable the button.
-
-
-\membersection{cbMiniButton::HitTest}\label{cbminibuttonhittest}
-
-\func{bool}{HitTest}{\param{const wxPoint\& }{pos}}
-
-Returns TRUE if the given position was over the button.
-
-
-\membersection{cbMiniButton::IsPressed}\label{cbminibuttonispressed}
-
-\func{bool}{IsPressed}{\void}
-
-Returns TRUE if this button is pressed.
-
-
-\membersection{cbMiniButton::OnLeftDown}\label{cbminibuttononleftdown}
-
-\func{void}{OnLeftDown}{\param{const wxPoint\& }{pos}}
-
-Responds to a left down event.
-
-
-\membersection{cbMiniButton::OnLeftUp}\label{cbminibuttononleftup}
-
-\func{void}{OnLeftUp}{\param{const wxPoint\& }{pos}}
-
-Responds to a left up event.
-
-
-\membersection{cbMiniButton::OnMotion}\label{cbminibuttononmotion}
-
-\func{void}{OnMotion}{\param{const wxPoint\& }{pos}}
-
-Responds to a mouse move event.
-
-
-\membersection{cbMiniButton::Refresh}\label{cbminibuttonrefresh}
-
-\func{void}{Refresh}{\void}
-
-Refreshes the button.
-
-
-\membersection{cbMiniButton::Reset}\label{cbminibuttonreset}
-
-\func{void}{Reset}{\void}
-
-Reset the button.
-
-
-\membersection{cbMiniButton::SetPos}\label{cbminibuttonsetpos}
-
-\func{void}{SetPos}{\param{const wxPoint\& }{pos}}
-
-Set the position of the button.
-
-
-\membersection{cbMiniButton::WasClicked}\label{cbminibuttonwasclicked}
-
-\func{bool}{WasClicked}{\void}
-
-Returns TRUE if the button was clicked.
-
diff --git a/contrib/docs/latex/fl/cbmotionevent.tex b/contrib/docs/latex/fl/cbmotionevent.tex
deleted file mode 100644
index 8c2dcf09ba..0000000000
--- a/contrib/docs/latex/fl/cbmotionevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbMotionEvent}}\label{cbmotionevent}
-
-
-Class for mouse motion events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbMotionEvent::cbMotionEvent}\label{cbmotioneventcbmotionevent}
-
-\func{}{cbMotionEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbpanedrawplugin.tex b/contrib/docs/latex/fl/cbpanedrawplugin.tex
deleted file mode 100644
index b824a4b344..0000000000
--- a/contrib/docs/latex/fl/cbpanedrawplugin.tex
+++ /dev/null
@@ -1,243 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% panedrawpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbPaneDrawPlugin}}\label{cbpanedrawplugin}
-
-
-Simple but all-in-one plugin implementation. Resembles the look and feel of
-to MFC control-bars. The class handles painting of the pane and the items in it;
-it generates bar/layout customization events, when the user right-clicks the bar/pane.
-Hooking an instance of this and row-layout plugins for each pane
-would be enough for the frame layout to function properly
-(they are plugged in automatically by the wxFrameLayout class).
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/panedrawpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbPaneDrawPlugin::cbPaneDrawPlugin}\label{cbpanedrawplugincbpanedrawplugin}
-
-\func{}{cbPaneDrawPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor taking frame layout pane and a pane mask.
-
-
-\func{}{cbPaneDrawPlugin}{\void}
-
-Default constructor.
-
-
-\membersection{cbPaneDrawPlugin::\destruct{cbPaneDrawPlugin}}\label{cbpanedrawplugindtor}
-
-\func{}{\destruct{cbPaneDrawPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbPaneDrawPlugin::Clone}\label{cbpanedrawpluginclone}
-
-\func{cbPluginBase*}{Clone}{\void}
-
-Clone function, returning a new instance of this class.
-
-
-\membersection{cbPaneDrawPlugin::DrawBarInnerShadeRect}\label{cbpanedrawplugindrawbarinnershaderect}
-
-\func{void}{DrawBarInnerShadeRect}{\param{cbBarInfo* }{pBar}, \param{wxDC\& }{dc}}
-
-Internal helper: draws the inner bar shading.
-
-
-\membersection{cbPaneDrawPlugin::DrawDraggedHandle}\label{cbpanedrawplugindrawdraggedhandle}
-
-\func{void}{DrawDraggedHandle}{\param{const wxPoint\& }{pos}, \param{cbDockPane\& }{pane}}
-
-Internal helper: draws the dragged handle.
-
-
-\membersection{cbPaneDrawPlugin::DrawLowerRowHandle}\label{cbpanedrawplugindrawlowerrowhandle}
-
-\func{void}{DrawLowerRowHandle}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Internal helper: draws the lower row handle.
-
-
-\membersection{cbPaneDrawPlugin::DrawLowerRowShades}\label{cbpanedrawplugindrawlowerrowshades}
-
-\func{void}{DrawLowerRowShades}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{int }{level}}
-
-Internal helper: draws the lower row shading.
-
-
-\membersection{cbPaneDrawPlugin::DrawPaneShade}\label{cbpanedrawplugindrawpaneshade}
-
-\func{void}{DrawPaneShade}{\param{wxDC\& }{dc}, \param{int }{alignment}}
-
-Internal helper: draws the pane shading.
-
-
-\membersection{cbPaneDrawPlugin::DrawPaneShadeForRow}\label{cbpanedrawplugindrawpaneshadeforrow}
-
-\func{void}{DrawPaneShadeForRow}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Internal helper: draws the pane shading for a row.
-
-
-\membersection{cbPaneDrawPlugin::DrawShade}\label{cbpanedrawplugindrawshade}
-
-\func{void}{DrawShade}{\param{int }{level}, \param{wxRect\& }{rect}, \param{int }{alignment}, \param{wxDC\& }{dc}}
-
-Internal helper: draws shading.
-
-
-\membersection{cbPaneDrawPlugin::DrawShade1}\label{cbpanedrawplugindrawshade1}
-
-\func{void}{DrawShade1}{\param{int }{level}, \param{wxRect\& }{rect}, \param{int }{alignment}, \param{wxDC\& }{dc}}
-
-Internal helper: draws shading.
-
-
-\membersection{cbPaneDrawPlugin::DrawUpperRowHandle}\label{cbpanedrawplugindrawupperrowhandle}
-
-\func{void}{DrawUpperRowHandle}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}}
-
-Internal helper: draws the upper row handle.
-
-
-\membersection{cbPaneDrawPlugin::DrawUpperRowShades}\label{cbpanedrawplugindrawupperrowshades}
-
-\func{void}{DrawUpperRowShades}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{int }{level}}
-
-Internal helper: draws the upper row shading.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawBarDecorations}\label{cbpanedrawpluginondrawbardecorations}
-
-\func{void}{OnDrawBarDecorations}{\param{cbDrawBarDecorEvent\& }{event}}
-
-Handler for draw bar decorations events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawBarHandles}\label{cbpanedrawpluginondrawbarhandles}
-
-\func{void}{OnDrawBarHandles}{\param{cbDrawBarHandlesEvent\& }{event}}
-
-Handler for draw bar handles events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawPaneBackground}\label{cbpanedrawpluginondrawpanebackground}
-
-\func{void}{OnDrawPaneBackground}{\param{cbDrawPaneBkGroundEvent\& }{event}}
-
-Handler for draw pane background events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawPaneDecorations}\label{cbpanedrawpluginondrawpanedecorations}
-
-\func{void}{OnDrawPaneDecorations}{\param{cbDrawPaneDecorEvent\& }{event}}
-
-Handler for draw pane decoration events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawRowBackground}\label{cbpanedrawpluginondrawrowbackground}
-
-\func{void}{OnDrawRowBackground}{\param{cbDrawRowBkGroundEvent\& }{event}}
-
-Handler for draw row background events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawRowDecorations}\label{cbpanedrawpluginondrawrowdecorations}
-
-\func{void}{OnDrawRowDecorations}{\param{cbDrawRowDecorEvent\& }{event}}
-
-Handler for draw row decoration events.
-
-
-\membersection{cbPaneDrawPlugin::OnDrawRowHandles}\label{cbpanedrawpluginondrawrowhandles}
-
-\func{void}{OnDrawRowHandles}{\param{cbDrawRowHandlesEvent\& }{event}}
-
-Handler for draw row handles events.
-
-
-\membersection{cbPaneDrawPlugin::OnFinishDrawInArea}\label{cbpanedrawpluginonfinishdrawinarea}
-
-\func{void}{OnFinishDrawInArea}{\param{cbFinishDrawInAreaEvent\& }{event}}
-
-Handler for finish draw in area events.
-
-
-\membersection{cbPaneDrawPlugin::OnLButtonDown}\label{cbpanedrawpluginonlbuttondown}
-
-\func{void}{OnLButtonDown}{\param{cbLeftDownEvent\& }{event}}
-
-Handler for left mouse button down events.
-
-
-\membersection{cbPaneDrawPlugin::OnLButtonUp}\label{cbpanedrawpluginonlbuttonup}
-
-\func{void}{OnLButtonUp}{\param{cbLeftUpEvent\& }{event}}
-
-Handler for left mouse button up events.
-
-
-\membersection{cbPaneDrawPlugin::OnLDblClick}\label{cbpanedrawpluginonldblclick}
-
-\func{void}{OnLDblClick}{\param{cbLeftDClickEvent\& }{event}}
-
-Handler for left double-click mouse button down events.
-
-
-\membersection{cbPaneDrawPlugin::OnMouseMove}\label{cbpanedrawpluginonmousemove}
-
-\func{void}{OnMouseMove}{\param{cbMotionEvent\& }{event}}
-
-Handler for mouse move events.
-
-
-\membersection{cbPaneDrawPlugin::OnRButtonUp}\label{cbpanedrawpluginonrbuttonup}
-
-\func{void}{OnRButtonUp}{\param{cbRightUpEvent\& }{event}}
-
-Handler for right mouse button up events.
-
-
-\membersection{cbPaneDrawPlugin::OnSizeBarWindow}\label{cbpanedrawpluginonsizebarwindow}
-
-\func{void}{OnSizeBarWindow}{\param{cbSizeBarWndEvent\& }{event}}
-
-Handler for bar size events.
-
-
-\membersection{cbPaneDrawPlugin::OnStartDrawInArea}\label{cbpanedrawpluginonstartdrawinarea}
-
-\func{void}{OnStartDrawInArea}{\param{cbStartDrawInAreaEvent\& }{event}}
-
-Handler for start draw in area events.
-
-
-\membersection{cbPaneDrawPlugin::SetDarkPixel}\label{cbpanedrawpluginsetdarkpixel}
-
-\func{void}{SetDarkPixel}{\param{int }{x}, \param{int }{y}, \param{wxDC\& }{dc}}
-
-Internal helper: sets a dark pixel at the given location.
-
-
-\membersection{cbPaneDrawPlugin::SetLightPixel}\label{cbpanedrawpluginsetlightpixel}
-
-\func{void}{SetLightPixel}{\param{int }{x}, \param{int }{y}, \param{wxDC\& }{dc}}
-
-Internal helper: sets a light pixel at the given location.
-
diff --git a/contrib/docs/latex/fl/cbpluginbase.tex b/contrib/docs/latex/fl/cbpluginbase.tex
deleted file mode 100644
index 0147d1ab6e..0000000000
--- a/contrib/docs/latex/fl/cbpluginbase.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbPluginBase}}\label{cbpluginbase}
-
-
-Abstract base class for all control-bar related plugins.
-Note: pointer positions of mouse events sent to plugins
-are always in the pane's coordinates (the pane to which
-this plugin is hooked).
-
-\wxheading{Derived from}
-
-\helpref{wxEvtHandler}{wxevthandler}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbPluginBase::cbPluginBase}\label{cbpluginbasecbpluginbase}
-
-\func{}{cbPluginBase}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor taking layout panel and a mask.
-
-
-\func{}{cbPluginBase}{\void}
-
-Default constructor.
-
-
-\membersection{cbPluginBase::\destruct{cbPluginBase}}\label{cbpluginbasedtor}
-
-\func{}{\destruct{cbPluginBase}}{\void}
-
-Destructor. Destroys the whole plugin chain of connected plugins.
-
-
-\membersection{cbPluginBase::GetPaneMask}\label{cbpluginbasegetpanemask}
-
-\func{int}{GetPaneMask}{\void}
-
-Returns the pane mask.
-
-
-\membersection{cbPluginBase::IsReady}\label{cbpluginbaseisready}
-
-\func{bool}{IsReady}{\void}
-
-Returns TRUE if the plugin is ready to receive events.
-
-
-\membersection{cbPluginBase::OnInitPlugin}\label{cbpluginbaseoninitplugin}
-
-\func{void}{OnInitPlugin}{\void}
-
-Override this method to do plugin-specific initialization.
-At this point plugin is already attached to the frame layout,
-and pane masks are set.
-
-
-\membersection{cbPluginBase::ProcessEvent}\label{cbpluginbaseprocessevent}
-
-\func{bool}{ProcessEvent}{\param{wxEvent\& }{event}}
-
-Overridden to determine whether the target pane specified in the
-event matches the pane mask of this plugin (specific plugins
-do not override this method).
-
diff --git a/contrib/docs/latex/fl/cbpluginevent.tex b/contrib/docs/latex/fl/cbpluginevent.tex
deleted file mode 100644
index 4de9953781..0000000000
--- a/contrib/docs/latex/fl/cbpluginevent.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbPluginEvent}}\label{cbpluginevent}
-
-
-Base class for all control-bar plugin events.
-This is not a dynamically-creatable class.
-
-\wxheading{Derived from}
-
-\helpref{wxEvent}{wxevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbPluginEvent::cbPluginEvent}\label{cbplugineventcbpluginevent}
-
-\func{}{cbPluginEvent}{\param{wxEventType }{eventType}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking event type and pane.
-
-
-\membersection{cbPluginEvent::Clone}\label{cbplugineventclone}
-
-\constfunc{wxEvent*}{Clone}{\void}
-
-Not used, but required.
-
diff --git a/contrib/docs/latex/fl/cbremovebarevent.tex b/contrib/docs/latex/fl/cbremovebarevent.tex
deleted file mode 100644
index dfd7fd4b39..0000000000
--- a/contrib/docs/latex/fl/cbremovebarevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbRemoveBarEvent}}\label{cbremovebarevent}
-
-
-Class for bar removal events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRemoveBarEvent::cbRemoveBarEvent}\label{cbremovebareventcbremovebarevent}
-
-\func{}{cbRemoveBarEvent}{\param{cbBarInfo* }{pBar}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information and pane.
-
diff --git a/contrib/docs/latex/fl/cbresizebarevent.tex b/contrib/docs/latex/fl/cbresizebarevent.tex
deleted file mode 100644
index 37d44fef05..0000000000
--- a/contrib/docs/latex/fl/cbresizebarevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbResizeBarEvent}}\label{cbresizebarevent}
-
-
-Class for bar resize events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbResizeBarEvent::cbResizeBarEvent}\label{cbresizebareventcbresizebarevent}
-
-\func{}{cbResizeBarEvent}{\param{cbBarInfo* }{pBar}, \param{cbRowInfo* }{pRow}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, row information, and pane.
-
diff --git a/contrib/docs/latex/fl/cbresizerowevent.tex b/contrib/docs/latex/fl/cbresizerowevent.tex
deleted file mode 100644
index 7f66d96f15..0000000000
--- a/contrib/docs/latex/fl/cbresizerowevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbResizeRowEvent}}\label{cbresizerowevent}
-
-
-Class for row resize events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbResizeRowEvent::cbResizeRowEvent}\label{cbresizeroweventcbresizerowevent}
-
-\func{}{cbResizeRowEvent}{\param{cbRowInfo* }{pRow}, \param{int }{handleOfs}, \param{bool }{forUpperHandle}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking row information, two parameters of currently unknown use, and pane.
-
diff --git a/contrib/docs/latex/fl/cbrightdownevent.tex b/contrib/docs/latex/fl/cbrightdownevent.tex
deleted file mode 100644
index 2c30911591..0000000000
--- a/contrib/docs/latex/fl/cbrightdownevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbRightDownEvent}}\label{cbrightdownevent}
-
-
-Class for mouse right down events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRightDownEvent::cbRightDownEvent}\label{cbrightdowneventcbrightdownevent}
-
-\func{}{cbRightDownEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbrightupevent.tex b/contrib/docs/latex/fl/cbrightupevent.tex
deleted file mode 100644
index e6be7808e4..0000000000
--- a/contrib/docs/latex/fl/cbrightupevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:15
-%
-
-
-\section{\class{cbRightUpEvent}}\label{cbrightupevent}
-
-
-Class for mouse right up events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRightUpEvent::cbRightUpEvent}\label{cbrightupeventcbrightupevent}
-
-\func{}{cbRightUpEvent}{\param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking mouse position and pane.
-
diff --git a/contrib/docs/latex/fl/cbrowdragplugin.tex b/contrib/docs/latex/fl/cbrowdragplugin.tex
deleted file mode 100644
index 1e691615e1..0000000000
--- a/contrib/docs/latex/fl/cbrowdragplugin.tex
+++ /dev/null
@@ -1,339 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% rowdragpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbRowDragPlugin}}\label{cbrowdragplugin}
-
-
-This plugin adds row-dragging functionality to the pane.
-It handles mouse movement and pane background-erasing plugin events.
-The behaviour and appearance resembles drag and drop positioning
-of the toolbar rows in Netscape Communicator 4.xx.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/rowdragpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRowDragPlugin::cbRowDragPlugin}\label{cbrowdragplugincbrowdragplugin}
-
-\func{}{cbRowDragPlugin}{\param{wxFrameLayout* }{pLayout}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor, taking paren layout frame and pane mask.
-
-
-\func{}{cbRowDragPlugin}{\void}
-
-Default constructor.
-
-
-\membersection{cbRowDragPlugin::\destruct{cbRowDragPlugin}}\label{cbrowdragplugindtor}
-
-\func{}{\destruct{cbRowDragPlugin}}{\void}
-
-Destructor.
-
-
-\membersection{cbRowDragPlugin::CaptureDCArea}\label{cbrowdragplugincapturedcarea}
-
-\func{wxBitmap*}{CaptureDCArea}{\param{wxDC\& }{dc}, \param{wxRect\& }{area}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::CheckPrevItemInFocus}\label{cbrowdragplugincheckpreviteminfocus}
-
-\func{void}{CheckPrevItemInFocus}{\param{cbRowInfo* }{pRow}, \param{int }{iconIdx}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::Clone}\label{cbrowdragpluginclone}
-
-\func{cbPluginBase*}{Clone}{\void}
-
-Clone function, returning a new instance of this class.
-
-
-\membersection{cbRowDragPlugin::CollapseRow}\label{cbrowdragplugincollapserow}
-
-\func{void}{CollapseRow}{\param{cbRowInfo* }{pRow}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::Draw3DPattern}\label{cbrowdragplugindraw3dpattern}
-
-\func{void}{Draw3DPattern}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::Draw3DRect}\label{cbrowdragplugindraw3drect}
-
-\func{void}{Draw3DRect}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}, \param{wxBrush\& }{bkBrush}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawCollapsedRowIcon}\label{cbrowdragplugindrawcollapsedrowicon}
-
-\func{void}{DrawCollapsedRowIcon}{\param{int }{index}, \param{wxDC\& }{dc}, \param{bool }{isHighlighted}}
-
-Draws collapsed row icon (appearance-dependent).
-
-
-\membersection{cbRowDragPlugin::DrawCollapsedRowsBorder}\label{cbrowdragplugindrawcollapsedrowsborder}
-
-\func{void}{DrawCollapsedRowsBorder}{\param{wxDC\& }{dc}}
-
-Draws collapsed rows border (appearance-dependent).
-
-
-\membersection{cbRowDragPlugin::DrawEmptyRow}\label{cbrowdragplugindrawemptyrow}
-
-\func{void}{DrawEmptyRow}{\param{wxDC\& }{dc}, \param{wxRect\& }{rowBounds}}
-
-Draws empty row (appearance-dependent).
-
-
-\membersection{cbRowDragPlugin::DrawOrtoRomb}\label{cbrowdragplugindrawortoromb}
-
-\func{void}{DrawOrtoRomb}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}, \param{wxBrush\& }{bkBrush}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawRectShade}\label{cbrowdragplugindrawrectshade}
-
-\func{void}{DrawRectShade}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}, \param{int }{level}, \param{wxPen\& }{upperPen}, \param{wxPen\& }{lowerPen}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawRomb}\label{cbrowdragplugindrawromb}
-
-\func{void}{DrawRomb}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}, \param{wxBrush\& }{bkBrush}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawRombShades}\label{cbrowdragplugindrawrombshades}
-
-\func{void}{DrawRombShades}{\param{wxPoint\& }{p1}, \param{wxPoint\& }{p2}, \param{wxPoint\& }{p3}, \param{wxPoint\& }{p4}, \param{wxDC\& }{dc}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawRowDragHint}\label{cbrowdragplugindrawrowdraghint}
-
-\func{void}{DrawRowDragHint}{\param{cbRowInfo* }{pRow}, \param{wxDC\& }{dc}, \param{bool }{isHighlighted}}
-
-Draws row drag hint (appearance-dependent).
-
-
-\membersection{cbRowDragPlugin::DrawRowsDragHintsBorder}\label{cbrowdragplugindrawrowsdraghintsborder}
-
-\func{void}{DrawRowsDragHintsBorder}{\param{wxDC\& }{dc}}
-
-Draws rows drag hints border (appearance-dependent).
-
-
-\membersection{cbRowDragPlugin::DrawTrianDown}\label{cbrowdragplugindrawtriandown}
-
-\func{void}{DrawTrianDown}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawTrianRight}\label{cbrowdragplugindrawtrianright}
-
-\func{void}{DrawTrianRight}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::DrawTrianUp}\label{cbrowdragplugindrawtrianup}
-
-\func{void}{DrawTrianUp}{\param{wxRect\& }{inRect}, \param{wxDC\& }{dc}}
-
-Implements 'hard-coded metafile' for Netscape Navigator look.
-
-
-\membersection{cbRowDragPlugin::ExpandRow}\label{cbrowdragpluginexpandrow}
-
-\func{void}{ExpandRow}{\param{int }{collapsedIconIdx}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::FinishOnScreenDraw}\label{cbrowdragpluginfinishonscreendraw}
-
-\func{void}{FinishOnScreenDraw}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::GetCollapsedIconsPos}\label{cbrowdragplugingetcollapsediconspos}
-
-\func{int}{GetCollapsedIconsPos}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::GetCollapsedInconRect}\label{cbrowdragplugingetcollapsedinconrect}
-
-\func{void}{GetCollapsedInconRect}{\param{int }{iconIdx}, \param{wxRect\& }{rect}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::GetCollapsedRowIconHeight}\label{cbrowdragplugingetcollapsedrowiconheight}
-
-\func{int}{GetCollapsedRowIconHeight}{\void}
-
-Gets the collapsed row icon height.
-
-
-\membersection{cbRowDragPlugin::GetFirstRow}\label{cbrowdragplugingetfirstrow}
-
-\func{cbRowInfo*}{GetFirstRow}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::GetHRowsCountForPane}\label{cbrowdragplugingethrowscountforpane}
-
-\func{int}{GetHRowsCountForPane}{\param{cbDockPane* }{pPane}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::GetRowDragHintWidth}\label{cbrowdragplugingetrowdraghintwidth}
-
-\func{int}{GetRowDragHintWidth}{\void}
-
-Gets the row drag hint width.
-
-
-\membersection{cbRowDragPlugin::GetRowHintRect}\label{cbrowdragplugingetrowhintrect}
-
-\func{void}{GetRowHintRect}{\param{cbRowInfo* }{pRow}, \param{wxRect\& }{rect}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::HitTestCollapsedRowIcon}\label{cbrowdragpluginhittestcollapsedrowicon}
-
-\func{bool}{HitTestCollapsedRowIcon}{\param{int }{iconIdx}, \param{const wxPoint\& }{pos}}
-
-Test for the collapsed row icon position.
-
-
-\membersection{cbRowDragPlugin::HitTestRowDragHint}\label{cbrowdragpluginhittestrowdraghint}
-
-\func{bool}{HitTestRowDragHint}{\param{cbRowInfo* }{pRow}, \param{const wxPoint\& }{pos}}
-
-Test for the row drag hint position.
-
-
-\membersection{cbRowDragPlugin::InsertDraggedRowBefore}\label{cbrowdragplugininsertdraggedrowbefore}
-
-\func{void}{InsertDraggedRowBefore}{\param{cbRowInfo* }{pBeforeRow}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::ItemIsInFocus}\label{cbrowdragpluginitemisinfocus}
-
-\func{bool}{ItemIsInFocus}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::OnDrawPaneBackground}\label{cbrowdragpluginondrawpanebackground}
-
-\func{void}{OnDrawPaneBackground}{\param{cbDrawPaneDecorEvent\& }{event}}
-
-Handles pane drawing plugin events (appearance-independent logic).
-
-
-\membersection{cbRowDragPlugin::OnInitPlugin}\label{cbrowdragpluginoninitplugin}
-
-\func{void}{OnInitPlugin}{\void}
-
-Called to initialize this plugin.
-
-
-\membersection{cbRowDragPlugin::OnLButtonDown}\label{cbrowdragpluginonlbuttondown}
-
-\func{void}{OnLButtonDown}{\param{cbLeftDownEvent\& }{event}}
-
-Handles left button down plugin events (appearance-independent logic).
-
-
-\membersection{cbRowDragPlugin::OnLButtonUp}\label{cbrowdragpluginonlbuttonup}
-
-\func{void}{OnLButtonUp}{\param{cbLeftUpEvent\& }{event}}
-
-Handles left button up plugin events (appearance-independent logic).
-
-
-\membersection{cbRowDragPlugin::OnMouseMove}\label{cbrowdragpluginonmousemove}
-
-\func{void}{OnMouseMove}{\param{cbMotionEvent\& }{event}}
-
-Handles mouse move plugin events (appearance-independent logic).
-
-
-\membersection{cbRowDragPlugin::PrepareForRowDrag}\label{cbrowdragpluginprepareforrowdrag}
-
-\func{void}{PrepareForRowDrag}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::SetMouseCapture}\label{cbrowdragpluginsetmousecapture}
-
-\func{void}{SetMouseCapture}{\param{bool }{captureOn}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::SetPaneMargins}\label{cbrowdragpluginsetpanemargins}
-
-\func{void}{SetPaneMargins}{\void}
-
-Sets the pane margins.
-
-
-\membersection{cbRowDragPlugin::ShowDraggedRow}\label{cbrowdragpluginshowdraggedrow}
-
-\func{void}{ShowDraggedRow}{\param{int }{offset}}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::ShowPaneImage}\label{cbrowdragpluginshowpaneimage}
-
-\func{void}{ShowPaneImage}{\void}
-
-Helper for drag and drop.
-
-
-\membersection{cbRowDragPlugin::UnhighlightItemInFocus}\label{cbrowdragpluginunhighlightiteminfocus}
-
-\func{void}{UnhighlightItemInFocus}{\void}
-
-Helper for drag and drop.
-
diff --git a/contrib/docs/latex/fl/cbrowinfo.tex b/contrib/docs/latex/fl/cbrowinfo.tex
deleted file mode 100644
index ef91464536..0000000000
--- a/contrib/docs/latex/fl/cbrowinfo.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{cbRowInfo}}\label{cbrowinfo}
-
-
-Helper class used internally by the wxFrameLayout class.
-Holds and manages information about bar rows.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRowInfo::cbRowInfo}\label{cbrowinfocbrowinfo}
-
-\func{}{cbRowInfo}{\void}
-
-Constructor.
-
-
-\membersection{cbRowInfo::\destruct{cbRowInfo}}\label{cbrowinfodtor}
-
-\func{}{\destruct{cbRowInfo}}{\void}
-
-Destructor.
-
-
-\membersection{cbRowInfo::GetFirstBar}\label{cbrowinfogetfirstbar}
-
-\func{cbBarInfo*}{GetFirstBar}{\void}
-
-Returns the first bar.
-
diff --git a/contrib/docs/latex/fl/cbrowlayoutplugin.tex b/contrib/docs/latex/fl/cbrowlayoutplugin.tex
deleted file mode 100644
index c6e936a6b2..0000000000
--- a/contrib/docs/latex/fl/cbrowlayoutplugin.tex
+++ /dev/null
@@ -1,204 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% rowlayoutpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{cbRowLayoutPlugin}}\label{cbrowlayoutplugin}
-
-
-Simple implementation of a plugin which handles row layout
-requests sent from a frame layout.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/rowlayoutpl.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbRowLayoutPlugin::cbRowLayoutPlugin}\label{cbrowlayoutplugincbrowlayoutplugin}
-
-\func{}{cbRowLayoutPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor taking frame layout pane and pane mask.
-
-
-\func{}{cbRowLayoutPlugin}{\void}
-
-Default constructor.
-
-
-\membersection{cbRowLayoutPlugin::AdjustLengthOfInserted}\label{cbrowlayoutpluginadjustlengthofinserted}
-
-\func{void}{AdjustLengthOfInserted}{\param{cbRowInfo* }{pRow}, \param{cbBarInfo* }{pTheBar}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::ApplyLengthRatios}\label{cbrowlayoutpluginapplylengthratios}
-
-\func{void}{ApplyLengthRatios}{\param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::CalcRowHeight}\label{cbrowlayoutplugincalcrowheight}
-
-\func{int}{CalcRowHeight}{\param{cbRowInfo\& }{row}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::CheckIfAtTheBoundary}\label{cbrowlayoutplugincheckifattheboundary}
-
-\func{void}{CheckIfAtTheBoundary}{\param{cbBarInfo* }{pTheBar}, \param{cbRowInfo\& }{rowInfo}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::DetectBarHandles}\label{cbrowlayoutplugindetectbarhandles}
-
-\func{void}{DetectBarHandles}{\param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::DoInsertBar}\label{cbrowlayoutplugindoinsertbar}
-
-\func{void}{DoInsertBar}{\param{cbBarInfo* }{pTheBar}, \param{cbRowInfo\& }{row}}
-
-Insert the bar before the given row.
-
-
-\membersection{cbRowLayoutPlugin::ExpandNotFixedBars}\label{cbrowlayoutpluginexpandnotfixedbars}
-
-\func{void}{ExpandNotFixedBars}{\param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::FitBarsToRange}\label{cbrowlayoutpluginfitbarstorange}
-
-\func{void}{FitBarsToRange}{\param{int }{from}, \param{int }{till}, \param{cbBarInfo* }{pTheBar}, \param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::GetRowFreeSpace}\label{cbrowlayoutplugingetrowfreespace}
-
-\func{int}{GetRowFreeSpace}{\param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::InsertBefore}\label{cbrowlayoutplugininsertbefore}
-
-\func{void}{InsertBefore}{\param{cbBarInfo* }{pBeforeBar}, \param{cbBarInfo* }{pTheBar}, \param{cbRowInfo\& }{row}}
-
-Insert the bar before the given row.
-
-
-\membersection{cbRowLayoutPlugin::LayoutItemsVertically}\label{cbrowlayoutpluginlayoutitemsvertically}
-
-\func{void}{LayoutItemsVertically}{\param{cbRowInfo\& }{row}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::MinimzeNotFixedBars}\label{cbrowlayoutpluginminimzenotfixedbars}
-
-\func{void}{MinimzeNotFixedBars}{\param{cbRowInfo* }{pRow}, \param{cbBarInfo* }{pBarToPreserve}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::OnInsertBar}\label{cbrowlayoutpluginoninsertbar}
-
-\func{void}{OnInsertBar}{\param{cbInsertBarEvent\& }{event}}
-
-Responds to bar insertion event.
-
-
-\membersection{cbRowLayoutPlugin::OnLayoutRow}\label{cbrowlayoutpluginonlayoutrow}
-
-\func{void}{OnLayoutRow}{\param{cbLayoutRowEvent\& }{event}}
-
-Responds to row layout event.
-
-
-\membersection{cbRowLayoutPlugin::OnLayoutRows}\label{cbrowlayoutpluginonlayoutrows}
-
-\func{void}{OnLayoutRows}{\param{cbLayoutRowsEvent\& }{event}}
-
-Responds to rows layout event.
-
-
-\membersection{cbRowLayoutPlugin::OnRemoveBar}\label{cbrowlayoutpluginonremovebar}
-
-\func{void}{OnRemoveBar}{\param{cbRemoveBarEvent\& }{event}}
-
-Responds to bar removal event.
-
-
-\membersection{cbRowLayoutPlugin::OnResizeRow}\label{cbrowlayoutpluginonresizerow}
-
-\func{void}{OnResizeRow}{\param{cbResizeRowEvent\& }{event}}
-
-Responds to row resize event.
-
-
-\membersection{cbRowLayoutPlugin::RecalcLengthRatios}\label{cbrowlayoutpluginrecalclengthratios}
-
-\func{void}{RecalcLengthRatios}{\param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::RelayoutNotFixedBarsAround}\label{cbrowlayoutpluginrelayoutnotfixedbarsaround}
-
-\func{void}{RelayoutNotFixedBarsAround}{\param{cbBarInfo* }{pTheBar}, \param{cbRowInfo* }{pRow}}
-
-Internal helper relating to not-fixed-bars layout.
-
-
-\membersection{cbRowLayoutPlugin::ShiftLeftTrashold}\label{cbrowlayoutpluginshiftlefttrashold}
-
-\func{void}{ShiftLeftTrashold}{\param{cbBarInfo* }{pTheBar}, \param{cbRowInfo\& }{row}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::ShiftRightTrashold}\label{cbrowlayoutpluginshiftrighttrashold}
-
-\func{void}{ShiftRightTrashold}{\param{cbBarInfo* }{pTheBar}, \param{cbRowInfo\& }{row}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::SlideLeftSideBars}\label{cbrowlayoutpluginslideleftsidebars}
-
-\func{void}{SlideLeftSideBars}{\param{cbBarInfo* }{pTheBar}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::SlideRightSideBars}\label{cbrowlayoutpluginsliderightsidebars}
-
-\func{void}{SlideRightSideBars}{\param{cbBarInfo* }{pTheBar}}
-
-Row layout helper simulating bar 'friction'.
-
-
-\membersection{cbRowLayoutPlugin::StickRightSideBars}\label{cbrowlayoutpluginstickrightsidebars}
-
-\func{void}{StickRightSideBars}{\param{cbBarInfo* }{pToBar}}
-
-Row layout helper simulating bar 'friction'.
-
diff --git a/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex b/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex
deleted file mode 100644
index 5240f9d912..0000000000
--- a/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex
+++ /dev/null
@@ -1,58 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% cbcustom.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{cbSimpleCustomizationPlugin}}\label{cbsimplecustomizationplugin}
-
-
-This class enables customization of a bar, popping up a
-menu and handling basic customization such as floating
-and horizontal/vertical alignment of the bar.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginBase}{cbpluginbase}
-
-\wxheading{Include files}
-
-<wx/fl/cbcustom.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbSimpleCustomizationPlugin::cbSimpleCustomizationPlugin}\label{cbsimplecustomizationplugincbsimplecustomizationplugin}
-
-\func{}{cbSimpleCustomizationPlugin}{\param{wxFrameLayout* }{pPanel}, \param{int }{paneMask = wxALL\_PANES}}
-
-Constructor, taking parent pane and a pane mask flag.
-
-
-\func{}{cbSimpleCustomizationPlugin}{\void}
-
-Default constructor.
-
-
-\membersection{cbSimpleCustomizationPlugin::OnCustomizeBar}\label{cbsimplecustomizationpluginoncustomizebar}
-
-\func{void}{OnCustomizeBar}{\param{cbCustomizeBarEvent\& }{event}}
-
-Plugin event handler for cbCustomizeBarEvent.
-
-
-\membersection{cbSimpleCustomizationPlugin::OnCustomizeLayout}\label{cbsimplecustomizationpluginoncustomizelayout}
-
-\func{void}{OnCustomizeLayout}{\param{cbCustomizeLayoutEvent\& }{event}}
-
-Plugin event handler for cbCustomizeLayoutEvent.
-
-
-\membersection{cbSimpleCustomizationPlugin::OnMenuItemSelected}\label{cbsimplecustomizationpluginonmenuitemselected}
-
-\func{void}{OnMenuItemSelected}{\param{wxCommandEvent\& }{event}}
-
-Menu event handler.
-
diff --git a/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex b/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex
deleted file mode 100644
index 8e518ad9af..0000000000
--- a/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex
+++ /dev/null
@@ -1,98 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% updatesmgr.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{cbSimpleUpdatesMgr}}\label{cbsimpleupdatesmgr}
-
-
-This class implements slightly optimized logic for refreshing
-the areas of frame layout that actually need to be updated.
-
-\wxheading{Derived from}
-
-\helpref{cbUpdatesManagerBase}{cbupdatesmanagerbase}
-
-\wxheading{Include files}
-
-<wx/fl/updatesmgr.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbSimpleUpdatesMgr::cbSimpleUpdatesMgr}\label{cbsimpleupdatesmgrcbsimpleupdatesmgr}
-
-\func{}{cbSimpleUpdatesMgr}{\void}
-
-Default constructor.
-
-
-\func{}{cbSimpleUpdatesMgr}{\param{wxFrameLayout* }{pPanel}}
-
-Constructor taking frame layout panel.
-
-
-\membersection{cbSimpleUpdatesMgr::OnBarWillChange}\label{cbsimpleupdatesmgronbarwillchange}
-
-\func{void}{OnBarWillChange}{\param{cbBarInfo* }{pBar}, \param{cbRowInfo* }{pInRow}, \param{cbDockPane* }{pInPane}}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::OnFinishChanges}\label{cbsimpleupdatesmgronfinishchanges}
-
-\func{void}{OnFinishChanges}{\void}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::OnPaneMarginsWillChange}\label{cbsimpleupdatesmgronpanemarginswillchange}
-
-\func{void}{OnPaneMarginsWillChange}{\param{cbDockPane* }{pPane}}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::OnPaneWillChange}\label{cbsimpleupdatesmgronpanewillchange}
-
-\func{void}{OnPaneWillChange}{\param{cbDockPane* }{pPane}}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::OnRowWillChange}\label{cbsimpleupdatesmgronrowwillchange}
-
-\func{void}{OnRowWillChange}{\param{cbRowInfo* }{pRow}, \param{cbDockPane* }{pInPane}}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::OnStartChanges}\label{cbsimpleupdatesmgronstartchanges}
-
-\func{void}{OnStartChanges}{\void}
-
-Notification received from Frame Layout in the order in which
-they would usually be invoked.
-
-
-\membersection{cbSimpleUpdatesMgr::UpdateNow}\label{cbsimpleupdatesmgrupdatenow}
-
-\func{void}{UpdateNow}{\void}
-
-Refreshes the parts of the frame layoutthat need an update.
-
-
-\membersection{cbSimpleUpdatesMgr::WasChanged}\label{cbsimpleupdatesmgrwaschanged}
-
-\func{bool}{WasChanged}{\param{cbUpdateMgrData\& }{data}, \param{wxRect\& }{currentBounds}}
-
-Helper function.
-
diff --git a/contrib/docs/latex/fl/cbsizebarwndevent.tex b/contrib/docs/latex/fl/cbsizebarwndevent.tex
deleted file mode 100644
index 831fd3229e..0000000000
--- a/contrib/docs/latex/fl/cbsizebarwndevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbSizeBarWndEvent}}\label{cbsizebarwndevent}
-
-
-Class for bar window resize events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbSizeBarWndEvent::cbSizeBarWndEvent}\label{cbsizebarwndeventcbsizebarwndevent}
-
-\func{}{cbSizeBarWndEvent}{\param{cbBarInfo* }{pBar}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information and pane.
-
diff --git a/contrib/docs/latex/fl/cbstartbardraggingevent.tex b/contrib/docs/latex/fl/cbstartbardraggingevent.tex
deleted file mode 100644
index 329dcffb32..0000000000
--- a/contrib/docs/latex/fl/cbstartbardraggingevent.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbStartBarDraggingEvent}}\label{cbstartbardraggingevent}
-
-
-Class for start-bar-dragging events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbStartBarDraggingEvent::cbStartBarDraggingEvent}\label{cbstartbardraggingeventcbstartbardraggingevent}
-
-\func{}{cbStartBarDraggingEvent}{\param{cbBarInfo* }{pBar}, \param{const wxPoint\& }{pos}, \param{cbDockPane* }{pPane}}
-
-Constructor, taking bar information, mouse position, and pane.
-
diff --git a/contrib/docs/latex/fl/cbstartdrawinareaevent.tex b/contrib/docs/latex/fl/cbstartdrawinareaevent.tex
deleted file mode 100644
index 1b66cf983c..0000000000
--- a/contrib/docs/latex/fl/cbstartdrawinareaevent.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:16
-%
-
-
-\section{\class{cbStartDrawInAreaEvent}}\label{cbstartdrawinareaevent}
-
-
-Class for start drawing in area events.
-
-\wxheading{Derived from}
-
-\helpref{cbPluginEvent}{cbpluginevent}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbStartDrawInAreaEvent::cbStartDrawInAreaEvent}\label{cbstartdrawinareaeventcbstartdrawinareaevent}
-
-\func{}{cbStartDrawInAreaEvent}{\param{const wxRect\& }{area}, \param{wxDC** }{ppDCForArea}, \param{cbDockPane* }{pPane}}
-
-to the obtained buffer-context should be placed
-Constructor, taking rectangular area, device context pointer to a pointer, and pane.
-
diff --git a/contrib/docs/latex/fl/cbupdatemgrdata.tex b/contrib/docs/latex/fl/cbupdatemgrdata.tex
deleted file mode 100644
index 9bd50f144a..0000000000
--- a/contrib/docs/latex/fl/cbupdatemgrdata.tex
+++ /dev/null
@@ -1,60 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{cbUpdateMgrData}}\label{cbupdatemgrdata}
-
-
-A structure that is present in each item of layout,
-used by any particular updates-manager to store
-auxiliary information to be used by its updating algorithm.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbUpdateMgrData::cbUpdateMgrData}\label{cbupdatemgrdatacbupdatemgrdata}
-
-\func{}{cbUpdateMgrData}{\void}
-
-Default constructor. Is-dirty flag is set TRUE initially.
-
-
-\membersection{cbUpdateMgrData::IsDirty}\label{cbupdatemgrdataisdirty}
-
-\func{bool}{IsDirty}{\void}
-
-Returns the is-dirty flag.
-
-
-\membersection{cbUpdateMgrData::SetCustomData}\label{cbupdatemgrdatasetcustomdata}
-
-\func{void}{SetCustomData}{\param{wxObject* }{pCustomData}}
-
-Set custom data.
-
-
-\membersection{cbUpdateMgrData::SetDirty}\label{cbupdatemgrdatasetdirty}
-
-\func{void}{SetDirty}{\param{bool }{isDirty = TRUE}}
-
-Set the dirty flag.
-
-
-\membersection{cbUpdateMgrData::StoreItemState}\label{cbupdatemgrdatastoreitemstate}
-
-\func{void}{StoreItemState}{\param{const wxRect\& }{boundsInParent}}
-
-Store the item state.
-
diff --git a/contrib/docs/latex/fl/cbupdatesmanagerbase.tex b/contrib/docs/latex/fl/cbupdatesmanagerbase.tex
deleted file mode 100644
index 51d652f0cb..0000000000
--- a/contrib/docs/latex/fl/cbupdatesmanagerbase.tex
+++ /dev/null
@@ -1,112 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:14
-%
-
-
-\section{\class{cbUpdatesManagerBase}}\label{cbupdatesmanagerbase}
-
-
-This class declares an abstract interface for optimized logic that should refresh
-areas of frame layout that actually need to be updated. This should be extended in future
-to implement a custom updating strategy.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{cbUpdatesManagerBase::cbUpdatesManagerBase}\label{cbupdatesmanagerbasecbupdatesmanagerbase}
-
-\func{}{cbUpdatesManagerBase}{\param{wxFrameLayout* }{pPanel}}
-
-Constructor taking layout panel.
-
-
-\func{}{cbUpdatesManagerBase}{\void}
-
-Default constructor
-
-
-\membersection{cbUpdatesManagerBase::\destruct{cbUpdatesManagerBase}}\label{cbupdatesmanagerbasedtor}
-
-\func{}{\destruct{cbUpdatesManagerBase}}{\void}
-
-Destructor.
-
-
-\membersection{cbUpdatesManagerBase::OnBarWillChange}\label{cbupdatesmanagerbaseonbarwillchange}
-
-\func{void}{OnBarWillChange}{\param{cbBarInfo* }{pBar}, \param{cbRowInfo* }{pInRow}, \param{cbDockPane* }{pInPane}}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::OnFinishChanges}\label{cbupdatesmanagerbaseonfinishchanges}
-
-\func{void}{OnFinishChanges}{\void}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::OnPaneMarginsWillChange}\label{cbupdatesmanagerbaseonpanemarginswillchange}
-
-\func{void}{OnPaneMarginsWillChange}{\param{cbDockPane* }{pPane}}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::OnPaneWillChange}\label{cbupdatesmanagerbaseonpanewillchange}
-
-\func{void}{OnPaneWillChange}{\param{cbDockPane* }{pPane}}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::OnRowWillChange}\label{cbupdatesmanagerbaseonrowwillchange}
-
-\func{void}{OnRowWillChange}{\param{cbRowInfo* }{pRow}, \param{cbDockPane* }{pInPane}}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::OnStartChanges}\label{cbupdatesmanagerbaseonstartchanges}
-
-\func{void}{OnStartChanges}{\void}
-
-This function receives a notification from the frame layout (in the order in which
-they would usually be invoked). Custom updates-managers may utilize
-these notifications to implement a more fine-grained updating strategy.
-
-
-\membersection{cbUpdatesManagerBase::SetLayout}\label{cbupdatesmanagerbasesetlayout}
-
-\func{void}{SetLayout}{\param{wxFrameLayout* }{pLayout}}
-
-Sets the associated layout.
-
-
-\membersection{cbUpdatesManagerBase::UpdateNow}\label{cbupdatesmanagerbaseupdatenow}
-
-\func{void}{UpdateNow}{\void}
-
-Refreshes parts of the frame layout that need an update.
-
diff --git a/contrib/docs/latex/fl/classes.tex b/contrib/docs/latex/fl/classes.tex
deleted file mode 100644
index b6a6283310..0000000000
--- a/contrib/docs/latex/fl/classes.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-\chapter{Alphabetical class reference}\label{classref}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-% NB: the files should be in alphabetic order of the classes documented in
-%     them and *not* in alphabetic order of the file names!
-
-\input baglayout.tex
-\input bariterator.tex
-\input cbantiflickerplugin.tex
-\input cbbardimhandlerbase.tex
-\input cbbardragplugin.tex
-\input cbbarhintsplugin.tex
-\input cbbarinfo.tex
-\input cbbarshapedata.tex
-\input cbbarspy.tex
-\input cbclosebox.tex
-\input cbcollapsebox.tex
-\input cbcommonpaneproperties.tex
-\input cbcustomizebarevent.tex
-\input cbcustomizelayoutevent.tex
-\input cbdiminfo.tex
-\input cbdockbox.tex
-\input cbdockpane.tex
-\input cbdrawbardecorevent.tex
-\input cbdrawbarhandlesevent.tex
-\input cbdrawhintrectevent.tex
-\input cbdrawpanebkgroundevent.tex
-\input cbdrawpanedecorevent.tex
-\input cbdrawrowbkgroundevent.tex
-\input cbdrawrowdecorevent.tex
-\input cbdrawrowhandlesevent.tex
-\input cbdyntoolbardimhandler.tex
-\input cbfinishdrawinareaevent.tex
-\input cbfloatedbarwindow.tex
-\input cbgcupdatesmgr.tex
-%\input cbhiddenbarinfo.tex
-\input cbhintanimationplugin.tex
-%\input cbhintanimtimer.tex
-\input cbinsertbarevent.tex
-\input cblayoutrowevent.tex
-\input cblayoutrowsevent.tex
-\input cbleftdclickevent.tex
-\input cbleftdownevent.tex
-\input cbleftupevent.tex
-\input cbminibutton.tex
-\input cbmotionevent.tex
-\input cbpanedrawplugin.tex
-\input cbpluginbase.tex
-\input cbpluginevent.tex
-\input cbremovebarevent.tex
-\input cbresizebarevent.tex
-\input cbresizerowevent.tex
-\input cbrightdownevent.tex
-\input cbrightupevent.tex
-\input cbrowdragplugin.tex
-\input cbrowinfo.tex
-\input cbrowlayoutplugin.tex
-\input cbsimplecustomizationplugin.tex
-\input cbsimpleupdatesmgr.tex
-\input cbsizebarwndevent.tex
-\input cbstartbardraggingevent.tex
-\input cbstartdrawinareaevent.tex
-\input cbupdatemgrdata.tex
-\input cbupdatesmanagerbase.tex
-\input dynamictoolbar.tex
-\input dyntoolinfo.tex
-\input framelayout.tex
-\input framemanager.tex
-%\input frameview.tex
-\input garbagecollector.tex
-\input layoutmanagerbase.tex
-%\input morphinfot.tex
-\input newbitmapbutton.tex
-\input toollayoutitem.tex
-\input toolwindow.tex
-
diff --git a/contrib/docs/latex/fl/contents.gif b/contrib/docs/latex/fl/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/docs/latex/fl/contents.gif and /dev/null differ
diff --git a/contrib/docs/latex/fl/dynamictoolbar.tex b/contrib/docs/latex/fl/dynamictoolbar.tex
deleted file mode 100644
index 0bc506fb1c..0000000000
--- a/contrib/docs/latex/fl/dynamictoolbar.tex
+++ /dev/null
@@ -1,227 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbar.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{wxDynamicToolBar}}\label{wxdynamictoolbar}
-
-
-wxDynamicToolBar manages containment and layout of tool windows.
-
-\wxheading{Derived from}
-
-\helpref{wxToolBarBase}{wxtoolbarbase}
-
-\wxheading{Include files}
-
-<wx/fl/dyntbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxDynamicToolBar::wxDynamicToolBar}\label{wxdynamictoolbarwxdynamictoolbar}
-
-\func{}{wxDynamicToolBar}{\void}
-
-Default constructor.
-
-
-\func{}{wxDynamicToolBar}{\param{wxWindow* }{parent}, \param{const wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{const long }{style = wxNO\_BORDER}, \param{const int }{orientation = wxVERTICAL}, \param{const int }{RowsOrColumns = 1}, \param{const wxString\& }{name = wxToolBarNameStr}}
-
-Constructor: see the documentation for wxToolBar for details.
-
-
-\membersection{wxDynamicToolBar::\destruct{wxDynamicToolBar}}\label{wxdynamictoolbardtor}
-
-\func{}{\destruct{wxDynamicToolBar}}{\void}
-
-Destructor.
-
-
-\membersection{wxDynamicToolBar::AddSeparator}\label{wxdynamictoolbaraddseparator}
-
-\func{void}{AddSeparator}{\param{wxWindow* }{pSepartorWnd = NULL}}
-
-Adds a separator. See the documentation for wxToolBar for details.
-
-
-\membersection{wxDynamicToolBar::AddTool}\label{wxdynamictoolbaraddtool}
-
-\func{void}{AddTool}{\param{int }{toolIndex}, \param{wxWindow* }{pToolWindow}, \param{const wxSize\& }{size = wxDefaultSize}}
-
-Adds a tool. See the documentation for wxToolBar for details.
-
-
-\func{void}{AddTool}{\param{int }{toolIndex}, \param{const wxString\& }{imageFileName}, \param{wxBitmapType }{imageFileType = wxBITMAP\_TYPE\_BMP}, \param{const wxString\& }{labelText = ""}, \param{bool }{alignTextRight = FALSE}, \param{bool }{isFlat = TRUE}}
-
-Adds a tool. See the documentation for wxToolBar for details.
-
-
-\func{void}{AddTool}{\param{int }{toolIndex}, \param{wxBitmap }{labelBmp}, \param{const wxString\& }{labelText = ""}, \param{bool }{alignTextRight = FALSE}, \param{bool }{isFlat = TRUE}}
-
-Adds a tool. See the documentation for wxToolBar for details.
-
-
-\func{wxToolBarToolBase*}{AddTool}{\param{const int }{toolIndex}, \param{const wxBitmap\& }{bitmap}, \param{const wxBitmap\& }{pushedBitmap = wxNullBitmap}, \param{const bool }{toggle = FALSE}, \param{const long }{xPos = -1}, \param{const long }{yPos = -1}, \param{wxObject* }{clientData = NULL}, \param{const wxString\& }{helpString1 = ""}, \param{const wxString\& }{helpString2 = ""}}
-
-Method from wxToolBarBase (for compatibility), only
-the first two arguments are valid.
-See the documentation for wxToolBar for details.
-
-
-\membersection{wxDynamicToolBar::Create}\label{wxdynamictoolbarcreate}
-
-\func{bool}{Create}{\param{wxWindow* }{parent}, \param{const wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{const long }{style = wxNO\_BORDER}, \param{const int }{orientation = wxVERTICAL}, \param{const int }{RowsOrColumns = 1}, \param{const wxString\& }{name = wxToolBarNameStr}}
-
-Creation function: see the documentation for wxToolBar for details.
-
-
-\membersection{wxDynamicToolBar::CreateDefaultLayout}\label{wxdynamictoolbarcreatedefaultlayout}
-
-\func{LayoutManagerBase*}{CreateDefaultLayout}{\void}
-
-Creates the default layout (BagLayout).
-
-
-\membersection{wxDynamicToolBar::CreateTool}\label{wxdynamictoolbarcreatetool}
-
-\func{wxToolBarToolBase*}{CreateTool}{\param{wxControl* }{control}}
-
-Creates a toolbar tool.
-
-
-\func{wxToolBarToolBase*}{CreateTool}{\param{int }{id}, \param{const wxBitmap\& }{bitmap1}, \param{const wxBitmap\& }{bitmap2}, \param{bool }{toggle}, \param{wxObject* }{clientData}, \param{const wxString\& }{shortHelpString}, \param{const wxString\& }{longHelpString}}
-
-Creates a toolbar tool.
-
-
-\membersection{wxDynamicToolBar::DoDeleteTool}\label{wxdynamictoolbardodeletetool}
-
-\func{bool}{DoDeleteTool}{\param{size\_t }{pos}, \param{wxToolBarToolBase* }{tool}}
-
-Deletes a tool. The tool is still in m\_tools list when this function is called, and it will
-only be deleted from it if it succeeds.
-
-
-\membersection{wxDynamicToolBar::DoEnableTool}\label{wxdynamictoolbardoenabletool}
-
-\func{void}{DoEnableTool}{\param{wxToolBarToolBase* }{tool}, \param{bool }{enable}}
-
-Called when the tools enabled flag changes.
-
-
-\membersection{wxDynamicToolBar::DoInsertTool}\label{wxdynamictoolbardoinserttool}
-
-\func{bool}{DoInsertTool}{\param{size\_t }{pos}, \param{wxToolBarToolBase* }{tool}}
-
-Inserts a tool at the given position.
-
-
-\membersection{wxDynamicToolBar::DoSetToggle}\label{wxdynamictoolbardosettoggle}
-
-\func{void}{DoSetToggle}{\param{wxToolBarToolBase* }{tool}, \param{bool }{toggle}}
-
-Called when the tools 'can be toggled' flag changes.
-
-
-\membersection{wxDynamicToolBar::DoToggleTool}\label{wxdynamictoolbardotoggletool}
-
-\func{void}{DoToggleTool}{\param{wxToolBarToolBase* }{tool}, \param{bool }{toggle}}
-
-Called when the tool is toggled.
-
-
-\membersection{wxDynamicToolBar::DrawSeparator}\label{wxdynamictoolbardrawseparator}
-
-\func{void}{DrawSeparator}{\param{wxDynToolInfo\& }{info}, \param{wxDC\& }{dc}}
-
-Draws a separator. The default implementation draws a shaded line.
-
-
-\membersection{wxDynamicToolBar::EnableTool}\label{wxdynamictoolbarenabletool}
-
-\func{void}{EnableTool}{\param{const int }{toolIndex}, \param{const bool }{enable = TRUE}}
-
-Enables or disables the given tool.
-
-
-\membersection{wxDynamicToolBar::FindToolForPosition}\label{wxdynamictoolbarfindtoolforposition}
-
-\constfunc{wxToolBarToolBase*}{FindToolForPosition}{\param{wxCoord }{x}, \param{wxCoord }{y}}
-
-Finds a tool for the given position.
-
-
-\membersection{wxDynamicToolBar::GetPreferredDim}\label{wxdynamictoolbargetpreferreddim}
-
-\func{void}{GetPreferredDim}{\param{const wxSize\& }{givenDim}, \param{wxSize\& }{prefDim}}
-
-Returns the preferred dimension, taking the given dimension and a reference to the result.
-
-
-\membersection{wxDynamicToolBar::GetToolInfo}\label{wxdynamictoolbargettoolinfo}
-
-\func{wxDynToolInfo*}{GetToolInfo}{\param{int }{toolIndex}}
-
-Returns tool information for the given tool index.
-
-
-\membersection{wxDynamicToolBar::Layout}\label{wxdynamictoolbarlayout}
-
-\func{bool}{Layout}{\void}
-
-Performs layout. See definitions of orientation types.
-
-
-\membersection{wxDynamicToolBar::OnEraseBackground}\label{wxdynamictoolbaronerasebackground}
-
-\func{void}{OnEraseBackground}{\param{wxEraseEvent\& }{event}}
-
-Responds to background erase events. Currently does nothing.
-
-
-\membersection{wxDynamicToolBar::OnPaint}\label{wxdynamictoolbaronpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-Responds to paint events, drawing separators.
-
-
-\membersection{wxDynamicToolBar::OnSize}\label{wxdynamictoolbaronsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Responds to size events, calling Layout.
-
-
-\membersection{wxDynamicToolBar::Realize}\label{wxdynamictoolbarrealize}
-
-\func{bool}{Realize}{\void}
-
-Overriden from wxToolBarBase; does nothing.
-
-
-\membersection{wxDynamicToolBar::RemveTool}\label{wxdynamictoolbarremvetool}
-
-\func{void}{RemveTool}{\param{int }{toolIndex}}
-
-Removes the given tool. Misspelt in order not to clash with a similar function
-in the base class.
-
-
-\membersection{wxDynamicToolBar::SetLayout}\label{wxdynamictoolbarsetlayout}
-
-\func{void}{SetLayout}{\param{LayoutManagerBase* }{pLayout}}
-
-Sets the layout for this toolbar.
-
-
-\membersection{wxDynamicToolBar::SizeToolWindows}\label{wxdynamictoolbarsizetoolwindows}
-
-\func{void}{SizeToolWindows}{\void}
-
-Internal function for sizing tool windows.
-
diff --git a/contrib/docs/latex/fl/dyntoolinfo.tex b/contrib/docs/latex/fl/dyntoolinfo.tex
deleted file mode 100644
index f180d977e2..0000000000
--- a/contrib/docs/latex/fl/dyntoolinfo.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbar.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{wxDynToolInfo}}\label{wxdyntoolinfo}
-
-
-This class holds dynamic toolbar item information.
-
-\wxheading{Derived from}
-
-\helpref{wxToolLayoutItem}{wxtoollayoutitem}
-
-\wxheading{Include files}
-
-<wx/fl/dyntbar.h>
-
-\wxheading{Data structures}
-
diff --git a/contrib/docs/latex/fl/faq.tex b/contrib/docs/latex/fl/faq.tex
deleted file mode 100644
index 3a805fc844..0000000000
--- a/contrib/docs/latex/fl/faq.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-\section{FAQ}\label{faq}
-
-\subsection{A row of all non-fixed bars don't position properly}
-
-By Julian Smart.
-
-I found that if I added all non-fixed bars, bars would overlap.
-This seems to be because the proportional resizing doesn't work
-before the window is laid out. I worked around this by setting
-pane sizes {\it before} the bars are added:
-
-\begin{verbatim}
-    wxSize sz = GetClientSize();
-
-    // Set width for panes to help it do the calculations
-    int i;
-    for (i = 0; i < 2; i++)
-    {
-        cbDockPane& pane = * (m_frameLayout->GetPane(i));
-        pane.SetPaneWidth(sz.x);
-    }
-\end{verbatim}
-
diff --git a/contrib/docs/latex/fl/fl.tex b/contrib/docs/latex/fl/fl.tex
deleted file mode 100644
index 3ba0580966..0000000000
--- a/contrib/docs/latex/fl/fl.tex
+++ /dev/null
@@ -1,79 +0,0 @@
-\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
-% JACS: doesn't make it through Tex2RTF, sorry. I will put it into texhelp.sty
-% since Tex2RTF doesn't parse it.
-% BTW, style MUST be report for it to work for Tex2RTF.
-%KB:
-%\addtolength{\textwidth}{1in}
-%\addtolength{\oddsidemargin}{-0.5in}
-%\addtolength{\topmargin}{-0.5in}
-%\addtolength{\textheight}{1in}
-%\sloppy
-%end of my changes
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\pipe}[0]{$\|$\ }%
-\definecolour{black}{0}{0}{0}%
-\definecolour{cyan}{0}{255}{255}%
-\definecolour{green}{0}{255}{0}%
-\definecolour{magenta}{255}{0}{255}%
-\definecolour{red}{255}{0}{0}%
-\definecolour{blue}{0}{0}{200}%
-\definecolour{yellow}{255}{255}{0}%
-\definecolour{white}{255}{255}{255}%
-%
-\input psbox.tex
-% Remove this for processing with dvi2ps instead of dvips
-%\special{!/@scaleunit 1 def}
-\parskip=10pt
-\parindent=0pt
-\title{FL: a Frame Layout Framework}
-\author{by Aleksandras Gluchovas and others}
-\date{January 2nd 2002}
-
-\makeindex
-\begin{document}
-\maketitle
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\pagenumbering{roman}
-\tableofcontents
-
-\chapter{Copyright notice}
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-FL is copyright Aleksandras Gluchovas, 2001-2002.
-
-The licence is the wxWindows Licence.
-
-\input{body.tex}
-\input{classes.tex}
-\input{category.tex}
-\input{topics.tex}
-
-\begin{comment}
-\bibliography{refs}
-\addcontentsline{toc}{chapter}{Bibliography}
-\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\newpage
-% Note: In RTF, the \printindex must come before the
-% change of header/footer, since the \printindex inserts
-% the RTF \sect command which divides one chapter from
-% the next.
-\rtfonly{\printindex
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-}
-% In Latex, it must be this way around (I think)
-\latexonly{\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\printindex
-}
-\end{comment}
-
-\end{document}
diff --git a/contrib/docs/latex/fl/forward.gif b/contrib/docs/latex/fl/forward.gif
deleted file mode 100644
index d8862174ed..0000000000
Binary files a/contrib/docs/latex/fl/forward.gif and /dev/null differ
diff --git a/contrib/docs/latex/fl/framelayout.tex b/contrib/docs/latex/fl/framelayout.tex
deleted file mode 100644
index b4289af0fe..0000000000
--- a/contrib/docs/latex/fl/framelayout.tex
+++ /dev/null
@@ -1,655 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% controlbar.h at 21/Jan/02 21:14:13
-%
-
-
-\section{\class{wxFrameLayout}}\label{wxframelayout}
-
-
-wxFrameLayout manages containment and docking of control bars,
-which can be docked along the top, bottom, right, or left side of the
-parent frame.
-
-\wxheading{Derived from}
-
-\helpref{wxEvtHandler}{wxevthandler}
-
-\wxheading{Include files}
-
-<wx/fl/controlbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxFrameLayout::wxFrameLayout}\label{wxframelayoutwxframelayout}
-
-\func{}{wxFrameLayout}{\param{wxWindow* }{pParentFrame}, \param{wxWindow* }{pFrameClient = NULL}, \param{bool }{activateNow = TRUE}}
-
-Constructor, taking parent window, the (MDI) client of the parent if there
-is one, and flag specifying whether to activate the layout.
-
-
-\func{}{wxFrameLayout}{\void}
-
-Default constructor, used only for serialization.
-
-
-\membersection{wxFrameLayout::\destruct{wxFrameLayout}}\label{wxframelayoutdtor}
-
-\func{}{\destruct{wxFrameLayout}}{\void}
-
-Destructor. It does not destroy the bar windows.
-
-
-\membersection{wxFrameLayout::Activate}\label{wxframelayoutactivate}
-
-\func{void}{Activate}{\void}
-
-Activate can be called after some other layout has been deactivated,
-and this one must take over the current contents of the frame window.
-Effectively hooks itself to the frame window, re-displays all non-hidden
-bar windows and repaints the decorations.
-
-
-\membersection{wxFrameLayout::AddBar}\label{wxframelayoutaddbar}
-
-\func{void}{AddBar}{\param{wxWindow* }{pBarWnd}, \param{const cbDimInfo\& }{dimInfo}, \param{int }{alignment = FL\_ALIGN\_TOP}, \param{int }{rowNo = 0}, \param{int }{columnPos = 0}, \param{const wxString\& }{name = "bar"}, \param{bool }{spyEvents = FALSE}, \param{int }{state = wxCBAR\_DOCKED\_HORIZONTALLY}}
-
-Adds bar information to the frame layout. The appearance of the layout is not refreshed
-immediately; RefreshNow() can be called if necessary.
-Notes: the argument pBarWnd can by NULL, resulting in bar decorations to be drawn
-around the empty rectangle (filled with default background colour).
-Argument dimInfo can be reused for adding any number of bars, since
-it is not used directly - instead its members are copied. If the dimensions
-handler is present, its instance is shared (reference counted). The dimension
-handler should always be allocated on the heap.
-pBarWnd is the window to be managed.
-dimInfo contains dimension information.
-alignment is a value such as FL\_ALIGN\_TOP.
-rowNo is the vertical position or row in the pane (if in docked state).
-columnPos is the horizontal position within the row in pixels (if in docked state).
-name is a name by which the bar can be referred in layout customization dialogs.
-If spyEvents is TRUE, input events for the bar should be "spyed" in order
-to forward unhandled mouse clicks to the frame layout, for example to enable
-easy draggablity of toolbars just by clicking on their interior regions.
-For widgets like text/tree control this value should be FALSE,
-since there's no certain way to detect  whether the event was actually handled.
-state is the initial state, such as wxCBAR\_DOCKED\_HORIZONTALLY,
-wxCBAR\_FLOATING, wxCBAR\_HIDDEN.
-
-
-\membersection{wxFrameLayout::AddPlugin}\label{wxframelayoutaddplugin}
-
-\func{void}{AddPlugin}{\param{wxClassInfo* }{pPlInfo}, \param{int }{paneMask = wxALL\_PANES}}
-
-An advanced methods for plugin configuration    using their
-dynamic class information, for example CLASSINFO(pluginClass).
-First checks if the plugin of the given class is already "hooked up".
-If not, adds it to the top of the plugins chain.
-
-
-\membersection{wxFrameLayout::AddPluginBefore}\label{wxframelayoutaddpluginbefore}
-
-\func{void}{AddPluginBefore}{\param{wxClassInfo* }{pNextPlInfo}, \param{wxClassInfo* }{pPlInfo}, \param{int }{paneMask = wxALL\_PANES}}
-
-First checks if the plugin of the given class is already hooked.
-If so, removes it, and then inserts it into the chain
-before the plugin of the class given by pNextPlInfo.
-Note: this method is handy in some cases where the order
-of the plugin-chain could be important, for example when one plugin overrides
-some functionality of another already-hooked plugin,
-so that the former plugin should be hooked before the one
-whose functionality is being overridden.
-
-
-\membersection{wxFrameLayout::ApplyBarProperties}\label{wxframelayoutapplybarproperties}
-
-\func{void}{ApplyBarProperties}{\param{cbBarInfo* }{pBar}}
-
-Reflects changes in bar information structure visually.
-For example, moves the bar, changes its dimension information,
-or changes the pane to which it is docked.
-
-
-\membersection{wxFrameLayout::CanReparent}\label{wxframelayoutcanreparent}
-
-\func{bool}{CanReparent}{\void}
-
-Returns TRUE if the platform allows reparenting. This may not return TRUE
-for all platforms. Reparenting allows control bars to be floated.
-
-
-\membersection{wxFrameLayout::CaptureEventsForPane}\label{wxframelayoutcaptureeventsforpane}
-
-\func{void}{CaptureEventsForPane}{\param{cbDockPane* }{toPane}}
-
-Called by plugins; also captures the mouse in the parent frame.
-
-
-\membersection{wxFrameLayout::CaptureEventsForPlugin}\label{wxframelayoutcaptureeventsforplugin}
-
-\func{void}{CaptureEventsForPlugin}{\param{cbPluginBase* }{pPlugin}}
-
-Captures user input events for the given plugin.
-Input events are: mouse movement, mouse clicks, keyboard input.
-
-
-\membersection{wxFrameLayout::CreateCursors}\label{wxframelayoutcreatecursors}
-
-\func{void}{CreateCursors}{\void}
-
-Creates the cursors.
-
-
-\membersection{wxFrameLayout::CreateUpdatesManager}\label{wxframelayoutcreateupdatesmanager}
-
-\func{cbUpdatesManagerBase*}{CreateUpdatesManager}{\void}
-
-Returns a new cbGCUpdatesMgr object.
-
-
-\membersection{wxFrameLayout::Deactivate}\label{wxframelayoutdeactivate}
-
-\func{void}{Deactivate}{\void}
-
-Deactivate unhooks itself from frame window, and hides all non-hidden windows.
-Note: two frame layouts should not be active at the same time in the
-same frame window, since it would cause messy overlapping of bar windows
-from both layouts.
-
-
-\membersection{wxFrameLayout::DestroyBarWindows}\label{wxframelayoutdestroybarwindows}
-
-\func{void}{DestroyBarWindows}{\void}
-
-Destroys the bar windows.
-
-
-\membersection{wxFrameLayout::DoSetBarState}\label{wxframelayoutdosetbarstate}
-
-\func{void}{DoSetBarState}{\param{cbBarInfo* }{pBar}}
-
-Applies the state to the window objects.
-
-
-\membersection{wxFrameLayout::EnableFloating}\label{wxframelayoutenablefloating}
-
-\func{void}{EnableFloating}{\param{bool }{enable = TRUE}}
-
-Enables floating behaviour. By default floating of control bars is on.
-
-
-\membersection{wxFrameLayout::FindBarByName}\label{wxframelayoutfindbarbyname}
-
-\func{cbBarInfo*}{FindBarByName}{\param{const wxString\& }{name}}
-
-Finds the bar in the framelayout, by name.
-
-
-\membersection{wxFrameLayout::FindBarByWindow}\label{wxframelayoutfindbarbywindow}
-
-\func{cbBarInfo*}{FindBarByWindow}{\param{const wxWindow* }{pWnd}}
-
-Finds the bar in the framelayout, by window.
-
-
-\membersection{wxFrameLayout::FindPlugin}\label{wxframelayoutfindplugin}
-
-\func{cbPluginBase*}{FindPlugin}{\param{wxClassInfo* }{pPlInfo}}
-
-Finds a plugin with the given class, or returns NULL if a plugin of the given
-class is not hooked.
-
-
-\membersection{wxFrameLayout::FirePluginEvent}\label{wxframelayoutfirepluginevent}
-
-\func{void}{FirePluginEvent}{\param{cbPluginEvent\& }{event}}
-
-This function should be used instead of passing the event to the ProcessEvent method
-of the top-level plugin directly. This method checks if events are currently
-captured and ensures that plugin-event is routed correctly.
-
-
-\membersection{wxFrameLayout::ForwardMouseEvent}\label{wxframelayoutforwardmouseevent}
-
-\func{void}{ForwardMouseEvent}{\param{wxMouseEvent\& }{event}, \param{cbDockPane* }{pToPane}, \param{int }{eventType}}
-
-Delegated from "bar-spy".
-
-
-\membersection{wxFrameLayout::GetBarPane}\label{wxframelayoutgetbarpane}
-
-\func{cbDockPane*}{GetBarPane}{\param{cbBarInfo* }{pBar}}
-
-Returns the pane to which the given bar belongs.
-
-
-\membersection{wxFrameLayout::GetBars}\label{wxframelayoutgetbars}
-
-\func{BarArrayT\&}{GetBars}{\void}
-
-Gets an array of bars.
-
-
-\membersection{wxFrameLayout::GetClientHeight}\label{wxframelayoutgetclientheight}
-
-\func{int}{GetClientHeight}{\void}
-
-Returns the client height.
-
-
-\membersection{wxFrameLayout::GetClientRect}\label{wxframelayoutgetclientrect}
-
-\func{wxRect\&}{GetClientRect}{\void}
-
-Returns the client's rectangle.
-
-
-\membersection{wxFrameLayout::GetClientWidth}\label{wxframelayoutgetclientwidth}
-
-\func{int}{GetClientWidth}{\void}
-
-Returns the client width.
-
-
-\membersection{wxFrameLayout::GetFrameClient}\label{wxframelayoutgetframeclient}
-
-\func{wxWindow*}{GetFrameClient}{\void}
-
-Returns the frame client, or NULL if not present.
-
-
-\membersection{wxFrameLayout::GetPane}\label{wxframelayoutgetpane}
-
-\func{cbDockPane*}{GetPane}{\param{int }{alignment}}
-
-Returns a pane for the given alignment. See pane alignment types.
-
-
-\membersection{wxFrameLayout::GetPaneProperties}\label{wxframelayoutgetpaneproperties}
-
-\func{void}{GetPaneProperties}{\param{cbCommonPaneProperties\& }{props}, \param{int }{alignment = FL\_ALIGN\_TOP}}
-
-Gets the pane properties for the given alignment.
-
-
-\membersection{wxFrameLayout::GetPanesArray}\label{wxframelayoutgetpanesarray}
-
-\func{cbDockPane**}{GetPanesArray}{\void}
-
-Returns an array of panes. Used by update managers.
-
-
-\membersection{wxFrameLayout::GetParentFrame}\label{wxframelayoutgetparentframe}
-
-\func{wxWindow\&}{GetParentFrame}{\void}
-
-Returns the parent frame.
-
-
-\membersection{wxFrameLayout::GetPrevClientRect}\label{wxframelayoutgetprevclientrect}
-
-\func{wxRect\&}{GetPrevClientRect}{\void}
-
-Returns the previous client window rectangle.
-
-
-\membersection{wxFrameLayout::GetTopPlugin}\label{wxframelayoutgettopplugin}
-
-\func{cbPluginBase\&}{GetTopPlugin}{\void}
-
-Returns the current top-level plugin (the one that receives events first,
-except if input events are currently captured by some other plugin).
-
-
-\membersection{wxFrameLayout::GetUpdatesManager}\label{wxframelayoutgetupdatesmanager}
-
-\func{cbUpdatesManagerBase\&}{GetUpdatesManager}{\void}
-
-Returns a reference to the updates manager.
-Note: in future, the updates manager will become a normal plugin.
-
-
-\membersection{wxFrameLayout::HasTopPlugin}\label{wxframelayouthastopplugin}
-
-\func{bool}{HasTopPlugin}{\void}
-
-Returns true if there is a top plugin.
-
-
-\membersection{wxFrameLayout::HideBarWindows}\label{wxframelayouthidebarwindows}
-
-\func{void}{HideBarWindows}{\void}
-
-Hides the bar windows, and also the client window if present.
-
-
-\membersection{wxFrameLayout::HitTestPane}\label{wxframelayouthittestpane}
-
-\func{bool}{HitTestPane}{\param{cbDockPane* }{pPane}, \param{int }{x}, \param{int }{y}}
-
-Returns TRUE if the position is within the given pane.
-
-
-\membersection{wxFrameLayout::HitTestPanes}\label{wxframelayouthittestpanes}
-
-\func{cbDockPane*}{HitTestPanes}{\param{const wxRect\& }{rect}, \param{cbDockPane* }{pCurPane}}
-
-Returns the pane for which the rectangle hit test succeeds, giving
-preference to the given pane if supplied.
-
-
-\membersection{wxFrameLayout::HookUpToFrame}\label{wxframelayouthookuptoframe}
-
-\func{void}{HookUpToFrame}{\void}
-
-Hooks the layout up to the frame (pushes the layout onto the
-frame's event handler stack).
-
-
-\membersection{wxFrameLayout::InverseVisibility}\label{wxframelayoutinversevisibility}
-
-\func{void}{InverseVisibility}{\param{cbBarInfo* }{pBar}}
-
-Toggles the bar between visible and hidden.
-
-
-\membersection{wxFrameLayout::LocateBar}\label{wxframelayoutlocatebar}
-
-\func{bool}{LocateBar}{\param{cbBarInfo* }{pBarInfo}, \param{cbRowInfo** }{ppRow}, \param{cbDockPane** }{ppPane}}
-
-The purpose of this function is unknown.
-
-
-\membersection{wxFrameLayout::OnActivate}\label{wxframelayoutonactivate}
-
-\func{void}{OnActivate}{\param{wxActivateEvent\& }{event}}
-
-Handles activation events. Currently does nothing.
-
-
-\membersection{wxFrameLayout::OnEraseBackground}\label{wxframelayoutonerasebackground}
-
-\func{void}{OnEraseBackground}{\param{wxEraseEvent\& }{event}}
-
-Handles background erase events. Currently does nothing.
-
-
-\membersection{wxFrameLayout::OnIdle}\label{wxframelayoutonidle}
-
-\func{void}{OnIdle}{\param{wxIdleEvent\& }{event}}
-
-Handles idle events.
-
-
-\membersection{wxFrameLayout::OnKillFocus}\label{wxframelayoutonkillfocus}
-
-\func{void}{OnKillFocus}{\param{wxFocusEvent\& }{event}}
-
-Handles focus kill events. Currently does nothing.
-
-
-\membersection{wxFrameLayout::OnLButtonDown}\label{wxframelayoutonlbuttondown}
-
-\func{void}{OnLButtonDown}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a left down button event.
-
-
-\membersection{wxFrameLayout::OnLButtonUp}\label{wxframelayoutonlbuttonup}
-
-\func{void}{OnLButtonUp}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a left button up event.
-
-
-\membersection{wxFrameLayout::OnLDblClick}\label{wxframelayoutonldblclick}
-
-\func{void}{OnLDblClick}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a left doubleclick button event.
-
-
-\membersection{wxFrameLayout::OnMouseMove}\label{wxframelayoutonmousemove}
-
-\func{void}{OnMouseMove}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a mouse move event.
-
-
-\membersection{wxFrameLayout::OnPaint}\label{wxframelayoutonpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-Handles paint events, calling PaintPane for each pane.
-
-
-\membersection{wxFrameLayout::OnRButtonDown}\label{wxframelayoutonrbuttondown}
-
-\func{void}{OnRButtonDown}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a right button down event.
-
-
-\membersection{wxFrameLayout::OnRButtonUp}\label{wxframelayoutonrbuttonup}
-
-\func{void}{OnRButtonUp}{\param{wxMouseEvent\& }{event}}
-
-Event handler for a right button up event.
-
-
-\membersection{wxFrameLayout::OnSetFocus}\label{wxframelayoutonsetfocus}
-
-\func{void}{OnSetFocus}{\param{wxFocusEvent\& }{event}}
-
-Handles focus set events. Currently does nothing.
-
-
-\membersection{wxFrameLayout::OnSize}\label{wxframelayoutonsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Event handler for a size event.
-
-
-\membersection{wxFrameLayout::PopAllPlugins}\label{wxframelayoutpopallplugins}
-
-\func{void}{PopAllPlugins}{\void}
-
-Pop all plugins.
-
-
-\membersection{wxFrameLayout::PopPlugin}\label{wxframelayoutpopplugin}
-
-\func{void}{PopPlugin}{\void}
-
-Similar to wxWindow's "push/pop-event-handler" methods, execept
-that the plugin is deleted upon "popping".
-
-
-\membersection{wxFrameLayout::PositionClientWindow}\label{wxframelayoutpositionclientwindow}
-
-\func{void}{PositionClientWindow}{\void}
-
-Called to apply the calculated layout to window objects.
-
-
-\membersection{wxFrameLayout::PositionPanes}\label{wxframelayoutpositionpanes}
-
-\func{void}{PositionPanes}{\void}
-
-Called to apply the calculated layout to window objects.
-
-
-\membersection{wxFrameLayout::PushDefaultPlugins}\label{wxframelayoutpushdefaultplugins}
-
-\func{void}{PushDefaultPlugins}{\void}
-
-Adds the default plugins. These are cbPaneDrawPlugin, cbRowLayoutPlugin, cbBarDragPlugin,
-cbAntiflickerPlugin, cbSimpleCustomizePlugin.
-This method is automatically invoked if no plugins were found upon
-firing of the first plugin-event, i.e. when wxFrameLayout configures itself.
-
-
-\membersection{wxFrameLayout::PushPlugin}\label{wxframelayoutpushplugin}
-
-\func{void}{PushPlugin}{\param{cbPluginBase* }{pPugin}}
-
-Similar to wxWindow's "push/pop-event-handler" methods, execept
-that the plugin is deleted upon "popping".
-
-
-\membersection{wxFrameLayout::RecalcLayout}\label{wxframelayoutrecalclayout}
-
-\func{void}{RecalcLayout}{\param{bool }{repositionBarsNow = FALSE}}
-
-Recalculates the layout of panes, and all bars/rows in each pane.
-
-
-\membersection{wxFrameLayout::RedockBar}\label{wxframelayoutredockbar}
-
-\func{bool}{RedockBar}{\param{cbBarInfo* }{pBar}, \param{const wxRect\& }{shapeInParent}, \param{cbDockPane* }{pToPane = NULL}, \param{bool }{updateNow = TRUE}}
-
-ReddockBar can be used for repositioning existing bars. The given bar is first removed
-from the pane it currently belongs to, and inserted into the pane, which "matches"
-the given rectangular area. If pToPane is not NULL, the bar is docked to this given pane.
-To dock a bar which is floating, use the wxFrameLayout::DockBar method.
-
-
-\membersection{wxFrameLayout::RefreshNow}\label{wxframelayoutrefreshnow}
-
-\func{void}{RefreshNow}{\param{bool }{recalcLayout = TRUE}}
-
-Recalculates layout and performs on-screen update of all panes.
-
-
-\membersection{wxFrameLayout::ReleaseEventsFromPane}\label{wxframelayoutreleaseeventsfrompane}
-
-\func{void}{ReleaseEventsFromPane}{\param{cbDockPane* }{fromPane}}
-
-Called by plugins; also releases mouse in the parent frame.
-
-
-\membersection{wxFrameLayout::ReleaseEventsFromPlugin}\label{wxframelayoutreleaseeventsfromplugin}
-
-\func{void}{ReleaseEventsFromPlugin}{\param{cbPluginBase* }{pPlugin}}
-
-Releases user input events for the given plugin.
-Input events are: mouse movement, mouse clicks, keyboard input
-
-
-\membersection{wxFrameLayout::RemoveBar}\label{wxframelayoutremovebar}
-
-\func{void}{RemoveBar}{\param{cbBarInfo* }{pBar}}
-
-Removes the bar from the layout permanently, and hides its corresponding window if present.
-
-
-\membersection{wxFrameLayout::RemovePlugin}\label{wxframelayoutremoveplugin}
-
-\func{void}{RemovePlugin}{\param{wxClassInfo* }{pPlInfo}}
-
-Checks if the plugin of the given class is hooked, and removes
-it if found.
-
-
-\membersection{wxFrameLayout::ReparentWindow}\label{wxframelayoutreparentwindow}
-
-\func{void}{ReparentWindow}{\param{wxWindow* }{pChild}, \param{wxWindow* }{pNewParent}}
-
-Reparents pChild to have parent pNewParent.
-
-
-\membersection{wxFrameLayout::RepositionFloatedBar}\label{wxframelayoutrepositionfloatedbar}
-
-\func{void}{RepositionFloatedBar}{\param{cbBarInfo* }{pBar}}
-
-Applies the calculated layout to a floating bar.
-
-
-\membersection{wxFrameLayout::RouteMouseEvent}\label{wxframelayoutroutemouseevent}
-
-\func{void}{RouteMouseEvent}{\param{wxMouseEvent\& }{event}, \param{int }{pluginEvtType}}
-
-Routes the mouse event to the appropriate pane.
-
-
-\membersection{wxFrameLayout::SetBarState}\label{wxframelayoutsetbarstate}
-
-\func{void}{SetBarState}{\param{cbBarInfo* }{pBar}, \param{int }{newStatem}, \param{bool }{updateNow}}
-
-Changes the bar's docking state (see possible control bar states).
-
-
-\membersection{wxFrameLayout::SetFrameClient}\label{wxframelayoutsetframeclient}
-
-\func{void}{SetFrameClient}{\param{wxWindow* }{pFrameClient}}
-
-Passes the client window (e.g. MDI client window) to be controlled by
-frame layout, the size and position of which should be adjusted to be
-surrounded by controlbar panes, whenever the frame is resized or the dimensions
-of control panes change.
-
-
-\membersection{wxFrameLayout::SetMargins}\label{wxframelayoutsetmargins}
-
-\func{void}{SetMargins}{\param{int }{top}, \param{int }{bottom}, \param{int }{left}, \param{int }{right}, \param{int }{paneMask = wxALL\_PANES}}
-
-Sets the margins for the given panes.
-The margins should go into cbCommonPaneProperties in the future.
-Note: this method should be called before any custom plugins are attached.
-
-
-\membersection{wxFrameLayout::SetPaneBackground}\label{wxframelayoutsetpanebackground}
-
-\func{void}{SetPaneBackground}{\param{const wxColour\& }{colour}}
-
-Sets the pane background colour.
-
-
-\membersection{wxFrameLayout::SetPaneProperties}\label{wxframelayoutsetpaneproperties}
-
-\func{void}{SetPaneProperties}{\param{const cbCommonPaneProperties\& }{props}, \param{int }{paneMask = wxALL\_PANES}}
-
-Sets the pane properties for the given alignment.
-Note: changing properties of panes does not result immediate on-screen update.
-
-
-\membersection{wxFrameLayout::SetTopPlugin}\label{wxframelayoutsettopplugin}
-
-\func{void}{SetTopPlugin}{\param{cbPluginBase* }{pPlugin}}
-
-Hooking custom plugins to frame layout.
-Note: when hooking one plugin on top of the other,
-use SetNextHandler or similar methods
-of wxEvtHandler class to compose the chain of plugins,
-than pass the left-most handler in this chain to
-the above methods (assuming that events are delegated
-from left-most towards right-most handler).
-This secenario is very inconvenient and "low-level",
-so use the Add/Push/PopPlugin methods instead.
-
-
-\membersection{wxFrameLayout::SetUpdatesManager}\label{wxframelayoutsetupdatesmanager}
-
-\func{void}{SetUpdatesManager}{\param{cbUpdatesManagerBase* }{pUMgr}}
-
-Destroys the previous manager if any, and sets the new one.
-
-
-\membersection{wxFrameLayout::ShowFloatedWindows}\label{wxframelayoutshowfloatedwindows}
-
-\func{void}{ShowFloatedWindows}{\param{bool }{show}}
-
-Shows all floated windows.
-
-
-\membersection{wxFrameLayout::UnhookFromFrame}\label{wxframelayoutunhookfromframe}
-
-\func{void}{UnhookFromFrame}{\void}
-
-Unhooks the layout from the frame.
-
diff --git a/contrib/docs/latex/fl/framemanager.tex b/contrib/docs/latex/fl/framemanager.tex
deleted file mode 100644
index 7dce86a9ce..0000000000
--- a/contrib/docs/latex/fl/framemanager.tex
+++ /dev/null
@@ -1,143 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% frmview.h at 05/Jan/02 22:50:57
-%
-
-
-\section{\class{wxFrameManager}}\label{wxframemanager}
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxFrameManager::wxFrameManager}\label{wxframemanagerwxframemanager}
-
-\func{}{wxFrameManager}{\void}
-
-
-\membersection{wxFrameManager::\destruct{wxFrameManager}}\label{wxframemanagerdtor}
-
-\func{}{\destruct{wxFrameManager}}{\void}
-
-
-\membersection{wxFrameManager::ActivateView}\label{wxframemanageractivateview}
-
-\func{void}{ActivateView}{\param{wxFrameView* }{pFrmView}}
-
-
-\func{void}{ActivateView}{\param{int }{viewNo}}
-
-
-\membersection{wxFrameManager::AddView}\label{wxframemanageraddview}
-
-\func{void}{AddView}{\param{wxFrameView* }{pFrmView}}
-
-
-\membersection{wxFrameManager::DeactivateCurrentView}\label{wxframemanagerdeactivatecurrentview}
-
-\func{void}{DeactivateCurrentView}{\void}
-
-
-\membersection{wxFrameManager::DestroyViews}\label{wxframemanagerdestroyviews}
-
-\func{void}{DestroyViews}{\void}
-
-
-\membersection{wxFrameManager::DoSerialize}\label{wxframemanagerdoserialize}
-
-\func{void}{DoSerialize}{\param{wxObjectStorage\& }{store}}
-
-
-\membersection{wxFrameManager::EnableMenusForView}\label{wxframemanagerenablemenusforview}
-
-\func{void}{EnableMenusForView}{\param{wxFrameView* }{pView}, \param{bool }{enable}}
-
-
-\membersection{wxFrameManager::GetActiveView}\label{wxframemanagergetactiveview}
-
-\func{wxFrameView*}{GetActiveView}{\void}
-
-
-\membersection{wxFrameManager::GetActiveViewNo}\label{wxframemanagergetactiveviewno}
-
-\func{int}{GetActiveViewNo}{\void}
-
-
-\membersection{wxFrameManager::GetActiveViewNode}\label{wxframemanagergetactiveviewnode}
-
-\func{wxNode*}{GetActiveViewNode}{\void}
-
-
-\membersection{wxFrameManager::GetClientWindow}\label{wxframemanagergetclientwindow}
-
-\func{wxWindow*}{GetClientWindow}{\void}
-
-
-\membersection{wxFrameManager::GetObjectStore}\label{wxframemanagergetobjectstore}
-
-\func{wxObjectStorage\&}{GetObjectStore}{\void}
-
-
-\membersection{wxFrameManager::GetParentFrame}\label{wxframemanagergetparentframe}
-
-\func{wxFrame*}{GetParentFrame}{\void}
-
-synonyms
-
-
-\membersection{wxFrameManager::GetParentWindow}\label{wxframemanagergetparentwindow}
-
-\func{wxWindow*}{GetParentWindow}{\void}
-
-
-\membersection{wxFrameManager::GetView}\label{wxframemanagergetview}
-
-\func{wxFrameView*}{GetView}{\param{int }{viewNo}}
-
-
-\membersection{wxFrameManager::GetViewNo}\label{wxframemanagergetviewno}
-
-\func{int}{GetViewNo}{\param{wxFrameView* }{pView}}
-
-
-\membersection{wxFrameManager::Init}\label{wxframemanagerinit}
-
-\func{void}{Init}{\param{wxWindow* }{pMainFrame}, \param{const wxString\& }{settingsFile = ""}}
-
-if file name is empty, views are are not saved/loaded
-
-
-\membersection{wxFrameManager::ReloadViews}\label{wxframemanagerreloadviews}
-
-\func{bool}{ReloadViews}{\void}
-
-
-\membersection{wxFrameManager::RemoveView}\label{wxframemanagerremoveview}
-
-\func{void}{RemoveView}{\param{wxFrameView* }{pFrmView}}
-
-
-\membersection{wxFrameManager::SaveViewsNow}\label{wxframemanagersaveviewsnow}
-
-\func{void}{SaveViewsNow}{\void}
-
-
-\membersection{wxFrameManager::SetClinetWindow}\label{wxframemanagersetclinetwindow}
-
-\func{void}{SetClinetWindow}{\param{wxWindow* }{pFrameClient}}
-
-
-\membersection{wxFrameManager::SyncAllMenus}\label{wxframemanagersyncallmenus}
-
-\func{void}{SyncAllMenus}{\void}
-
-
-\membersection{wxFrameManager::ViewsAreLoaded}\label{wxframemanagerviewsareloaded}
-
-\func{bool}{ViewsAreLoaded}{\void}
-
diff --git a/contrib/docs/latex/fl/frameview.tex b/contrib/docs/latex/fl/frameview.tex
deleted file mode 100644
index 1e35aac421..0000000000
--- a/contrib/docs/latex/fl/frameview.tex
+++ /dev/null
@@ -1,115 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% frmview.h at 05/Jan/02 22:50:57
-%
-
-
-\section{\class{wxFrameView}}\label{wxframeview}
-
-\wxheading{Derived from}
-
-\helpref{wxEvtHandler}{wxevthandler}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxFrameView::wxFrameView}\label{wxframeviewwxframeview}
-
-\func{}{wxFrameView}{\void}
-
-
-\membersection{wxFrameView::\destruct{wxFrameView}}\label{wxframeviewdtor}
-
-\func{}{\destruct{wxFrameView}}{\void}
-
-
-\membersection{wxFrameView::Activate}\label{wxframeviewactivate}
-
-\func{void}{Activate}{\void}
-
-
-\membersection{wxFrameView::CreateLayout}\label{wxframeviewcreatelayout}
-
-\func{void}{CreateLayout}{\void}
-
-
-\membersection{wxFrameView::Deactivate}\label{wxframeviewdeactivate}
-
-\func{void}{Deactivate}{\void}
-
-
-\membersection{wxFrameView::GetClientWindow}\label{wxframeviewgetclientwindow}
-
-\func{wxWindow*}{GetClientWindow}{\void}
-
-
-\membersection{wxFrameView::GetFrameManager}\label{wxframeviewgetframemanager}
-
-\func{wxFrameManager\&}{GetFrameManager}{\void}
-
-
-\membersection{wxFrameView::GetLayout}\label{wxframeviewgetlayout}
-
-\func{wxFrameLayout*}{GetLayout}{\void}
-
-
-\membersection{wxFrameView::GetParentFrame}\label{wxframeviewgetparentframe}
-
-\func{wxFrame*}{GetParentFrame}{\void}
-
-
-\membersection{wxFrameView::OnActiveate}\label{wxframeviewonactiveate}
-
-\func{void}{OnActiveate}{\void}
-
-
-\membersection{wxFrameView::OnDeactivate}\label{wxframeviewondeactivate}
-
-\func{void}{OnDeactivate}{\void}
-
-
-\membersection{wxFrameView::OnIdle}\label{wxframeviewonidle}
-
-\func{void}{OnIdle}{\param{wxIdleEvent\& }{event}}
-
-
-\membersection{wxFrameView::OnInit}\label{wxframeviewoninit}
-
-\func{void}{OnInit}{\void}
-
-hooks for specific frame-views
-
-
-\membersection{wxFrameView::OnInitMenus}\label{wxframeviewoninitmenus}
-
-\func{void}{OnInitMenus}{\void}
-
-
-\membersection{wxFrameView::OnRecreate}\label{wxframeviewonrecreate}
-
-\func{void}{OnRecreate}{\void}
-
-imp. is mandatory
-
-
-\membersection{wxFrameView::OnSerialize}\label{wxframeviewonserialize}
-
-\func{void}{OnSerialize}{\param{wxObjectStorage\& }{store}}
-
-
-\membersection{wxFrameView::RegisterMenu}\label{wxframeviewregistermenu}
-
-\func{void}{RegisterMenu}{\param{const wxString\& }{topMenuName}}
-
-
-\membersection{wxFrameView::SetLayout}\label{wxframeviewsetlayout}
-
-\func{void}{SetLayout}{\param{wxFrameLayout* }{pLayout}}
-
-
-\membersection{wxFrameView::SetToolUpdates}\label{wxframeviewsettoolupdates}
-
-\func{void}{SetToolUpdates}{\param{bool }{doToolUpdates = TRUE}}
-
diff --git a/contrib/docs/latex/fl/function.tex b/contrib/docs/latex/fl/function.tex
deleted file mode 100644
index 4b3138f40a..0000000000
--- a/contrib/docs/latex/fl/function.tex
+++ /dev/null
@@ -1,40 +0,0 @@
-\chapter{Functions}\label{functions}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-The functions and macros defined in FL are described here.
-
-\section{Version macros}\label{versionfunctions}
-
-The following constants are defined in wxWindows:
-
-\begin{itemize}\itemsep=0pt
-\item {\tt wxMAJOR\_VERSION} is the major version of wxWindows
-\item {\tt wxMINOR\_VERSION} is the minor version of wxWindows
-\item {\tt wxRELEASE\_NUMBER} is the release number
-\end{itemize}
-
-For example, the values or these constants for wxWindows 2.1.15 are 2, 1 and
-15.
-
-Additionally, {\tt wxVERSION\_STRING} is a user-readable string containing
-the full wxWindows version and {\tt wxVERSION\_NUMBER} is a combination of the
-three version numbers above: for 2.1.15, it is 2115 and it is 2200 for
-wxWindows 2.2.
-
-\section{Initialisation functions}\label{initfunctions}
-
-\wxheading{Include files}
-
-<wx/pmf/pmf.h>
-
-\wxheading{See also}
-
-Todo
-
-\membersection{::Function1}\label{function1}
-
-\func{void}{Function1}{\void}
-
-Explanation.
-
diff --git a/contrib/docs/latex/fl/garbagecollector.tex b/contrib/docs/latex/fl/garbagecollector.tex
deleted file mode 100644
index e0f25967b8..0000000000
--- a/contrib/docs/latex/fl/garbagecollector.tex
+++ /dev/null
@@ -1,114 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% garbagec.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{GarbageCollector}}\label{garbagecollector}
-
-
-This class implements an extremely slow but simple garbage collection algorithm.
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/fl/garbagec.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{GarbageCollector::GarbageCollector}\label{garbagecollectorgarbagecollector}
-
-\func{}{GarbageCollector}{\void}
-
-Default constructor.
-
-
-\membersection{GarbageCollector::\destruct{GarbageCollector}}\label{garbagecollectordtor}
-
-\func{}{\destruct{GarbageCollector}}{\void}
-
-Destructor.
-
-
-\membersection{GarbageCollector::AddDependency}\label{garbagecollectoradddependency}
-
-\func{void}{AddDependency}{\param{void* }{pObj}, \param{void* }{pDependsOnObj}}
-
-Prepare data for garbage collection.
-
-
-\membersection{GarbageCollector::AddObject}\label{garbagecollectoraddobject}
-
-\func{void}{AddObject}{\param{void* }{pObj}, \param{int }{refCnt = 1}}
-
-Prepare data for garbage collection.
-
-
-\membersection{GarbageCollector::ArrangeCollection}\label{garbagecollectorarrangecollection}
-
-\func{void}{ArrangeCollection}{\void}
-
-Executes garbage collection algorithm.
-
-
-\membersection{GarbageCollector::DestroyItemList}\label{garbagecollectordestroyitemlist}
-
-\func{void}{DestroyItemList}{\param{wxList\& }{lst}}
-
-Destroys a list of items.
-
-
-\membersection{GarbageCollector::FindItemNode}\label{garbagecollectorfinditemnode}
-
-\func{wxNode*}{FindItemNode}{\param{void* }{pForObj}}
-
-Internal method for finding a node.
-
-
-\membersection{GarbageCollector::FindReferenceFreeItemNode}\label{garbagecollectorfindreferencefreeitemnode}
-
-\func{wxNode*}{FindReferenceFreeItemNode}{\void}
-
-Internal method for findind and freeing a node.
-
-
-\membersection{GarbageCollector::GetCycledObjects}\label{garbagecollectorgetcycledobjects}
-
-\func{wxList\&}{GetCycledObjects}{\void}
-
-Get cycled objects.
-
-
-\membersection{GarbageCollector::GetRegularObjects}\label{garbagecollectorgetregularobjects}
-
-\func{wxList\&}{GetRegularObjects}{\void}
-
-Accesses the results of the algorithm.
-
-
-\membersection{GarbageCollector::RemoveReferencesToNode}\label{garbagecollectorremovereferencestonode}
-
-\func{void}{RemoveReferencesToNode}{\param{wxNode* }{pItemNode}}
-
-Remove references to this node.
-
-
-\membersection{GarbageCollector::Reset}\label{garbagecollectorreset}
-
-\func{void}{Reset}{\void}
-
-Removes all data from the garbage collector.
-
-
-\membersection{GarbageCollector::ResolveReferences}\label{garbagecollectorresolvereferences}
-
-\func{void}{ResolveReferences}{\void}
-
-Internal method for resolving references.
-
diff --git a/contrib/docs/latex/fl/gcitem.tex b/contrib/docs/latex/fl/gcitem.tex
deleted file mode 100644
index 658978e3fd..0000000000
--- a/contrib/docs/latex/fl/gcitem.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% garbagec.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{GCItem}}\label{gcitem}
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/fl/garbagec.h>
-
-\wxheading{Data structures}
-
diff --git a/contrib/docs/latex/fl/layoutmanagerbase.tex b/contrib/docs/latex/fl/layoutmanagerbase.tex
deleted file mode 100644
index 2bbe7f036c..0000000000
--- a/contrib/docs/latex/fl/layoutmanagerbase.tex
+++ /dev/null
@@ -1,37 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbar.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{LayoutManagerBase}}\label{layoutmanagerbase}
-
-
-This is a base class for layout algorithm implementations.
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/fl/dyntbar.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{LayoutManagerBase::\destruct{LayoutManagerBase}}\label{layoutmanagerbasedtor}
-
-\func{}{\destruct{LayoutManagerBase}}{\void}
-
-Destructor.
-
-
-\membersection{LayoutManagerBase::Layout}\label{layoutmanagerbaselayout}
-
-\func{void}{Layout}{\param{const wxSize\& }{parentDim}, \param{wxSize\& }{resultingDim}, \param{wxLayoutItemArrayT\& }{items}, \param{int }{horizGap}, \param{int }{vertGap}}
-
-Constructor.
-
diff --git a/contrib/docs/latex/fl/makefile.vc b/contrib/docs/latex/fl/makefile.vc
deleted file mode 100644
index d1c80290b0..0000000000
--- a/contrib/docs/latex/fl/makefile.vc
+++ /dev/null
@@ -1,107 +0,0 @@
-# File:     makefile.vc
-# Author:   Julian Smart
-# Created:  2002
-# Updated:
-# Copyright: (c) 2002, Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile : Builds documents using VC++ nmake
-#
-
-WXDIR=$(WXWIN)
-THISDIR=$(WXDIR)\contrib\docs\latex\fl
-DOCDIR = $(WXDIR)\docs
-WAITFLAG=/w
-
-docs:   dirs winhelp html pdfrtf htb htmlhelp
-winhelp:    $(DOCDIR)/winhelp/fl.hlp
-rtf:    $(THISDIR)/latex/fl/fl.rtf
-pdfrtf: $(DOCDIR)/pdf/fl.rtf
-htb:	$(DOCDIR)\htb\fl.htb
-html:	$(DOCDIR)\html\fl\fl.htm
-htmlhelp: $(DOCDIR)\htmlhelp\fl.chm
-
-dirs:
-        -mkdir $(DOCDIR)\winhelp
-        -mkdir $(DOCDIR)\html
-        -mkdir $(DOCDIR)\html\fl
-        -mkdir $(DOCDIR)\htmlhelp
-        -mkdir $(DOCDIR)\htb
-        -mkdir $(DOCDIR)\pdf
-
-$(DOCDIR)/winhelp/fl.hlp:         $(THISDIR)/fl.rtf $(THISDIR)/fl.hpj
-        cd $(THISDIR)
-        -erase fl.ph
-        hc fl
-        -erase $(DOCDIR)\winhelp\fl.hlp
-        -erase $(DOCDIR)\winhelp\fl.cnt
-        move fl.hlp $(DOCDIR)\winhelp\fl.hlp
-        move fl.cnt $(DOCDIR)\winhelp\fl.cnt
-        cd $(THISDIR)
-
-$(THISDIR)/fl.rtf:         $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/fl.tex
-        cd $(THISDIR)
-        -start $(WAITFLAG) tex2rtf $(THISDIR)/fl.tex $(THISDIR)/fl.rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)/pdf/fl.rtf:         $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/fl.tex
-        cd $(THISDIR)
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(THISDIR)/fl.tex $(DOCDIR)/pdf/fl.rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\fl\fl.htm:         $(THISDIR)\classes.tex $(THISDIR)\body.tex $(THISDIR)/topics.tex $(THISDIR)\fl.tex
-        cd $(THISDIR)
-        -mkdir $(DOCDIR)\html\fl
-        copy *.gif $(DOCDIR)\html\fl
-        -start $(WAITFLAG) tex2rtf $(THISDIR)\fl.tex $(DOCDIR)\html\fl\fl.htm -twice -html
-        -erase $(DOCDIR)\html\fl\*.con
-        -erase $(DOCDIR)\html\fl\*.ref
-        -erase $(THISDIR)\*.con
-        -erase $(THISDIR)\*.ref
-         cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\fl.chm : $(DOCDIR)\html\fl\fl.htm $(DOCDIR)\html\fl\fl.hhp
-	cd $(DOCDIR)\html\fl
-	-hhc fl.hhp
-    -mkdir ..\..\htmlhelp
-    -erase $(DOCDIR)\htmlhelp\fl.chm
-    move fl.chm ..\..\htmlhelp
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\fl.htb: $(DOCDIR)\html\fl\fl.htm
-	cd $(WXDIR)\docs\html\fl
-    -erase fl.zip fl.htb
-    zip fl.zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    move fl.zip $(DOCDIR)\htb\fl.htb
-    cd $(THISDIR)
-
-# In order to force document reprocessing
-touchfl:
-    -touch $(WXDIR)\contrib\docs\latex\fl\fl.tex
-
-updatedocs: touchfl alldocs
-
-cleandocs:
-    -erase $(DOCDIR)\winhelp\fl.hlp
-    -erase $(DOCDIR)\winhelp\fl.cnt
-    -erase $(DOCDIR)\html\fl\*.htm
-    -erase $(DOCDIR)\pdf\fl.rtf
-    -erase $(THISDIR)\fl.rtf
-    -erase $(THISDIR)\fl.PH
-    -erase $(DOCDIR)\htmlhelp\fl.chm
-    -erase $(DOCDIR)\htb\fl.htb
-
-# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
-# Office StartUp folder, and PDFMaker should be installed.
-#updatepdf:  # touchfl pdfrtf
-#    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\fl.rtf /mGeneratePDF"
-
-
diff --git a/contrib/docs/latex/fl/morphinfot.tex b/contrib/docs/latex/fl/morphinfot.tex
deleted file mode 100644
index df90d0908c..0000000000
--- a/contrib/docs/latex/fl/morphinfot.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% hintanimpl.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{MorphInfoT}}\label{morphinfot}
-
-
-A private helper class.
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/fl/hintanimpl.h>
-
-\wxheading{Data structures}
-
diff --git a/contrib/docs/latex/fl/newbitmapbutton.tex b/contrib/docs/latex/fl/newbitmapbutton.tex
deleted file mode 100644
index 7fe99e4fa6..0000000000
--- a/contrib/docs/latex/fl/newbitmapbutton.tex
+++ /dev/null
@@ -1,177 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% newbmpbtn.h at 21/Jan/02 21:14:19
-%
-
-
-\section{\class{wxNewBitmapButton}}\label{wxnewbitmapbutton}
-
-
-This is an alternative class to wxBitmapButton. It is used
-in the implementation of dynamic toolbars.
-
-\wxheading{Derived from}
-
-\helpref{wxPanel}{wxpanel}
-
-\wxheading{Include files}
-
-<wx/fl/newbmpbtn.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxNewBitmapButton::wxNewBitmapButton}\label{wxnewbitmapbuttonwxnewbitmapbutton}
-
-\func{}{wxNewBitmapButton}{\param{const wxBitmap\& }{labelBitmap = wxNullBitmap}, \param{const wxString\& }{labelText = ""}, \param{int }{alignText = NB\_ALIGN\_TEXT\_BOTTOM}, \param{bool }{isFlat = TRUE}, \param{int }{firedEventType = wxEVT\_COMMAND\_MENU\_SELECTED}, \param{int }{marginX = 2}, \param{int }{marginY = 2}, \param{int }{textToLabelGap = 2}, \param{bool }{isSticky = FALSE}}
-
-Constructor.
-
-
-\func{}{wxNewBitmapButton}{\param{const wxString\& }{bitmapFileName}, \param{const wxBitmapType }{bitmapFileType = wxBITMAP\_TYPE\_BMP}, \param{const wxString\& }{labelText = ""}, \param{int }{alignText = NB\_ALIGN\_TEXT\_BOTTOM}, \param{bool }{isFlat = TRUE}, \param{int }{firedEventType = wxEVT\_COMMAND\_MENU\_SELECTED}, \param{int }{marginX = 2}, \param{int }{marginY = 2}, \param{int }{textToLabelGap = 2}, \param{bool }{isSticky = FALSE}}
-
-Use this constructor if buttons have to be persistant
-
-
-\membersection{wxNewBitmapButton::\destruct{wxNewBitmapButton}}\label{wxnewbitmapbuttondtor}
-
-\func{}{\destruct{wxNewBitmapButton}}{\void}
-
-Destructor.
-
-
-\membersection{wxNewBitmapButton::DestroyLabels}\label{wxnewbitmapbuttondestroylabels}
-
-\func{void}{DestroyLabels}{\void}
-
-Internal function for destroying labels.
-
-
-\membersection{wxNewBitmapButton::DrawDecorations}\label{wxnewbitmapbuttondrawdecorations}
-
-\func{void}{DrawDecorations}{\param{wxDC\& }{dc}}
-
-Draws the decorations.
-
-
-\membersection{wxNewBitmapButton::DrawLabel}\label{wxnewbitmapbuttondrawlabel}
-
-\func{void}{DrawLabel}{\param{wxDC\& }{dc}}
-
-Draws the label.
-
-
-\membersection{wxNewBitmapButton::DrawShade}\label{wxnewbitmapbuttondrawshade}
-
-\func{void}{DrawShade}{\param{int }{outerLevel}, \param{wxDC\& }{dc}, \param{wxPen\& }{upperLeftSidePen}, \param{wxPen\& }{lowerRightSidePen}}
-
-Draws shading on the button.
-
-
-\membersection{wxNewBitmapButton::GetStateLabel}\label{wxnewbitmapbuttongetstatelabel}
-
-\func{wxBitmap*}{GetStateLabel}{\void}
-
-Returns the label that matches the current button state.
-
-
-\membersection{wxNewBitmapButton::IsInWindow}\label{wxnewbitmapbuttonisinwindow}
-
-\func{bool}{IsInWindow}{\param{int }{x}, \param{int }{y}}
-
-Returns TRUE if the given point is in the window.
-
-
-\membersection{wxNewBitmapButton::OnEraseBackground}\label{wxnewbitmapbuttononerasebackground}
-
-\func{void}{OnEraseBackground}{\param{wxEraseEvent\& }{event}}
-
-Responds to an erase background event.
-
-
-\membersection{wxNewBitmapButton::OnKillFocus}\label{wxnewbitmapbuttononkillfocus}
-
-\func{void}{OnKillFocus}{\param{wxFocusEvent\& }{event}}
-
-Responds to a kill focus event.
-
-
-\membersection{wxNewBitmapButton::OnLButtonDown}\label{wxnewbitmapbuttononlbuttondown}
-
-\func{void}{OnLButtonDown}{\param{wxMouseEvent\& }{event}}
-
-Responds to a left mouse button down event.
-
-
-\membersection{wxNewBitmapButton::OnLButtonUp}\label{wxnewbitmapbuttononlbuttonup}
-
-\func{void}{OnLButtonUp}{\param{wxMouseEvent\& }{event}}
-
-Responds to a left mouse button up event.
-
-
-\membersection{wxNewBitmapButton::OnMouseMove}\label{wxnewbitmapbuttononmousemove}
-
-\func{void}{OnMouseMove}{\param{wxMouseEvent\& }{event}}
-
-Responds to a mouse move event.
-
-
-\membersection{wxNewBitmapButton::OnPaint}\label{wxnewbitmapbuttononpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-Responds to a paint event.
-
-
-\membersection{wxNewBitmapButton::OnSize}\label{wxnewbitmapbuttononsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Responds to a size event.
-
-
-\membersection{wxNewBitmapButton::RenderAllLabelImages}\label{wxnewbitmapbuttonrenderalllabelimages}
-
-\func{void}{RenderAllLabelImages}{\void}
-
-Renders label images.
-
-
-\membersection{wxNewBitmapButton::RenderLabelImage}\label{wxnewbitmapbuttonrenderlabelimage}
-
-\func{void}{RenderLabelImage}{\param{wxBitmap*\& }{destBmp}, \param{wxBitmap* }{srcBmp}, \param{bool }{isEnabled = TRUE}, \param{bool }{isPressed = FALSE}}
-
-Renders the label image.
-
-
-\membersection{wxNewBitmapButton::RenderLabelImages}\label{wxnewbitmapbuttonrenderlabelimages}
-
-\func{void}{RenderLabelImages}{\void}
-
-Renders label images.
-
-
-\membersection{wxNewBitmapButton::Reshape}\label{wxnewbitmapbuttonreshape}
-
-\func{void}{Reshape}{\void}
-
-This function should be called after Create. It renders the labels, having
-reloaded the button image if necessary.
-
-
-\membersection{wxNewBitmapButton::SetAlignments}\label{wxnewbitmapbuttonsetalignments}
-
-\func{void}{SetAlignments}{\param{int }{alignText = NB\_ALIGN\_TEXT\_BOTTOM}, \param{int }{marginX = 2}, \param{int }{marginY = 2}, \param{int }{textToLabelGap = 2}}
-
-Sets the text alignment and margins.
-
-
-\membersection{wxNewBitmapButton::SetLabel}\label{wxnewbitmapbuttonsetlabel}
-
-\func{void}{SetLabel}{\param{const wxBitmap\& }{labelBitmap}, \param{const wxString\& }{labelText = ""}}
-
-Sets the label and optionally label text.
-
diff --git a/contrib/docs/latex/fl/readme.txt b/contrib/docs/latex/fl/readme.txt
deleted file mode 100644
index 138a1e073e..0000000000
--- a/contrib/docs/latex/fl/readme.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Generating the FL Reference Manual
-===================================
-
-Like the wxWindows manual, the FL manual uses Tex2RTF to
-generate HTML, MS HTML Help, wxHTML Help, WinHelp, RTF, and PDF
-formats.
-
-VC++ users can use makefile.vc in this directory, e.g.:
-
-  nmake -f makefile.vc docs      ; Create directories and
-                                 ; all formats
-
-or
-
-  nmake -f makefile.vc dirs html ; Create directories, then
-                                 ; HTML files
-
-The targets that the makefile supports are:
-
-html        ; HTML
-htb         ; wxHTML Help: the HTML files + hhp, hhc files,
-            ; archived in a fl.htb (zip format) file
-htmlhelp    ; MS HTML Help: the HTML files + hhp, hhc files
-            ; then processed with hhc to produce fl.chm
-winhelp     ; WinHelp format: Tex2RTF produces RTF and CNT
-            ; files, then the makefile invokes hc.exe to produce
-            ; the fl.hlp file
-rtf:        ; WinHelp RTF (intermediate stage for winhelp)
-pdfrtf      ; Makes an RTF file suitable for loading into
-            ; MS Word and generating a PDF via Adobe Acrobat
-
-If you wish to run Tex2RTF directly, you can do e.g.
-
-  tex2rtf $(DOCDIR)\latex\FL\manual.tex $(DOCDIR)\html\FL\fl.htm -twice -html
-
-For more information on using Tex2RTF, please see:
-
-  docs/tech/tn0003.txt: Adding wxWindows class documentation
-
-in the wxWindows hierarchy, and also utils/tex2rtf. The Tex2RTF
-manual is supplied with wxWindows documentation, in (for example)
-docs/html/tex2rtf/t2rtf.htm or docs/htmlhelp/tex2rtf.chm.
-
-You can configure the way Tex2RTF works with tex2rtf.ini in
-docs/latex/fl.
-
-Generating HTML format
-======================
-
-To generate HTML documentation, you need to use the -html
-argument to Tex2RTF. A whole directory of files will be
-generated.
-
-Generating MS HTML Help format
-==============================
-
-To generate MS HTML Help documentation, you need to generate
-the HTML files as above and then run
-
-  hhc fl.hhp
-
-You'll need the MS HTML Help compiler, obtainable from Microsoft
-or bundled with your C++ compiler.
-
-Generating wxHTML Help format
-=============================
-
-To generate wxHTML Help documentation, you need to generate
-the HTML files as above and then archive the HTML, image,
-hhc, hhp and optionally hhk files into fl.htb.
-
-The helpview program can be used to view fl.htb
-on supported platforms. Get it from the wxWindows web site
-or compile it with samples/html/helpview in the wxWindows
-distribution.
-
-Generating WinHelp format
-=========================
-
-To generate Windows Help documentation, you need to generate
-the RTF file and contents file (.cnt) using --winhelp and
-then run hc.exe to produce the .hlp file 
-
-Generating PDF format
-=====================
-
-Run Tex2RTF with the -rtf argument, load the RTF into MS Word,
-select the whole document, press F9, then apply wordstyle.dot
-found in distrib/msw in the wxWindows distribution.
-Then generate the PDF using Adobe Acrobat PDFWriter.
-
-Note that for the contents to be formatted correctly,
-each class section should end with a blank line. Otherwise
-the contents will have bits of the reference in it.
-
-Generating .tex files from .h files
-===================================
-
-Much of the class reference is generated from the headers.
-The intention is to comment the headers more thoroughly, then
-regenerate the .tex files, before working directly on the
-.tex files.
-
-To regenerate .tex files, you'll need the HelpGen utility from
-latest wxWindows CVS, in utils/helpgen/src. Compile wxBase,
-then HelpGen. Run helpgen with e.g.
-
-  helpgen dump file.h
-
-and a separate .tex file for each class will appear in the
-current directory.
-
---
-Julian Smart, January 3rd 2002
-julian.smart@btopenworld.com
-
diff --git a/contrib/docs/latex/fl/refs.bib b/contrib/docs/latex/fl/refs.bib
deleted file mode 100644
index 836814c312..0000000000
--- a/contrib/docs/latex/fl/refs.bib
+++ /dev/null
@@ -1,59 +0,0 @@
-@techreport{robins87,
-author = {Robins, Gabriel},
-title = {The {ISI} grapher: a portable tool for displaying graphs pictorially (ISI/RS-87-196)},
-institution = {University of South California},
-year = {1987},
-month = {September}
-}
-@book{helpbook,
-author = {Boggan, Scott and Fakas, David and Welinske, Joe}
-, title = {Developing on-line help for {W}indows}
-, publisher = {Sams Publishing}
-, address = {11711 North College, Carmel, Indiana 46032, USA}
-, year = {1993}
-}
-@book{wong93,
-author = {Wong, William}
-, title = {Plug and play programming}
-, publisher = {M and T Books}
-, address = {115 West 18th Street, New York, New York 10011}
-, year = {1993}
-}
-@book{pree94,
-author = {Pree, Wolfgang}
-, title = {Design patterns for object-oriented software development}
-, publisher = {Addison-Wesley}
-, address = {Reading, MA}
-, year = {1994}
-}
-@book{gamma95,
-author = {Gamma, Erich and Helm, Richard and Johnson, Ralph and Vlissides, John}
-, title = {Design patterns: elements of reusable object-oriented software}
-, publisher = {Addison-Wesley}
-, address = {Reading, MA}
-, year = {1994}
-}
-@book{kopka,
-author = {Kopka, Helmut and Daly, Patrick W.}
-, title = {A Guide to LaTeX}
-, publisher = {Addison-Wesley}
-, year = {1993}
-}
-@manual{smart95a,
-author = {Smart, Julian}
-, title = {wxCLIPS User Manual}
-, publisher = {Artificial Intelligence Applications Institute}
-, organization = {University of Edinburgh}
-, address = {80 South Bridge, Edinburgh, EH1 1HN}
-, year = {1995}
-}
-
-@manual{smart95b,
-author = {Smart, Julian}
-, title = {Tex2RTF User Manual}
-, publisher = {Artificial Intelligence Applications Institute}
-, organization = {University of Edinburgh}
-, address = {80 South Bridge, Edinburgh, EH1 1HN}
-, year = {1995}
-}
-
diff --git a/contrib/docs/latex/fl/screen01.bmp b/contrib/docs/latex/fl/screen01.bmp
deleted file mode 100644
index 16bcd0dee8..0000000000
Binary files a/contrib/docs/latex/fl/screen01.bmp and /dev/null differ
diff --git a/contrib/docs/latex/fl/screen01.gif b/contrib/docs/latex/fl/screen01.gif
deleted file mode 100644
index 372bc6ffb7..0000000000
Binary files a/contrib/docs/latex/fl/screen01.gif and /dev/null differ
diff --git a/contrib/docs/latex/fl/tevents.tex b/contrib/docs/latex/fl/tevents.tex
deleted file mode 100644
index 7e40abce1f..0000000000
--- a/contrib/docs/latex/fl/tevents.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-\section{Event macros and identifiers}\label{events}
-
-These are the event macros and event identifiers defined by FL.
-
-\twocolwidtha{7cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitemruled{{\bf Event macro}}{{\bf Event identifier}}
-\twocolitem{EVT\_PL\_LEFT\_DOWN(func)}{cbEVT\_PL\_LEFT\_DOWN}
-\twocolitem{EVT\_PL\_LEFT\_UP(func)}{cbEVT\_PL\_LEFT\_UP}
-\twocolitem{EVT\_PL\_RIGHT\_DOWN(func)}{cbEVT\_PL\_RIGHT\_DOWN}
-\twocolitem{EVT\_PL\_RIGHT\_UP(func)}{cbEVT\_PL\_RIGHT\_UP}
-\twocolitem{EVT\_PL\_MOTION(func)}{cbEVT\_PL\_MOTION}
-\twocolitem{EVT\_PL\_LEFT\_DCLICK(func)}{cbEVT\_PL\_LEFT\_DCLICK}
-
-\twocolitem{EVT\_PL\_LAYOUT\_ROW(func)}{cbEVT\_PL\_LAYOUT\_ROW}
-\twocolitem{EVT\_PL\_RESIZE\_ROW(func)}{cbEVT\_PL\_RESIZE\_ROW}
-\twocolitem{EVT\_PL\_LAYOUT\_ROWS(func)}{cbEVT\_PL\_LAYOUT\_ROWS}
-\twocolitem{EVT\_PL\_INSERT\_BAR(func)}{cbEVT\_PL\_INSERT\_BAR}
-\twocolitem{EVT\_PL\_RESIZE\_BAR(func)}{cbEVT\_PL\_RESIZE\_BAR}
-\twocolitem{EVT\_PL\_REMOVE\_BAR(func)}{cbEVT\_PL\_REMOVE\_BAR}
-\twocolitem{EVT\_PL\_SIZE\_BAR\_WND(func)}{cbEVT\_PL\_SIZE\_BAR\_WND}
-
-\twocolitem{EVT\_PL\_DRAW\_BAR\_DECOR(func)}{cbEVT\_PL\_DRAW\_BAR\_DECOR}
-\twocolitem{EVT\_PL\_DRAW\_ROW\_DECOR(func)}{cbEVT\_PL\_DRAW\_ROW\_DECOR}
-\twocolitem{EVT\_PL\_DRAW\_PANE\_DECOR(func)}{cbEVT\_PL\_DRAW\_PANE\_DECOR}
-\twocolitem{EVT\_PL\_DRAW\_BAR\_HANDLES(func)}{cbEVT\_PL\_DRAW\_BAR\_HANDLES}
-\twocolitem{EVT\_PL\_DRAW\_ROW\_HANDLES(func)}{cbEVT\_PL\_DRAW\_ROW\_HANDLES}
-\twocolitem{EVT\_PL\_DRAW\_ROW\_BKGROUND(func)}{cbEVT\_PL\_DRAW\_ROW\_BKGROUND}
-\twocolitem{EVT\_PL\_DRAW\_PANE\_BKGROUND(func)}{cbEVT\_PL\_DRAW\_PANE\_BKGROUND}
-
-\twocolitem{EVT\_PL\_START\_BAR\_DRAGGING(func)}{cbEVT\_PL\_START\_BAR\_DRAGGING}
-\twocolitem{EVT\_PL\_DRAW\_HINT\_RECT(func)}{cbEVT\_PL\_DRAW\_HINT\_RECT}
-
-\twocolitem{EVT\_PL\_START\_DRAW\_IN\_AREA(func)}{cbEVT\_PL\_START\_DRAW\_IN\_AREA}
-\twocolitem{EVT\_PL\_FINISH\_DRAW\_IN\_AREA(func)}{cbEVT\_PL\_FINISH\_DRAW\_IN\_AREA}
-
-\twocolitem{EVT\_PL\_CUSTOMIZE\_BAR(func)}{cbEVT\_PL\_CUSTOMIZE\_BAR}
-\twocolitem{EVT\_PL\_CUSTOMIZE\_LAYOUT(func)}{cbEVT\_PL\_CUSTOMIZE\_LAYOUT}
-\end{twocollist}
-
-See also the classes:
-
-\twocolwidtha{7cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{cbCustomizeBarEvent}{cbcustomizebarevent}}{Class for bar customization events.}
-\twocolitem{\helpref{cbCustomizeLayoutEvent}{cbcustomizelayoutevent}}{Class for layout customization events.}
-\twocolitem{\helpref{cbDrawBarDecorEvent}{cbdrawbardecorevent}}{Class for bar decoration drawing events.}
-\twocolitem{\helpref{cbDrawBarHandlesEvent}{cbdrawbarhandlesevent}}{Class for bar handles drawing events.}
-\twocolitem{\helpref{cbDrawHintRectEvent}{cbdrawhintrectevent}}{Class for hint-rectangle drawing events.}
-\twocolitem{\helpref{cbDrawPaneBkGroundEvent}{cbdrawpanebkgroundevent}}{Class for pane background drawing events.}
-\twocolitem{\helpref{cbDrawPaneDecorEvent}{cbdrawpanedecorevent}}{Class for pane decoration drawing events.}
-\twocolitem{\helpref{cbDrawRowBkGroundEvent}{cbdrawrowbkgroundevent}}{Class for row background drawing events.}
-\twocolitem{\helpref{cbDrawRowDecorEvent}{cbdrawrowdecorevent}}{Class for row decoration drawing events.}
-\twocolitem{\helpref{cbDrawRowHandlesEvent}{cbdrawrowhandlesevent}}{Class for row handles drawing events.}
-\twocolitem{\helpref{cbFinishDrawInAreaEvent}{cbfinishdrawinareaevent}}{Class for finish drawing in area events.}
-\twocolitem{\helpref{cbInsertBarEvent}{cbinsertbarevent}}{Class for bar insertion events.}
-\twocolitem{\helpref{cbLayoutRowEvent}{cblayoutrowevent}}{Class for single row layout events.}
-\twocolitem{\helpref{cbLayoutRowsEvent}{cblayoutrowsevent}}{Class for multiple rows layout events.}
-\twocolitem{\helpref{cbLeftDClickEvent}{cbleftdclickevent}}{Class for mouse left double click events.}
-\twocolitem{\helpref{cbLeftDownEvent}{cbleftdownevent}}{Class for mouse left down events.}
-\twocolitem{\helpref{cbLeftUpEvent}{cbleftupevent}}{Class for mouse left up events.}
-\twocolitem{\helpref{cbMotionEvent}{cbmotionevent}}{Class for mouse motion events.}
-\twocolitem{\helpref{cbPluginEvent}{cbpluginevent}}{Base class for all control-bar plugin events.}
-\twocolitem{\helpref{cbRemoveBarEvent}{cbremovebarevent}}{Class for bar removal events.}
-\twocolitem{\helpref{cbResizeBarEvent}{cbresizebarevent}}{Class for bar resize events.}
-\twocolitem{\helpref{cbResizeRowEvent}{cbresizerowevent}}{Class for row resize events.}
-\twocolitem{\helpref{cbRightDownEvent}{cbrightdownevent}}{Class for mouse right down events.}
-\twocolitem{\helpref{cbRightUpEvent}{cbrightupevent}}{Class for mouse right up events.}
-\twocolitem{\helpref{cbSizeBarWndEvent}{cbsizebarwndevent}}{Class for bar window resize events.}
-\twocolitem{\helpref{cbStartBarDraggingEvent}{cbstartbardraggingevent}}{Class for start-bar-dragging events.}
-\twocolitem{\helpref{cbStartDrawInAreaEvent}{cbstartdrawinareaevent}}{Class for start drawing in area events.}
-\end{twocollist}
-
diff --git a/contrib/docs/latex/fl/tex2rtf.ini b/contrib/docs/latex/fl/tex2rtf.ini
deleted file mode 100644
index 00043c3ca1..0000000000
--- a/contrib/docs/latex/fl/tex2rtf.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-contentsDepth = 2
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "FL Manual"
-truncateFilenames = yes
-combineSubSections = yes
-; A new option to allow references to wxWindows classes to be displayed as if
-; without the \helpref command.
-ignoreBadRefs = yes
-; Finally, a way to specify face names
-htmlFaceName = "Arial, Lucida, Helvetica"
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-htmlWorkshopFiles = true
-htmlIndex = true
-
-\overview [2] {\helpref{#1}{#2}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-%\wxheading [1]{{\bf \fcol{blue}{#1}}}
-\wxheading [1]{{\bf #1}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-\bftt [1] {\bf{\tt{#1}}}
-\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-%\pythonnote [1] {}
-\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1}
-
diff --git a/contrib/docs/latex/fl/toollayoutitem.tex b/contrib/docs/latex/fl/toollayoutitem.tex
deleted file mode 100644
index f40864b1eb..0000000000
--- a/contrib/docs/latex/fl/toollayoutitem.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dyntbar.h at 21/Jan/02 21:14:18
-%
-
-
-\section{\class{wxToolLayoutItem}}\label{wxtoollayoutitem}
-
-
-Tool layout item.
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Include files}
-
-<wx/fl/dyntbar.h>
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef wxToolLayoutItem* wxToolLayoutItemPtrT
-\end{verbatim}}
-
-{\small \begin{verbatim}
-typedef wxDynToolInfo* wxDynToolInfoPtrT
-\end{verbatim}}
-
diff --git a/contrib/docs/latex/fl/toolwindow.tex b/contrib/docs/latex/fl/toolwindow.tex
deleted file mode 100644
index e278a857a5..0000000000
--- a/contrib/docs/latex/fl/toolwindow.tex
+++ /dev/null
@@ -1,193 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% toolwnd.h at 21/Jan/02 21:14:17
-%
-
-
-\section{\class{wxToolWindow}}\label{wxtoolwindow}
-
-
-A tool window is a special kind of frame that paints its own title, and
-can be used to implement small floating windows.
-
-\wxheading{Derived from}
-
-\helpref{wxFrame}{wxframe}
-
-\wxheading{Include files}
-
-<wx/fl/toolwnd.h>
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxToolWindow::wxToolWindow}\label{wxtoolwindowwxtoolwindow}
-
-\func{}{wxToolWindow}{\void}
-
-Default constructor.
-
-
-\membersection{wxToolWindow::\destruct{wxToolWindow}}\label{wxtoolwindowdtor}
-
-\func{}{\destruct{wxToolWindow}}{\void}
-
-Destructor.
-
-
-\membersection{wxToolWindow::AddMiniButton}\label{wxtoolwindowaddminibutton}
-
-\func{void}{AddMiniButton}{\param{cbMiniButton* }{pBtn}}
-
-Adds a button. Buttons are added in right-to-left order.
-
-
-\membersection{wxToolWindow::AdjustRectPos}\label{wxtoolwindowadjustrectpos}
-
-\func{void}{AdjustRectPos}{\param{const wxRect\& }{original}, \param{const wxSize\& }{newDim}, \param{wxRect\& }{newRect}}
-
-Helper function.
-
-
-\membersection{wxToolWindow::CalcResizedRect}\label{wxtoolwindowcalcresizedrect}
-
-\func{void}{CalcResizedRect}{\param{wxRect\& }{rect}, \param{wxPoint\& }{delta}, \param{const wxSize\& }{minDim}}
-
-Calculate resized rectangle.
-
-
-\membersection{wxToolWindow::DrawHintRect}\label{wxtoolwindowdrawhintrect}
-
-\func{void}{DrawHintRect}{\param{const wxRect\& }{r}}
-
-Draws the hint rectangle.
-
-
-\membersection{wxToolWindow::GetClient}\label{wxtoolwindowgetclient}
-
-\func{wxWindow*}{GetClient}{\void}
-
-Returns the client window.
-
-
-\membersection{wxToolWindow::GetMinimalWndDim}\label{wxtoolwindowgetminimalwnddim}
-
-\func{wxSize}{GetMinimalWndDim}{\void}
-
-Helper function.
-
-
-\membersection{wxToolWindow::GetPreferredSize}\label{wxtoolwindowgetpreferredsize}
-
-\func{wxSize}{GetPreferredSize}{\param{const wxSize\& }{given}}
-
-Returns the preferred size for the window.
-
-
-\membersection{wxToolWindow::GetScrMousePos}\label{wxtoolwindowgetscrmousepos}
-
-\func{void}{GetScrMousePos}{\param{wxMouseEvent\& }{event}, \param{wxPoint\& }{pos}}
-
-Gets the mouse position in screen coordinates.
-
-
-\membersection{wxToolWindow::GetScrWindowRect}\label{wxtoolwindowgetscrwindowrect}
-
-\func{void}{GetScrWindowRect}{\param{wxRect\& }{r}}
-
-Maps client coordinates to screen coordinates.
-
-
-\membersection{wxToolWindow::HandleTitleClick}\label{wxtoolwindowhandletitleclick}
-
-\func{bool}{HandleTitleClick}{\param{wxMouseEvent\& }{event}}
-
-Handles clicking on the title. By default, does nothing.
-
-
-\membersection{wxToolWindow::HitTestWindow}\label{wxtoolwindowhittestwindow}
-
-\func{int}{HitTestWindow}{\param{wxMouseEvent\& }{event}}
-
-Tests if the mouse position is in this window.
-
-
-\membersection{wxToolWindow::LayoutMiniButtons}\label{wxtoolwindowlayoutminibuttons}
-
-\func{void}{LayoutMiniButtons}{\void}
-
-Lays out the buttons.
-
-
-\membersection{wxToolWindow::OnEraseBackground}\label{wxtoolwindowonerasebackground}
-
-\func{void}{OnEraseBackground}{\param{wxEraseEvent\& }{event}}
-
-Responds to an erase background event.
-
-
-\membersection{wxToolWindow::OnLeftDown}\label{wxtoolwindowonleftdown}
-
-\func{void}{OnLeftDown}{\param{wxMouseEvent\& }{event}}
-
-Responds to a mouse left down event.
-
-
-\membersection{wxToolWindow::OnLeftUp}\label{wxtoolwindowonleftup}
-
-\func{void}{OnLeftUp}{\param{wxMouseEvent\& }{event}}
-
-Responds to a mouse left up event.
-
-
-\membersection{wxToolWindow::OnMiniButtonClicked}\label{wxtoolwindowonminibuttonclicked}
-
-\func{void}{OnMiniButtonClicked}{\param{int }{btnIdx}}
-
-Called when a mini button is clicked.
-By default, does nothing.
-
-
-\membersection{wxToolWindow::OnMotion}\label{wxtoolwindowonmotion}
-
-\func{void}{OnMotion}{\param{wxMouseEvent\& }{event}}
-
-Responds to a mouse move event.
-
-
-\membersection{wxToolWindow::OnPaint}\label{wxtoolwindowonpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-Responds to a paint event.
-
-
-\membersection{wxToolWindow::OnSize}\label{wxtoolwindowonsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Responds to a size event.
-
-
-\membersection{wxToolWindow::SetClient}\label{wxtoolwindowsetclient}
-
-\func{void}{SetClient}{\param{wxWindow* }{pWnd}}
-
-Sets the client for this tool window.
-
-
-\membersection{wxToolWindow::SetHintCursor}\label{wxtoolwindowsethintcursor}
-
-\func{void}{SetHintCursor}{\param{int }{type}}
-
-Sets the hint cursor.
-
-
-\membersection{wxToolWindow::SetTitleFont}\label{wxtoolwindowsettitlefont}
-
-\func{void}{SetTitleFont}{\param{wxFont\& }{font}}
-
-Sets the title font.
-
diff --git a/contrib/docs/latex/fl/topics.tex b/contrib/docs/latex/fl/topics.tex
deleted file mode 100644
index edb3b94cf6..0000000000
--- a/contrib/docs/latex/fl/topics.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\chapter{Topic overviews}\label{overviews}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This chapter contains a selection of topic overviews, first things first:
-
-\input tusage.tex
-\input tevents.tex
-\input faq.tex
-
diff --git a/contrib/docs/latex/fl/tusage.tex b/contrib/docs/latex/fl/tusage.tex
deleted file mode 100644
index ba9d767ada..0000000000
--- a/contrib/docs/latex/fl/tusage.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\section{Notes on using the reference}\label{referencenotes}
-
-In the descriptions of the wxWindows classes and their member
-functions, note that descriptions of inherited member functions are not
-duplicated in derived classes unless their behaviour is different. So in
-using a class such as wxScrolledWindow, be aware that wxWindow functions may be
-relevant.
-
-Note also that arguments with default values may be omitted from a
-function call, for brevity. Size and position arguments may usually be
-given a value of -1 (the default), in which case wxWindows will choose a
-suitable value.
-
-Most strings are returned as wxString objects. However, for remaining
-char * return values, the strings are allocated and
-deallocated by wxWindows. Therefore, return values should always be
-copied for long-term use, especially since the same buffer is often
-used by wxWindows.
-
-The member functions are given in alphabetical order except for
-constructors and destructors which appear first.
-
diff --git a/contrib/docs/latex/fl/up.gif b/contrib/docs/latex/fl/up.gif
deleted file mode 100644
index 870c89e80a..0000000000
Binary files a/contrib/docs/latex/fl/up.gif and /dev/null differ
diff --git a/contrib/docs/latex/gizmos/back.gif b/contrib/docs/latex/gizmos/back.gif
deleted file mode 100644
index 88a3740f91..0000000000
Binary files a/contrib/docs/latex/gizmos/back.gif and /dev/null differ
diff --git a/contrib/docs/latex/gizmos/body.tex b/contrib/docs/latex/gizmos/body.tex
deleted file mode 100644
index 05ff33a594..0000000000
--- a/contrib/docs/latex/gizmos/body.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\chapter{Introduction}\label{introduction}
-\pagenumbering{arabic}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{What is the Gizmos library?}
-
-This manual describes a class library with a miscellany of useful user interface
-classes.
-
diff --git a/contrib/docs/latex/gizmos/bullet.bmp b/contrib/docs/latex/gizmos/bullet.bmp
deleted file mode 100644
index 6481f5143b..0000000000
Binary files a/contrib/docs/latex/gizmos/bullet.bmp and /dev/null differ
diff --git a/contrib/docs/latex/gizmos/category.tex b/contrib/docs/latex/gizmos/category.tex
deleted file mode 100644
index 8484135622..0000000000
--- a/contrib/docs/latex/gizmos/category.tex
+++ /dev/null
@@ -1,30 +0,0 @@
-\chapter{Classes by category}\label{classesbycat}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-A classification of Gizmos classes by category.
-\twocolwidtha{5cm}
-
-\begin{comment}
-{\large {\bf Service classes}}
-
-\overview{wxMPService class overview}{wxmpserviceoverview}
-
-Service classes reduce the diversity of PMF classes, by making
-them comply to a common interface. A service class serves as an interface (or
-mix-in class in C++ terms), which cannot itself represent an
-independent object. It should be inherited as a second (or
-third) base class.
-
-Derived services classes all derive from wxEvtHandler as well as
-wxPMService.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxPMService}{wxpmservice}}{Base class}
-\twocolitem{\helpref{wxPMBootstrapService}{wxpmbootstrapservice}}{Boot strap service}
-\twocolitem{\helpref{wxPMLAlgorithm}{wxpmlalgorithm}}{Layout algorithm service}
-\twocolitem{\helpref{wxPMSashLayoutAlgorithm}{wxpmsashlayoutalgorithm}}{Sash layout algorithm service}
-\twocolitem{\helpref{wxPMPane}{wxpmpane}}{Base class for panes lying outside the MDI client area}
-\end{twocollist}
-\end{comment}
-
diff --git a/contrib/docs/latex/gizmos/classes.tex b/contrib/docs/latex/gizmos/classes.tex
deleted file mode 100644
index 20edd1e691..0000000000
--- a/contrib/docs/latex/gizmos/classes.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\chapter{Alphabetical class reference}\label{classref}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-% NB: the files should be in alphabetic order of the classes documented in
-%     them and *not* in alphabetic order of the file names!
-
-\input dynamicsashsplitevent.tex
-\input dynamicsashunifyevent.tex
-\input dynamicsashwindow.tex
-\input editablelistbox.tex
-\input lednumberctrl.tex
-\input multicellcanvas.tex
-\input multicellitemhandle.tex
-\input multicellsizer.tex
-\input remotelyscrolledtreectrl.tex
-\input splitterscrolledwindow.tex
-\input thinsplitterwindow.tex
-\input treecompanionwindow.tex
diff --git a/contrib/docs/latex/gizmos/contents.gif b/contrib/docs/latex/gizmos/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/docs/latex/gizmos/contents.gif and /dev/null differ
diff --git a/contrib/docs/latex/gizmos/dynamicsashsplitevent.tex b/contrib/docs/latex/gizmos/dynamicsashsplitevent.tex
deleted file mode 100644
index 6367cc84e9..0000000000
--- a/contrib/docs/latex/gizmos/dynamicsashsplitevent.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dynamicsash.h at 05/Jan/02 23:08:13
-%
-
-
-\section{\class{wxDynamicSashSplitEvent}}\label{wxdynamicsashsplitevent}
-
-
-wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
-    whenever your view is being split by the user.  It is your
-    responsibility to handle this event by creating a new view window as
-    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
-    automatically reparent it to the proper place in its window hierarchy.
-
-\wxheading{Derived from}
-
-\helpref{wxCommandEvent}{wxcommandevent}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxDynamicSashSplitEvent::wxDynamicSashSplitEvent}\label{wxdynamicsashspliteventwxdynamicsashsplitevent}
-
-\func{}{wxDynamicSashSplitEvent}{\param{const wxDynamicSashSplitEvent\& }{event}}
-
-
-\func{}{wxDynamicSashSplitEvent}{\param{wxObject* }{target}}
-
-
-\func{}{wxDynamicSashSplitEvent}{\void}
-
-
-\membersection{wxDynamicSashSplitEvent::Clone}\label{wxdynamicsashspliteventclone}
-
-\constfunc{wxEvent*}{Clone}{\void}
-
diff --git a/contrib/docs/latex/gizmos/dynamicsashunifyevent.tex b/contrib/docs/latex/gizmos/dynamicsashunifyevent.tex
deleted file mode 100644
index 1529dd8c99..0000000000
--- a/contrib/docs/latex/gizmos/dynamicsashunifyevent.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dynamicsash.h at 05/Jan/02 23:08:13
-%
-
-
-\section{\class{wxDynamicSashUnifyEvent}}\label{wxdynamicsashunifyevent}
-
-
-wxDynamicSashUnifyEvents are sent to your view by wxDynamicSashWindow
-    whenever the sash which splits your view and its sibling is being
-    reunified such that your view is expanding to replace its sibling.
-    You needn't do anything with this event if you are allowing
-    wxDynamicSashWindow to manage your view's scrollbars, but it is useful
-    if you are managing the scrollbars yourself so that you can keep
-    the scrollbars' event handlers connected to your view's event handler
-    class.
-
-\wxheading{Derived from}
-
-\helpref{wxCommandEvent}{wxcommandevent}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxDynamicSashUnifyEvent::wxDynamicSashUnifyEvent}\label{wxdynamicsashunifyeventwxdynamicsashunifyevent}
-
-\func{}{wxDynamicSashUnifyEvent}{\param{const wxDynamicSashUnifyEvent\& }{event}}
-
-
-\func{}{wxDynamicSashUnifyEvent}{\param{wxObject* }{target}}
-
-
-\func{}{wxDynamicSashUnifyEvent}{\void}
-
-
-\membersection{wxDynamicSashUnifyEvent::Clone}\label{wxdynamicsashunifyeventclone}
-
-\constfunc{wxEvent*}{Clone}{\void}
-
diff --git a/contrib/docs/latex/gizmos/dynamicsashwindow.tex b/contrib/docs/latex/gizmos/dynamicsashwindow.tex
deleted file mode 100644
index 039b5cacce..0000000000
--- a/contrib/docs/latex/gizmos/dynamicsashwindow.tex
+++ /dev/null
@@ -1,54 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% dynamicsash.h at 05/Jan/02 23:08:13
-%
-
-
-\section{\class{wxDynamicSashWindow}}\label{wxdynamicsashwindow}
-
-
-wxDynamicSashWindow.  See above.
-
-\wxheading{Derived from}
-
-\helpref{wxWindow}{wxwindow}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxDynamicSashWindow::wxDynamicSashWindow}\label{wxdynamicsashwindowwxdynamicsashwindow}
-
-\func{}{wxDynamicSashWindow}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long style = wxCLIP\_CHILDREN | wxDS\_MANAGE\_SCROLLBARS | }{wxDS\_DRAG\_CORNER}, \param{const wxString\& }{name = "dynamicSashWindow"}}
-
-
-\func{}{wxDynamicSashWindow}{\void}
-
-
-\membersection{wxDynamicSashWindow::\destruct{wxDynamicSashWindow}}\label{wxdynamicsashwindowdtor}
-
-\func{}{\destruct{wxDynamicSashWindow}}{\void}
-
-
-\membersection{wxDynamicSashWindow::AddChild}\label{wxdynamicsashwindowaddchild}
-
-\func{void}{AddChild}{\param{wxWindowBase* }{child}}
-
-This is overloaded from wxWindowBase.  It's not here for you to
-        call directly.  
-
-\membersection{wxDynamicSashWindow::Create}\label{wxdynamicsashwindowcreate}
-
-\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long style = wxCLIP\_CHILDREN | wxDS\_MANAGE\_SCROLLBARS | }{wxDS\_DRAG\_CORNER}, \param{const wxString\& }{name = "dynamicSashWindow"}}
-
-
-\membersection{wxDynamicSashWindow::GetHScrollBar}\label{wxdynamicsashwindowgethscrollbar}
-
-\constfunc{wxScrollBar*}{GetHScrollBar}{\param{const wxWindow* }{child}}
-
-
-\membersection{wxDynamicSashWindow::GetVScrollBar}\label{wxdynamicsashwindowgetvscrollbar}
-
-\constfunc{wxScrollBar*}{GetVScrollBar}{\param{const wxWindow* }{child}}
-
diff --git a/contrib/docs/latex/gizmos/editablelistbox.tex b/contrib/docs/latex/gizmos/editablelistbox.tex
deleted file mode 100644
index d993eaf533..0000000000
--- a/contrib/docs/latex/gizmos/editablelistbox.tex
+++ /dev/null
@@ -1,70 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% editlbox.h at 05/Jan/02 23:08:13
-%
-
-
-\section{\class{wxEditableListBox}}\label{wxeditablelistbox}
-
-
-This class provides a composite control that lets the
-user easily enter list of strings
-
-\wxheading{Derived from}
-
-\helpref{wxPanel}{wxpanel}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxEditableListBox::wxEditableListBox}\label{wxeditablelistboxwxeditablelistbox}
-
-\func{}{wxEditableListBox}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{label}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{const wxString\& }{name = wxT("editableListBox")}}
-
-
-\membersection{wxEditableListBox::GetStrings}\label{wxeditablelistboxgetstrings}
-
-\func{void}{GetStrings}{\param{wxArrayString\& }{strings}}
-
-
-\membersection{wxEditableListBox::OnDelItem}\label{wxeditablelistboxondelitem}
-
-\func{void}{OnDelItem}{\param{wxCommandEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnDownItem}\label{wxeditablelistboxondownitem}
-
-\func{void}{OnDownItem}{\param{wxCommandEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnEditItem}\label{wxeditablelistboxonedititem}
-
-\func{void}{OnEditItem}{\param{wxCommandEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnEndLabelEdit}\label{wxeditablelistboxonendlabeledit}
-
-\func{void}{OnEndLabelEdit}{\param{wxListEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnItemSelected}\label{wxeditablelistboxonitemselected}
-
-\func{void}{OnItemSelected}{\param{wxListEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnNewItem}\label{wxeditablelistboxonnewitem}
-
-\func{void}{OnNewItem}{\param{wxCommandEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::OnUpItem}\label{wxeditablelistboxonupitem}
-
-\func{void}{OnUpItem}{\param{wxCommandEvent\& }{event}}
-
-
-\membersection{wxEditableListBox::SetStrings}\label{wxeditablelistboxsetstrings}
-
-\func{void}{SetStrings}{\param{const wxArrayString\& }{strings}}
-
diff --git a/contrib/docs/latex/gizmos/forward.gif b/contrib/docs/latex/gizmos/forward.gif
deleted file mode 100644
index d8862174ed..0000000000
Binary files a/contrib/docs/latex/gizmos/forward.gif and /dev/null differ
diff --git a/contrib/docs/latex/gizmos/lednumberctrl.tex b/contrib/docs/latex/gizmos/lednumberctrl.tex
deleted file mode 100644
index 3fb75ad5b1..0000000000
--- a/contrib/docs/latex/gizmos/lednumberctrl.tex
+++ /dev/null
@@ -1,68 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% ledctrl.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxLEDNumberCtrl}}\label{wxlednumberctrl}
-
-
-
-wxLEDNumberCtrl
-
-
-\wxheading{Derived from}
-
-\helpref{wxControl}{wxcontrol}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxLEDNumberCtrl::wxLEDNumberCtrl}\label{wxlednumberctrlwxlednumberctrl}
-
-\func{}{wxLEDNumberCtrl}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long style = wxLED\_ALIGN\_LEFT | }{wxLED\_DRAW\_FADED}}
-
-
-\func{}{wxLEDNumberCtrl}{\void}
-
-Constructors.
-
-
-\membersection{wxLEDNumberCtrl::Create}\label{wxlednumberctrlcreate}
-
-\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = 0}}
-
-Create functions.
-
-
-\membersection{wxLEDNumberCtrl::GetAlignment}\label{wxlednumberctrlgetalignment}
-
-\constfunc{wxLEDValueAlign}{GetAlignment}{\void}
-
-
-\membersection{wxLEDNumberCtrl::GetDrawFaded}\label{wxlednumberctrlgetdrawfaded}
-
-\constfunc{bool}{GetDrawFaded}{\void}
-
-
-\membersection{wxLEDNumberCtrl::GetValue}\label{wxlednumberctrlgetvalue}
-
-\constfunc{const wxString\&}{GetValue}{\void}
-
-
-\membersection{wxLEDNumberCtrl::SetAlignment}\label{wxlednumberctrlsetalignment}
-
-\func{void}{SetAlignment}{\param{wxLEDValueAlign }{Alignment}, \param{bool }{Redraw = TRUE}}
-
-
-\membersection{wxLEDNumberCtrl::SetDrawFaded}\label{wxlednumberctrlsetdrawfaded}
-
-\func{void}{SetDrawFaded}{\param{bool }{DrawFaded}, \param{bool }{Redraw = TRUE}}
-
-
-\membersection{wxLEDNumberCtrl::SetValue}\label{wxlednumberctrlsetvalue}
-
-\func{void}{SetValue}{\param{const wxString\& }{Value}, \param{bool }{Redraw = TRUE}}
-
diff --git a/contrib/docs/latex/gizmos/makefile.vc b/contrib/docs/latex/gizmos/makefile.vc
deleted file mode 100644
index e104b70db5..0000000000
--- a/contrib/docs/latex/gizmos/makefile.vc
+++ /dev/null
@@ -1,107 +0,0 @@
-# File:     makefile.vc
-# Author:   Julian Smart
-# Created:  2002
-# Updated:
-# Copyright: (c) 2002, Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile : Builds documents using VC++ nmake
-#
-
-WXDIR=$(WXWIN)
-THISDIR=$(WXDIR)\contrib\docs\latex\gizmos
-DOCDIR = $(WXDIR)\docs
-WAITFLAG=/w
-
-docs:   dirs winhelp html pdfrtf htb htmlhelp
-winhelp:    $(DOCDIR)/winhelp/gizmos.hlp
-rtf:    $(THISDIR)/latex/gizmos/gizmos.rtf
-pdfrtf: $(DOCDIR)/pdf/gizmos.rtf
-htb:	$(DOCDIR)\htb\gizmos.htb
-html:	$(DOCDIR)\html\gizmos\gizmos.htm
-htmlhelp: $(DOCDIR)\htmlhelp\gizmos.chm
-
-dirs:
-        -mkdir $(DOCDIR)\winhelp
-        -mkdir $(DOCDIR)\html
-        -mkdir $(DOCDIR)\html\gizmos
-        -mkdir $(DOCDIR)\htmlhelp
-        -mkdir $(DOCDIR)\htb
-        -mkdir $(DOCDIR)\pdf
-
-$(DOCDIR)/winhelp/gizmos.hlp:         $(THISDIR)/gizmos.rtf $(THISDIR)/gizmos.hpj
-        cd $(THISDIR)
-        -erase gizmos.ph
-        hc gizmos
-        -erase $(DOCDIR)\winhelp\gizmos.hlp
-        -erase $(DOCDIR)\winhelp\gizmos.cnt
-        move gizmos.hlp $(DOCDIR)\winhelp\gizmos.hlp
-        move gizmos.cnt $(DOCDIR)\winhelp\gizmos.cnt
-        cd $(THISDIR)
-
-$(THISDIR)/gizmos.rtf:         $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/manual.tex
-        cd $(THISDIR)
-        -start $(WAITFLAG) tex2rtf $(THISDIR)/manual.tex $(THISDIR)/gizmos.rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)/pdf/gizmos.rtf:         $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/manual.tex
-        cd $(THISDIR)
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(THISDIR)/manual.tex $(DOCDIR)/pdf/gizmos.rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\gizmos\gizmos.htm:         $(THISDIR)\classes.tex $(THISDIR)\body.tex $(THISDIR)/topics.tex $(THISDIR)\manual.tex
-        cd $(THISDIR)
-        -mkdir $(DOCDIR)\html\gizmos
-        copy *.gif $(DOCDIR)\html\gizmos
-        -start $(WAITFLAG) tex2rtf $(THISDIR)\manual.tex $(DOCDIR)\html\gizmos\gizmos.htm -twice -html
-        -erase $(DOCDIR)\html\gizmos\*.con
-        -erase $(DOCDIR)\html\gizmos\*.ref
-        -erase $(THISDIR)\*.con
-        -erase $(THISDIR)\*.ref
-         cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\gizmos.chm : $(DOCDIR)\html\gizmos\gizmos.htm $(DOCDIR)\html\gizmos\gizmos.hhp
-	cd $(DOCDIR)\html\gizmos
-	-hhc gizmos.hhp
-    -mkdir ..\..\htmlhelp
-    -erase $(DOCDIR)\htmlhelp\gizmos.chm
-    move gizmos.chm ..\..\htmlhelp
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\gizmos.htb: $(DOCDIR)\html\gizmos\gizmos.htm
-	cd $(WXDIR)\docs\html\gizmos
-    -erase gizmos.zip gizmos.htb
-    zip gizmos.zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    move gizmos.zip $(DOCDIR)\htb\gizmos.htb
-    cd $(THISDIR)
-
-# In order to force document reprocessing
-touchmanual:
-    -touch $(WXDIR)\docs\latex\gizmos\manual.tex
-
-updatedocs: touchmanual alldocs
-
-cleandocs:
-    -erase $(DOCDIR)\winhelp\gizmos.hlp
-    -erase $(DOCDIR)\winhelp\gizmos.cnt
-    -erase $(DOCDIR)\html\gizmos\*.htm
-    -erase $(DOCDIR)\pdf\gizmos.rtf
-    -erase $(THISDIR)\gizmos.rtf
-    -erase $(THISDIR)\gizmos.PH
-    -erase $(DOCDIR)\htmlhelp\gizmos.chm
-    -erase $(DOCDIR)\htb\gizmos.htb
-
-# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
-# Office StartUp folder, and PDFMaker should be installed.
-#updatepdf:  # touchmanual pdfrtf
-#    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\gizmos.rtf /mGeneratePDF"
-
-
diff --git a/contrib/docs/latex/gizmos/manual.tex b/contrib/docs/latex/gizmos/manual.tex
deleted file mode 100644
index ad8f1ab753..0000000000
--- a/contrib/docs/latex/gizmos/manual.tex
+++ /dev/null
@@ -1,75 +0,0 @@
-\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
-% JACS: doesn't make it through Tex2RTF, sorry. I will put it into texhelp.sty
-% since Tex2RTF doesn't parse it.
-% BTW, style MUST be report for it to work for Tex2RTF.
-%KB:
-%\addtolength{\textwidth}{1in}
-%\addtolength{\oddsidemargin}{-0.5in}
-%\addtolength{\topmargin}{-0.5in}
-%\addtolength{\textheight}{1in}
-%\sloppy
-%end of my changes
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\pipe}[0]{$\|$\ }%
-\definecolour{black}{0}{0}{0}%
-\definecolour{cyan}{0}{255}{255}%
-\definecolour{green}{0}{255}{0}%
-\definecolour{magenta}{255}{0}{255}%
-\definecolour{red}{255}{0}{0}%
-\definecolour{blue}{0}{0}{200}%
-\definecolour{yellow}{255}{255}{0}%
-\definecolour{white}{255}{255}{255}%
-%
-\input psbox.tex
-% Remove this for processing with dvi2ps instead of dvips
-%\special{!/@scaleunit 1 def}
-\parskip=10pt
-\parindent=0pt
-\title{Gizmos: a library of enhanced controls}
-\author{by Julian Smart and others}
-\date{January 5th 2002}
-
-\makeindex
-\begin{document}
-\maketitle
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\pagenumbering{roman}
-\tableofcontents
-
-\chapter{Copyright notice}
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-The licence is the wxWindows Licence.
-
-\input{body.tex}
-\input{classes.tex}
-\input{category.tex}
-\input{topics.tex}
-
-\bibliography{refs}
-\addcontentsline{toc}{chapter}{Bibliography}
-\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\newpage
-% Note: In RTF, the \printindex must come before the
-% change of header/footer, since the \printindex inserts
-% the RTF \sect command which divides one chapter from
-% the next.
-\rtfonly{\printindex
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-}
-% In Latex, it must be this way around (I think)
-\latexonly{\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\printindex
-}
-
-\end{document}
diff --git a/contrib/docs/latex/gizmos/multicellcanvas.tex b/contrib/docs/latex/gizmos/multicellcanvas.tex
deleted file mode 100644
index bddc307297..0000000000
--- a/contrib/docs/latex/gizmos/multicellcanvas.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% multicell.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxMultiCellCanvas}}\label{wxmulticellcanvas}
-
-
-wxCell is used internally, so we don't need to declare it here
-
-wxMultiCellCanvas
-
-
-\wxheading{Derived from}
-
-\helpref{wxFlexGridSizer}{wxflexgridsizer}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxMultiCellCanvas::wxMultiCellCanvas}\label{wxmulticellcanvaswxmulticellcanvas}
-
-\func{}{wxMultiCellCanvas}{\param{wxWindow* }{parent}, \param{int }{numRows = 2}, \param{int }{numCols = 2}}
-
-
-\membersection{wxMultiCellCanvas::Add}\label{wxmulticellcanvasadd}
-
-\func{void}{Add}{\param{wxWindow* }{win}, \param{unsigned int }{row}, \param{unsigned int }{col}}
-
-
-\membersection{wxMultiCellCanvas::CalculateConstraints}\label{wxmulticellcanvascalculateconstraints}
-
-\func{void}{CalculateConstraints}{\void}
-
-
-\membersection{wxMultiCellCanvas::MaxCols}\label{wxmulticellcanvasmaxcols}
-
-\func{int}{MaxCols}{\void}
-
-
-\membersection{wxMultiCellCanvas::MaxRows}\label{wxmulticellcanvasmaxrows}
-
-\func{int}{MaxRows}{\void}
-
-
-\membersection{wxMultiCellCanvas::Resize}\label{wxmulticellcanvasresize}
-
-\func{void}{Resize}{\param{int }{numRows}, \param{int }{numCols}}
-
-
-\membersection{wxMultiCellCanvas::SetMinCellSize}\label{wxmulticellcanvassetmincellsize}
-
-\func{void}{SetMinCellSize}{\param{const wxSize }{size}}
-
diff --git a/contrib/docs/latex/gizmos/multicellitemhandle.tex b/contrib/docs/latex/gizmos/multicellitemhandle.tex
deleted file mode 100644
index 82846e5b6c..0000000000
--- a/contrib/docs/latex/gizmos/multicellitemhandle.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% multicell.h at 05/Jan/02 23:08:13
-%
-
-
-\section{\class{wxMultiCellItemHandle}}\label{wxmulticellitemhandle}
-
-
-
-classes
-
-
-wxMultiCellItemHandle
-
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxMultiCellItemHandle::wxMultiCellItemHandle}\label{wxmulticellitemhandlewxmulticellitemhandle}
-
-\func{}{wxMultiCellItemHandle}{\param{int }{row}, \param{int }{column}, \param{wxSize }{size}, \param{wxResizable }{style = wxNOT\_RESIZABLE}, \param{wxSize }{weight = wxSize(1,1)}, \param{int }{align = wxALIGN\_NOT}}
-
-
-\func{}{wxMultiCellItemHandle}{\param{int }{row}, \param{int }{column}, \param{wxResizable }{style}, \param{wxSize }{weight = wxSize(1,1)}, \param{int }{align = wxALIGN\_NOT}}
-
-
-\func{}{wxMultiCellItemHandle}{\param{int }{row}, \param{int }{column}, \param{int }{align}}
-
-
-\func{}{wxMultiCellItemHandle}{\param{int }{row}, \param{int }{column}, \param{int }{height = 1}, \param{int }{width = 1}, \param{wxSize }{size = wxDefaultSize}, \param{wxResizable }{style = wxNOT\_RESIZABLE}, \param{wxSize }{weight = wxSize(1,1)}, \param{int }{align = wxALIGN\_NOT}}
-
-
-\membersection{wxMultiCellItemHandle::GetAlignment}\label{wxmulticellitemhandlegetalignment}
-
-\func{int}{GetAlignment}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetColumn}\label{wxmulticellitemhandlegetcolumn}
-
-\func{int}{GetColumn}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetHeight}\label{wxmulticellitemhandlegetheight}
-
-\func{int}{GetHeight}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetLocalSize}\label{wxmulticellitemhandlegetlocalsize}
-
-\func{wxSize}{GetLocalSize}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetRow}\label{wxmulticellitemhandlegetrow}
-
-\func{int}{GetRow}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetStyle}\label{wxmulticellitemhandlegetstyle}
-
-\func{wxResizable}{GetStyle}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetWeight}\label{wxmulticellitemhandlegetweight}
-
-\func{wxSize}{GetWeight}{\void}
-
-
-\membersection{wxMultiCellItemHandle::GetWidth}\label{wxmulticellitemhandlegetwidth}
-
-\func{int}{GetWidth}{\void}
-
diff --git a/contrib/docs/latex/gizmos/multicellsizer.tex b/contrib/docs/latex/gizmos/multicellsizer.tex
deleted file mode 100644
index 3c1384854d..0000000000
--- a/contrib/docs/latex/gizmos/multicellsizer.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% multicell.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxMultiCellSizer}}\label{wxmulticellsizer}
-
-
-
-wxMultiCellSizer
-
-
-\wxheading{Derived from}
-
-\helpref{wxSizer}{wxsizer}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxMultiCellSizer::wxMultiCellSizer}\label{wxmulticellsizerwxmulticellsizer}
-
-\func{}{wxMultiCellSizer}{\param{int }{rows}, \param{int }{cols}}
-
-
-\func{}{wxMultiCellSizer}{\param{wxSize \& }{size}}
-
-
-\membersection{wxMultiCellSizer::\destruct{wxMultiCellSizer}}\label{wxmulticellsizerdtor}
-
-\func{}{\destruct{wxMultiCellSizer}}{\void}
-
-
-\membersection{wxMultiCellSizer::CalcMin}\label{wxmulticellsizercalcmin}
-
-\func{wxSize}{CalcMin}{\void}
-
-
-\membersection{wxMultiCellSizer::EnableGridLines}\label{wxmulticellsizerenablegridlines}
-
-\func{bool}{EnableGridLines}{\param{wxWindow* }{win}}
-
-
-\membersection{wxMultiCellSizer::OnPaint}\label{wxmulticellsizeronpaint}
-
-\func{void}{OnPaint}{\param{wxDC\& }{dc}}
-
-
-\membersection{wxMultiCellSizer::RecalcSizes}\label{wxmulticellsizerrecalcsizes}
-
-\func{void}{RecalcSizes}{\void}
-
-
-\membersection{wxMultiCellSizer::SetColumnWidth}\label{wxmulticellsizersetcolumnwidth}
-
-\func{bool}{SetColumnWidth}{\param{int }{column}, \param{int }{colSize = 5}, \param{bool }{expandable = FALSE}}
-
-
-\membersection{wxMultiCellSizer::SetDefaultCellSize}\label{wxmulticellsizersetdefaultcellsize}
-
-\func{bool}{SetDefaultCellSize}{\param{wxSize }{size}}
-
-
-\membersection{wxMultiCellSizer::SetGridPen}\label{wxmulticellsizersetgridpen}
-
-\func{bool}{SetGridPen}{\param{wxPen* }{pen}}
-
-
-\membersection{wxMultiCellSizer::SetRowHeight}\label{wxmulticellsizersetrowheight}
-
-\func{bool}{SetRowHeight}{\param{int }{row}, \param{int }{rowSize = 5}, \param{bool }{expandable = FALSE}}
-
diff --git a/contrib/docs/latex/gizmos/readme.txt b/contrib/docs/latex/gizmos/readme.txt
deleted file mode 100644
index 138a1e073e..0000000000
--- a/contrib/docs/latex/gizmos/readme.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Generating the FL Reference Manual
-===================================
-
-Like the wxWindows manual, the FL manual uses Tex2RTF to
-generate HTML, MS HTML Help, wxHTML Help, WinHelp, RTF, and PDF
-formats.
-
-VC++ users can use makefile.vc in this directory, e.g.:
-
-  nmake -f makefile.vc docs      ; Create directories and
-                                 ; all formats
-
-or
-
-  nmake -f makefile.vc dirs html ; Create directories, then
-                                 ; HTML files
-
-The targets that the makefile supports are:
-
-html        ; HTML
-htb         ; wxHTML Help: the HTML files + hhp, hhc files,
-            ; archived in a fl.htb (zip format) file
-htmlhelp    ; MS HTML Help: the HTML files + hhp, hhc files
-            ; then processed with hhc to produce fl.chm
-winhelp     ; WinHelp format: Tex2RTF produces RTF and CNT
-            ; files, then the makefile invokes hc.exe to produce
-            ; the fl.hlp file
-rtf:        ; WinHelp RTF (intermediate stage for winhelp)
-pdfrtf      ; Makes an RTF file suitable for loading into
-            ; MS Word and generating a PDF via Adobe Acrobat
-
-If you wish to run Tex2RTF directly, you can do e.g.
-
-  tex2rtf $(DOCDIR)\latex\FL\manual.tex $(DOCDIR)\html\FL\fl.htm -twice -html
-
-For more information on using Tex2RTF, please see:
-
-  docs/tech/tn0003.txt: Adding wxWindows class documentation
-
-in the wxWindows hierarchy, and also utils/tex2rtf. The Tex2RTF
-manual is supplied with wxWindows documentation, in (for example)
-docs/html/tex2rtf/t2rtf.htm or docs/htmlhelp/tex2rtf.chm.
-
-You can configure the way Tex2RTF works with tex2rtf.ini in
-docs/latex/fl.
-
-Generating HTML format
-======================
-
-To generate HTML documentation, you need to use the -html
-argument to Tex2RTF. A whole directory of files will be
-generated.
-
-Generating MS HTML Help format
-==============================
-
-To generate MS HTML Help documentation, you need to generate
-the HTML files as above and then run
-
-  hhc fl.hhp
-
-You'll need the MS HTML Help compiler, obtainable from Microsoft
-or bundled with your C++ compiler.
-
-Generating wxHTML Help format
-=============================
-
-To generate wxHTML Help documentation, you need to generate
-the HTML files as above and then archive the HTML, image,
-hhc, hhp and optionally hhk files into fl.htb.
-
-The helpview program can be used to view fl.htb
-on supported platforms. Get it from the wxWindows web site
-or compile it with samples/html/helpview in the wxWindows
-distribution.
-
-Generating WinHelp format
-=========================
-
-To generate Windows Help documentation, you need to generate
-the RTF file and contents file (.cnt) using --winhelp and
-then run hc.exe to produce the .hlp file 
-
-Generating PDF format
-=====================
-
-Run Tex2RTF with the -rtf argument, load the RTF into MS Word,
-select the whole document, press F9, then apply wordstyle.dot
-found in distrib/msw in the wxWindows distribution.
-Then generate the PDF using Adobe Acrobat PDFWriter.
-
-Note that for the contents to be formatted correctly,
-each class section should end with a blank line. Otherwise
-the contents will have bits of the reference in it.
-
-Generating .tex files from .h files
-===================================
-
-Much of the class reference is generated from the headers.
-The intention is to comment the headers more thoroughly, then
-regenerate the .tex files, before working directly on the
-.tex files.
-
-To regenerate .tex files, you'll need the HelpGen utility from
-latest wxWindows CVS, in utils/helpgen/src. Compile wxBase,
-then HelpGen. Run helpgen with e.g.
-
-  helpgen dump file.h
-
-and a separate .tex file for each class will appear in the
-current directory.
-
---
-Julian Smart, January 3rd 2002
-julian.smart@btopenworld.com
-
diff --git a/contrib/docs/latex/gizmos/refs.bib b/contrib/docs/latex/gizmos/refs.bib
deleted file mode 100644
index 836814c312..0000000000
--- a/contrib/docs/latex/gizmos/refs.bib
+++ /dev/null
@@ -1,59 +0,0 @@
-@techreport{robins87,
-author = {Robins, Gabriel},
-title = {The {ISI} grapher: a portable tool for displaying graphs pictorially (ISI/RS-87-196)},
-institution = {University of South California},
-year = {1987},
-month = {September}
-}
-@book{helpbook,
-author = {Boggan, Scott and Fakas, David and Welinske, Joe}
-, title = {Developing on-line help for {W}indows}
-, publisher = {Sams Publishing}
-, address = {11711 North College, Carmel, Indiana 46032, USA}
-, year = {1993}
-}
-@book{wong93,
-author = {Wong, William}
-, title = {Plug and play programming}
-, publisher = {M and T Books}
-, address = {115 West 18th Street, New York, New York 10011}
-, year = {1993}
-}
-@book{pree94,
-author = {Pree, Wolfgang}
-, title = {Design patterns for object-oriented software development}
-, publisher = {Addison-Wesley}
-, address = {Reading, MA}
-, year = {1994}
-}
-@book{gamma95,
-author = {Gamma, Erich and Helm, Richard and Johnson, Ralph and Vlissides, John}
-, title = {Design patterns: elements of reusable object-oriented software}
-, publisher = {Addison-Wesley}
-, address = {Reading, MA}
-, year = {1994}
-}
-@book{kopka,
-author = {Kopka, Helmut and Daly, Patrick W.}
-, title = {A Guide to LaTeX}
-, publisher = {Addison-Wesley}
-, year = {1993}
-}
-@manual{smart95a,
-author = {Smart, Julian}
-, title = {wxCLIPS User Manual}
-, publisher = {Artificial Intelligence Applications Institute}
-, organization = {University of Edinburgh}
-, address = {80 South Bridge, Edinburgh, EH1 1HN}
-, year = {1995}
-}
-
-@manual{smart95b,
-author = {Smart, Julian}
-, title = {Tex2RTF User Manual}
-, publisher = {Artificial Intelligence Applications Institute}
-, organization = {University of Edinburgh}
-, address = {80 South Bridge, Edinburgh, EH1 1HN}
-, year = {1995}
-}
-
diff --git a/contrib/docs/latex/gizmos/remotelyscrolledtreectrl.tex b/contrib/docs/latex/gizmos/remotelyscrolledtreectrl.tex
deleted file mode 100644
index 75ca54fa94..0000000000
--- a/contrib/docs/latex/gizmos/remotelyscrolledtreectrl.tex
+++ /dev/null
@@ -1,143 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% splittree.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxRemotelyScrolledTreeCtrl}}\label{wxremotelyscrolledtreectrl}
-
-
-wxRemotelyScrolledTreeCtrl
-  
-   This tree control disables its vertical scrollbar and catches scroll
-   events passed by a scrolled window higher in the hierarchy.
-   It also updates the scrolled window vertical scrollbar as appropriate.
- 
-\wxheading{Derived from}
-
-\helpref{wxTreeCtrl}{wxtreectrl}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl}\label{wxremotelyscrolledtreectrlwxremotelyscrolledtreectrl}
-
-\func{}{wxRemotelyScrolledTreeCtrl}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\& }{pt = wxDefaultPosition}, \param{const wxSize\& }{sz = wxDefaultSize}, \param{long }{style = wxTR\_HAS\_BUTTONS}}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::\destruct{wxRemotelyScrolledTreeCtrl}}\label{wxremotelyscrolledtreectrldtor}
-
-\func{}{\destruct{wxRemotelyScrolledTreeCtrl}}{\void}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars}\label{wxremotelyscrolledtreectrladjustremotescrollbars}
-
-\func{void}{AdjustRemoteScrollbars}{\void}
-
-Adjust the containing wxScrolledWindow's scrollbars appropriately
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::CalcTreeSize}\label{wxremotelyscrolledtreectrlcalctreesize}
-
-\func{void}{CalcTreeSize}{\param{const wxTreeItemId\& }{id}, \param{wxRect\& }{rect}}
-
-
-\func{void}{CalcTreeSize}{\param{wxRect\& }{rect}}
-
-Calculate the tree overall size so we can set the scrollbar
-correctly
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::GetCompanionWindow}\label{wxremotelyscrolledtreectrlgetcompanionwindow}
-
-\constfunc{wxWindow*}{GetCompanionWindow}{\void}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::GetScrollPos}\label{wxremotelyscrolledtreectrlgetscrollpos}
-
-\constfunc{int}{GetScrollPos}{\param{int }{orient}}
-
-In case we're using the generic tree control.
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::GetScrolledWindow}\label{wxremotelyscrolledtreectrlgetscrolledwindow}
-
-\constfunc{wxScrolledWindow*}{GetScrolledWindow}{\void}
-
-Find the scrolled window that contains this control
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::GetViewStart}\label{wxremotelyscrolledtreectrlgetviewstart}
-
-\constfunc{void}{GetViewStart}{\param{int* }{x}, \param{int* }{y}}
-
-In case we're using the generic tree control.
-Get the view start
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::HideVScrollbar}\label{wxremotelyscrolledtreectrlhidevscrollbar}
-
-\func{void}{HideVScrollbar}{\void}
-
-Helpers
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::OnExpand}\label{wxremotelyscrolledtreectrlonexpand}
-
-\func{void}{OnExpand}{\param{wxTreeEvent\& }{event}}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::OnPaint}\label{wxremotelyscrolledtreectrlonpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::OnScroll}\label{wxremotelyscrolledtreectrlonscroll}
-
-\func{void}{OnScroll}{\param{wxScrollWinEvent\& }{event}}
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::OnSize}\label{wxremotelyscrolledtreectrlonsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Events
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::PrepareDC}\label{wxremotelyscrolledtreectrlpreparedc}
-
-\func{void}{PrepareDC}{\param{wxDC\& }{dc}}
-
-In case we're using the generic tree control.
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::ScrollToLine}\label{wxremotelyscrolledtreectrlscrolltoline}
-
-\func{void}{ScrollToLine}{\param{int }{posHoriz}, \param{int }{posVert}}
-
-Scroll to the given line (in scroll units where each unit is
-the height of an item)
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::SetCompanionWindow}\label{wxremotelyscrolledtreectrlsetcompanionwindow}
-
-\func{void}{SetCompanionWindow}{\param{wxWindow* }{companion}}
-
-Accessors
-The companion window is one which will get notified when certain
-events happen such as node expansion
-
-
-\membersection{wxRemotelyScrolledTreeCtrl::SetScrollbars}\label{wxremotelyscrolledtreectrlsetscrollbars}
-
-\func{void}{SetScrollbars}{\param{int }{pixelsPerUnitX}, \param{int }{pixelsPerUnitY}, \param{int }{noUnitsX}, \param{int }{noUnitsY}, \param{int }{xPos = 0}, \param{int }{yPos = 0}, \param{bool }{noRefresh = FALSE}}
-
-Overrides
-Override this in case we're using the generic tree control.
-Calls to this should disable the vertical scrollbar.
-Number of pixels per user unit (0 or -1 for no scrollbar)
-Length of virtual canvas in user units
-Length of page in user units
-
diff --git a/contrib/docs/latex/gizmos/splitterscrolledwindow.tex b/contrib/docs/latex/gizmos/splitterscrolledwindow.tex
deleted file mode 100644
index c3774b9fce..0000000000
--- a/contrib/docs/latex/gizmos/splitterscrolledwindow.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% splittree.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxSplitterScrolledWindow}}\label{wxsplitterscrolledwindow}
-
-
-wxSplitterScrolledWindow
-  
-   This scrolled window is aware of the fact that one of its
-   children is a splitter window. It passes on its scroll events
-   (after some processing) to both splitter children for them
-   scroll appropriately.
- 
-\wxheading{Derived from}
-
-\helpref{wxScrolledWindow}{wxscrolledwindow}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSplitterScrolledWindow::wxSplitterScrolledWindow}\label{wxsplitterscrolledwindowwxsplitterscrolledwindow}
-
-\func{}{wxSplitterScrolledWindow}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{sz = wxDefaultSize}, \param{long }{style = 0}}
-
-
-\membersection{wxSplitterScrolledWindow::OnScroll}\label{wxsplitterscrolledwindowonscroll}
-
-\func{void}{OnScroll}{\param{wxScrollWinEvent\& }{event}}
-
-Overrides
-Events
-
-
-\membersection{wxSplitterScrolledWindow::OnSize}\label{wxsplitterscrolledwindowonsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
diff --git a/contrib/docs/latex/gizmos/tex2rtf.ini b/contrib/docs/latex/gizmos/tex2rtf.ini
deleted file mode 100644
index 241b3171cb..0000000000
--- a/contrib/docs/latex/gizmos/tex2rtf.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-contentsDepth = 2
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "Gizmos Manual"
-truncateFilenames = no
-combineSubSections = yes
-; A new option to allow references to wxWindows classes to be displayed as if
-; without the \helpref command.
-ignoreBadRefs = yes
-; Finally, a way to specify face names
-htmlFaceName = "Arial, Lucida, Helvetica"
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-htmlWorkshopFiles = true
-htmlIndex = true
-
-\overview [2] {\helpref{#1}{#2}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-%\wxheading [1]{{\bf \fcol{blue}{#1}}}
-\wxheading [1]{{\bf #1}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-\bftt [1] {\bf{\tt{#1}}}
-\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-%\pythonnote [1] {}
-\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1}
-
diff --git a/contrib/docs/latex/gizmos/thinsplitterwindow.tex b/contrib/docs/latex/gizmos/thinsplitterwindow.tex
deleted file mode 100644
index e0c5dc8be8..0000000000
--- a/contrib/docs/latex/gizmos/thinsplitterwindow.tex
+++ /dev/null
@@ -1,54 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% splittree.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxThinSplitterWindow}}\label{wxthinsplitterwindow}
-
-
-wxThinSplitterWindow
-  
-   Implements a splitter with a less obvious sash
-   than the usual one.
- 
-\wxheading{Derived from}
-
-\helpref{wxSplitterWindow}{wxsplitterwindow}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxThinSplitterWindow::wxThinSplitterWindow}\label{wxthinsplitterwindowwxthinsplitterwindow}
-
-\func{}{wxThinSplitterWindow}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{sz = wxDefaultSize}, \param{long style = wxSP\_3D | }{wxCLIP\_CHILDREN}}
-
-
-\membersection{wxThinSplitterWindow::DrawSash}\label{wxthinsplitterwindowdrawsash}
-
-\func{void}{DrawSash}{\param{wxDC\& }{dc}}
-
-
-\membersection{wxThinSplitterWindow::OnSize}\label{wxthinsplitterwindowonsize}
-
-\func{void}{OnSize}{\param{wxSizeEvent\& }{event}}
-
-Events
-
-
-\membersection{wxThinSplitterWindow::SashHitTest}\label{wxthinsplitterwindowsashhittest}
-
-\func{bool}{SashHitTest}{\param{int }{x}, \param{int }{y}, \param{int }{tolerance = 2}}
-
-Tests for x, y over sash. Overriding this allows us to increase
-the tolerance.
-
-
-\membersection{wxThinSplitterWindow::SizeWindows}\label{wxthinsplitterwindowsizewindows}
-
-\func{void}{SizeWindows}{\void}
-
-Overrides
-
diff --git a/contrib/docs/latex/gizmos/topics.tex b/contrib/docs/latex/gizmos/topics.tex
deleted file mode 100644
index 52afd2c87f..0000000000
--- a/contrib/docs/latex/gizmos/topics.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\chapter{Topic overviews}\label{overviews}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This chapter contains a selection of topic overviews, first things first:
-
-\input tusage.tex
-
diff --git a/contrib/docs/latex/gizmos/treecompanionwindow.tex b/contrib/docs/latex/gizmos/treecompanionwindow.tex
deleted file mode 100644
index c6b61b3f45..0000000000
--- a/contrib/docs/latex/gizmos/treecompanionwindow.tex
+++ /dev/null
@@ -1,63 +0,0 @@
-%
-% automatically generated by HelpGen $Revision$ from
-% splittree.h at 05/Jan/02 23:08:14
-%
-
-
-\section{\class{wxTreeCompanionWindow}}\label{wxtreecompanionwindow}
-
-
-wxTreeCompanionWindow
-  
-   A window displaying values associated with tree control items.
- 
-\wxheading{Derived from}
-
-\helpref{wxWindow}{wxwindow}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxTreeCompanionWindow::wxTreeCompanionWindow}\label{wxtreecompanionwindowwxtreecompanionwindow}
-
-\func{}{wxTreeCompanionWindow}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{sz = wxDefaultSize}, \param{long }{style = 0}}
-
-
-\membersection{wxTreeCompanionWindow::DrawItem}\label{wxtreecompanionwindowdrawitem}
-
-\func{void}{DrawItem}{\param{wxDC\& }{dc}, \param{wxTreeItemId }{id}, \param{const wxRect\& }{rect}}
-
-Overrides
-
-
-\membersection{wxTreeCompanionWindow::GetTreeCtrl}\label{wxtreecompanionwindowgettreectrl}
-
-\constfunc{wxRemotelyScrolledTreeCtrl*}{GetTreeCtrl}{\void}
-
-Operations
-Accessors
-
-
-\membersection{wxTreeCompanionWindow::OnExpand}\label{wxtreecompanionwindowonexpand}
-
-\func{void}{OnExpand}{\param{wxTreeEvent\& }{event}}
-
-
-\membersection{wxTreeCompanionWindow::OnPaint}\label{wxtreecompanionwindowonpaint}
-
-\func{void}{OnPaint}{\param{wxPaintEvent\& }{event}}
-
-Events
-
-
-\membersection{wxTreeCompanionWindow::OnScroll}\label{wxtreecompanionwindowonscroll}
-
-\func{void}{OnScroll}{\param{wxScrollWinEvent\& }{event}}
-
-
-\membersection{wxTreeCompanionWindow::SetTreeCtrl}\label{wxtreecompanionwindowsettreectrl}
-
-\func{void}{SetTreeCtrl}{\param{wxRemotelyScrolledTreeCtrl* }{treeCtrl}}
-
diff --git a/contrib/docs/latex/gizmos/tusage.tex b/contrib/docs/latex/gizmos/tusage.tex
deleted file mode 100644
index ba9d767ada..0000000000
--- a/contrib/docs/latex/gizmos/tusage.tex
+++ /dev/null
@@ -1,22 +0,0 @@
-\section{Notes on using the reference}\label{referencenotes}
-
-In the descriptions of the wxWindows classes and their member
-functions, note that descriptions of inherited member functions are not
-duplicated in derived classes unless their behaviour is different. So in
-using a class such as wxScrolledWindow, be aware that wxWindow functions may be
-relevant.
-
-Note also that arguments with default values may be omitted from a
-function call, for brevity. Size and position arguments may usually be
-given a value of -1 (the default), in which case wxWindows will choose a
-suitable value.
-
-Most strings are returned as wxString objects. However, for remaining
-char * return values, the strings are allocated and
-deallocated by wxWindows. Therefore, return values should always be
-copied for long-term use, especially since the same buffer is often
-used by wxWindows.
-
-The member functions are given in alphabetical order except for
-constructors and destructors which appear first.
-
diff --git a/contrib/docs/latex/gizmos/up.gif b/contrib/docs/latex/gizmos/up.gif
deleted file mode 100644
index 870c89e80a..0000000000
Binary files a/contrib/docs/latex/gizmos/up.gif and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/back.gif b/contrib/docs/latex/mmedia/back.gif
deleted file mode 100644
index 8a61076d3b..0000000000
Binary files a/contrib/docs/latex/mmedia/back.gif and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/bugs.tex b/contrib/docs/latex/mmedia/bugs.tex
deleted file mode 100644
index a89dff9828..0000000000
--- a/contrib/docs/latex/mmedia/bugs.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-\chapter{Bugs}\label{bugs}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-These are the known bugs.
-
-\begin{itemize}\itemsep=0pt
-\item No bugs
-\end{itemize}
diff --git a/contrib/docs/latex/mmedia/bullet.bmp b/contrib/docs/latex/mmedia/bullet.bmp
deleted file mode 100644
index aad8fc793e..0000000000
Binary files a/contrib/docs/latex/mmedia/bullet.bmp and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/cdaudio.tex b/contrib/docs/latex/mmedia/cdaudio.tex
deleted file mode 100644
index bbacbbf225..0000000000
--- a/contrib/docs/latex/mmedia/cdaudio.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/cdbase.h at 26/Feb/00 14:52:12
-%
-
-\section{\class{wxCDAudio}}\label{wxcdaudio}
-
-\wxheading{Derived from}
-
-wxObject
-
-\wxheading{Data structures}
-
-{\small
-\begin{verbatim}
-typedef struct wxCDtime {
-  wxUint8 track
-};
-\end{verbatim}
-}
-{\small \begin{verbatim}
-typedef enum { PLAYING, PAUSED, STOPPED } CDstatus
-\end{verbatim}}
-
diff --git a/contrib/docs/latex/mmedia/cdaudlnx.tex b/contrib/docs/latex/mmedia/cdaudlnx.tex
deleted file mode 100644
index 9dcdb4f699..0000000000
--- a/contrib/docs/latex/mmedia/cdaudlnx.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/cdunix.h at 26/Feb/00 14:52:10
-%
-
-
-\section{\class{wxCDAudioLinux}}\label{wxcdaudiolinux}
-
-\wxheading{Derived from}
-
-\helpref{wxCDAudio}{wxcdaudio}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxCDAudioLinux::wxCDAudioLinux}\label{wxcdaudiolinuxwxcdaudiolinux}
-
-\func{}{wxCDAudioLinux}{\void}
-
-\func{}{wxCDAudioLinux}{\param{const char* }{dev\_name}}
-
-\membersection{wxCDAudioLinux::\destruct{wxCDAudioLinux}}\label{wxcdaudiolinuxdtor}
-
-\func{}{\destruct{wxCDAudioLinux}}{\void}
-
-
-\membersection{wxCDAudioLinux::Play}\label{wxcdaudiolinuxplay}
-
-\func{bool}{Play}{\param{const wxCDtime\& }{beg\_time}, \param{const wxCDtime\& }{end\_time}}
-
-
-\membersection{wxCDAudioLinux::Pause}\label{wxcdaudiolinuxpause}
-
-\func{bool}{Pause}{\void}
-
-
-\membersection{wxCDAudioLinux::Resume}\label{wxcdaudiolinuxresume}
-
-\func{bool}{Resume}{\void}
-
-
-\membersection{wxCDAudioLinux::GetStatus}\label{wxcdaudiolinuxgetstatus}
-
-\func{CDstatus}{GetStatus}{\void}
-
-
-\membersection{wxCDAudioLinux::GetTime}\label{wxcdaudiolinuxgettime}
-
-\func{wxCDtime}{GetTime}{\void}
-
-
-\membersection{wxCDAudioLinux::GetToc}\label{wxcdaudiolinuxgettoc}
-
-\func{CDtoc\&}{GetToc}{\void}
-
-
-\membersection{wxCDAudioLinux::Ok}\label{wxcdaudiolinuxok}
-
-\constfunc{bool}{Ok}{\void}
-
-
-\membersection{wxCDAudioLinux::OpenDevice}\label{wxcdaudiolinuxopendevice}
-
-\func{void}{OpenDevice}{\param{const char* }{dev\_name}}
-
diff --git a/contrib/docs/latex/mmedia/cdaudwin.tex b/contrib/docs/latex/mmedia/cdaudwin.tex
deleted file mode 100644
index 0d560cbdea..0000000000
--- a/contrib/docs/latex/mmedia/cdaudwin.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/cdwin.h at 26/Feb/00 14:52:15
-%
-
-
-\section{\class{wxCDAudioWin}}\label{wxcdaudiowin}
-
-
-
-\wxheading{Derived from}
-
-\helpref{wxCDAudio}{wxcdaudio}
-
-\wxheading{Data structures}
-
-{\small
-\begin{verbatim}
-typedef struct CDAW\_Internal {
-  MCIDEVICEID dev\_id
-};
-\end{verbatim}
-}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxCDAudioWin::wxCDAudioWin}\label{wxcdaudiowinwxcdaudiowin}
-
-\func{}{wxCDAudioWin}{\void}
-
-\func{}{wxCDAudioWin}{\param{const char* }{dev\_name}}
-
-
-\membersection{wxCDAudioWin::\destruct{wxCDAudioWin}}\label{wxcdaudiowindtor}
-
-\func{}{\destruct{wxCDAudioWin}}{\void}
-
-
-\membersection{wxCDAudioWin::Play}\label{wxcdaudiowinplay}
-
-\func{bool}{Play}{\param{const wxCDtime\& }{beg\_time}, \param{const wxCDtime\& }{end\_time}}
-
-
-\membersection{wxCDAudioWin::Pause}\label{wxcdaudiowinpause}
-
-\func{bool}{Pause}{\void}
-
-
-\membersection{wxCDAudioWin::Resume}\label{wxcdaudiowinresume}
-
-\func{bool}{Resume}{\void}
-
-
-\membersection{wxCDAudioWin::GetStatus}\label{wxcdaudiowingetstatus}
-
-\func{CDstatus}{GetStatus}{\void}
-
-
-\membersection{wxCDAudioWin::GetTime}\label{wxcdaudiowingettime}
-
-\func{wxCDtime}{GetTime}{\void}
-
-
-\membersection{wxCDAudioWin::GetToc}\label{wxcdaudiowingettoc}
-
-\func{const CDtoc\&}{GetToc}{\void}
-
-
-\membersection{wxCDAudioWin::Ok}\label{wxcdaudiowinok}
-
-\constfunc{bool}{Ok}{\void}
-
-
-\membersection{wxCDAudioWin::PrepareToc}\label{wxcdaudiowinpreparetoc}
-
-\func{void}{PrepareToc}{\void}
-
diff --git a/contrib/docs/latex/mmedia/cdtoc.tex b/contrib/docs/latex/mmedia/cdtoc.tex
deleted file mode 100644
index 1e60972d96..0000000000
--- a/contrib/docs/latex/mmedia/cdtoc.tex
+++ /dev/null
@@ -1,111 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/cdbase.h at 26/Feb/00 14:52:12
-%
-
-
-\section{\class{CDtoc}}\label{cdtoc}
-
-
-Table of contents manager
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{CDtoc::CDtoc}\label{cdtoccdtoc}
-
-\func{}{CDtoc}{\param{wxCDtime\& }{tot\_tm}, \param{wxCDtime* }{trks\_tm}, \param{wxCDtime* }{trks\_pos}}
-
-
-\membersection{CDtoc::GetTrackTime}\label{cdtocgettracktime}
-
-\constfunc{wxCDtime}{GetTrackTime}{\param{wxUint8 }{track}}
-
-Returns the length of the specified track
-track: track to get length
-
-
-\membersection{CDtoc::GetTrackPos}\label{cdtocgettrackpos}
-
-\constfunc{wxCDtime}{GetTrackPos}{\param{wxUint8 }{track}}
-
-Returns the position of the specified track
-track: track to get position
-
-
-\membersection{CDtoc::GetTotalTime}\label{cdtocgettotaltime}
-
-\constfunc{wxCDtime}{GetTotalTime}{\void}
-
-Returns the total time
-
-
-\membersection{wxCDAudio::wxCDAudio}\label{wxcdaudiowxcdaudio}
-
-\func{}{wxCDAudio}{\void}
-
-
-\membersection{wxCDAudio::\destruct{wxCDAudio}}\label{wxcdaudiodtor}
-
-\func{}{\destruct{wxCDAudio}}{\void}
-
-
-\membersection{wxCDAudio::Play}\label{wxcdaudioplay}
-
-\func{bool}{Play}{\param{const wxCDtime\& }{beg\_play}, \param{const wxCDtime\& }{end\_play}}
-
-Play audio at the specified position
-
-\func{bool}{Play}{\param{const wxCDtime\& }{beg\_play}}
-
-Play audio from the specified to the end of the CD audio
-
-\func{bool}{Play}{\param{wxUint8 }{beg\_track}, \param{wxUint8 }{end\_track = 0}}
-
-
-\membersection{wxCDAudio::Pause}\label{wxcdaudiopause}
-
-\func{bool}{Pause}{\void}
-
-Pause the audio playing
-
-
-\membersection{wxCDAudio::Resume}\label{wxcdaudioresume}
-
-\func{bool}{Resume}{\void}
-
-Resume a paused audio playing
-
-
-\membersection{wxCDAudio::GetStatus}\label{wxcdaudiogetstatus}
-
-\func{CDstatus}{GetStatus}{\void}
-
-Get the current CD status
-
-
-\membersection{wxCDAudio::GetTime}\label{wxcdaudiogettime}
-
-\func{wxCDtime}{GetTime}{\void}
-
-Get the current playing time
-
-
-\membersection{wxCDAudio::GetToc}\label{wxcdaudiogettoc}
-
-\func{const CDtoc\&}{GetToc}{\void}
-
-Returns the table of contents
-
-
-\membersection{wxCDAudio::Ok}\label{wxcdaudiook}
-
-\constfunc{bool}{Ok}{\void}
-
-CD ok
-
diff --git a/contrib/docs/latex/mmedia/changes.tex b/contrib/docs/latex/mmedia/changes.tex
deleted file mode 100644
index f1101f4454..0000000000
--- a/contrib/docs/latex/mmedia/changes.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-\chapter{Change log}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
diff --git a/contrib/docs/latex/mmedia/classes.tex b/contrib/docs/latex/mmedia/classes.tex
deleted file mode 100644
index 8a19c33023..0000000000
--- a/contrib/docs/latex/mmedia/classes.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\chapter{Class reference}\label{classref}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-These are the main Mmedia classes.
-
-\input cdaudio.tex
-\input cdaudlnx.tex
-\input cdaudwin.tex
-\input cdtoc.tex
-\input sndbase.tex
-\input sndfile.tex
-\input sndfrmt.tex
diff --git a/contrib/docs/latex/mmedia/contents.gif b/contrib/docs/latex/mmedia/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/docs/latex/mmedia/contents.gif and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/forward.gif b/contrib/docs/latex/mmedia/forward.gif
deleted file mode 100644
index 9c81e8c92f..0000000000
Binary files a/contrib/docs/latex/mmedia/forward.gif and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/intro.tex b/contrib/docs/latex/mmedia/intro.tex
deleted file mode 100644
index 181eec5031..0000000000
--- a/contrib/docs/latex/mmedia/intro.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-\chapter{Introduction}
-\pagenumbering{arabic}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-The MMedia wxWindows extension is a wxWindows library which provides you
-a full set of multimedia classes including sound recording/playing,
-cd audio playing and video playing. The API is portable and can be used
-on any supported systems with the insurance the behaviour will be the
-same.
-
-\section{File structure}
-
-These are the files that comprise the mmedia library.
-
-\begin{description}\itemsep=0pt
-\item[sndbase.h] Header for wxSoundStream base class and wxSoundFormat base class.
-\item[sndbase.cpp] Basic objects implementation.
-\item[sndfile.h] wxSoundFileStream base class header.
-\item[sndfile.cpp] wxSoundFileStream base class implementation.
-\item[sndpcm.h] wxSoundFormatPcm class header.
-\item[sndpcm.cpp] wxSoundFormatPcm class implementation.
-\item[sndcpcm.h] wxSoundCodecPcm class header (PCM converter).
-\item[sndcpcm.cpp] wxSoundCodecPcm class implementation (PCM converter).
-\item[sndulaw.h]
-\item[sndulaw.cpp]
-\item[sndg72x.h]
-\item[sndg72x.cpp]
-\item[sndoss.h]
-\item[sndoss.cpp]
-\item[sndesd.h]
-\item[sndesd.cpp]
-\item[sndwin.h]
-\item[sndwin.cpp]
-\item[cdbase.h]
-\item[cdbase.cpp]
-\item[cdunix.h]
-\item[cdunix.cpp]
-\item[cdwin.h]
-\item[cdwin.cpp]
-\item[vidbase.h]
-\item[vidbase.cpp]
-\item[vidxanm.h]
-\item[vidxanm.cpp]
-\item[vidwin.h]
-\item[vidwin.cpp]
-\end{description}
diff --git a/contrib/docs/latex/mmedia/mmedia.tex b/contrib/docs/latex/mmedia/mmedia.tex
deleted file mode 100644
index 54d2c30bdc..0000000000
--- a/contrib/docs/latex/mmedia/mmedia.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyheadings]{report}
-\definecolour{black}{0}{0}{0}%
-\definecolour{cyan}{0}{255}{255}%
-\definecolour{green}{0}{255}{0}%
-\definecolour{magenta}{255}{0}{255}%
-\definecolour{red}{255}{0}{0}%
-\definecolour{blue}{0}{0}{200}%
-\definecolour{yellow}{255}{255}{0}%
-\definecolour{white}{255}{255}{255}%
-\input psbox.tex
-\parindent 0pt
-\parskip 11pt
-\title{MMedia for wxWindows}
-\author{Guilhem Lavaux}
-\date{March 2000}
-
-\makeindex
-\begin{document}
-\maketitle
-
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\pagenumbering{roman}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\tableofcontents%
-
-\input{intro.tex}
-%
-\input{sample.tex}
-%
-\input{classes.tex}
-%
-\input{topics.tex}
-%
-\input{bugs.tex}
-%
-\input{changes.tex}
-
-%
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\printindex
-\end{document}
diff --git a/contrib/docs/latex/mmedia/psbox.tex b/contrib/docs/latex/mmedia/psbox.tex
deleted file mode 100644
index b7438f4f29..0000000000
--- a/contrib/docs/latex/mmedia/psbox.tex
+++ /dev/null
@@ -1,520 +0,0 @@
-%
-%              %%%%%%%    %%%%%        %%%%%%    %%%%%   %     %
-%              %      %  %             %     %  %     %   %   %
-%              %      %  %             %     %  %     %    % %
-%              %%%%%%%    %%%%%        %%%%%%   %     %     %
-%              %               %       %     %  %     %    % %
-%              %               %       %     %  %     %   %   %
-%              %         %%%%%%        %%%%%%    %%%%%   %     %
-%
-%              By Jean Orloff
-%              Comments & suggestions by e-mail: ORLOFF@surya11.cern.ch
-%              No modification of this file allowed if not e-sent to me.
-%
-% A simple way to measure the size of encapsulated postscript figures
-%   from inside TeX, and to use it for automatically formatting texts
-%   with inserted figures. Works both under Plain TeX-based macros
-%   (Phyzzx, Harvmac, Psizzl, ...) and LaTeX environment.
-% Provides exactly the same result on any PostScript printer provided
-%   the single instruction \psfor... is changed to fit the needs of the
-%   particular dvi->ps translator used.
-% History:
-%   1.31: adds \psforDVIALW(?)
-%   1.30: adds \splitfile & \joinfiles for multi-file management
-%   1.24: fix error handling & add \psonlyboxes
-%   1.23: adds \putsp@ce for OzTeX fix
-%   1.22: makes \drawingBox \global for use in Phyzzx
-%   1.21: accepts %%BoundingBox: (atend)
-%   1.20: tries to add \psfordvitps for the TeXPS package.
-%   1.10: adds \psforoztex, error handling...
-%2345678 1 2345678 2 2345678 3 2345678 4 2345678 5 2345678 6 2345678 7 23456789
-%
-\def\temp{1.31}
-\let\tempp=\relax
-\expandafter\ifx\csname psboxversion\endcsname\relax
-  \message{version: \temp}
-\else
-    \ifdim\temp cm>\psboxversion cm
-      \message{version: \temp}
-    \else
-      \message{psbox(\psboxversion) is already loaded: I won't load
-        psbox(\temp)!}
-      \let\temp=\psboxversion
-      \let\tempp=\endinput
-    \fi
-\fi
-\tempp
-\let\psboxversion=\temp
-\catcode`\@=11
-% Every macro likes a little privacy...
-%
-% Some common defs
-%
-\def\execute#1{#1}% NOT stupid: cs in #1 are then identified BEFORE execution
-\def\psm@keother#1{\catcode`#112\relax}% borrowed from latex
-\def\executeinspecs#1{%
-\execute{\begingroup\let\do\psm@keother\dospecials\catcode`\^^M=9#1\endgroup}}
-%
-%Trying to tame the variety of \special commands for Postscript: the
-%  universal internal command \PSspeci@l##1##2 takes ##1 to be the
-%  filename and ##2 to be the integer scale factor*1000 (as for usual
-%   TeX \scale commands)
-%
-\def\psfortextures{%     For TeXtures on the Macintosh
-%-----------------
-\def\PSspeci@l##1##2{%
-\special{illustration ##1\space scaled ##2}%
-}}
-%
-\def\psfordvitops{%      For the DVItoPS converter on IBM mainframes
-%----------------
-\def\PSspeci@l##1##2{%
-\special{dvitops: import ##1\space \the\drawingwd \the\drawinght}%
-}}
-%
-\def\psfordvips{%      For DVIPS converter on VAX, UNIX and PC's
-%--------------
-\def\PSspeci@l##1##2{%
-%    \special{/@scaleunit 1000 def}% never read dox without trying!
-\d@my=0.1bp \d@mx=\drawingwd \divide\d@mx by\d@my%
-\special{PSfile=##1\space llx=\psllx\space lly=\pslly\space%
-urx=\psurx\space ury=\psury\space rwi=\number\d@mx}%
-}}
-%
-\def\psforoztex{%        For the OzTeX shareware on the Macintosh
-%--------------
-\def\PSspeci@l##1##2{%
-\special{##1 \space
-      ##2 1000 div dup scale
-      \putsp@ce{\number-\psllx} \putsp@ce{\number-\pslly} translate
-}%
-}}
-\def\putsp@ce#1{#1 }
-%
-\def\psfordvitps{%       From the UNIX TeXPS package, vers.>3.12
-%---------------
-% Convert a dimension into the number \psn@sp (in scaled points)
-\def\psdimt@n@sp##1{\d@mx=##1\relax\edef\psn@sp{\number\d@mx}}
-\def\PSspeci@l##1##2{%
-% psfig.psr contains the def of "startTexFig": if you can locate it
-% and include the correct pathname, it should work
-\special{dvitps: Include0 "psfig.psr"}% contains def of "startTexFig"
-\psdimt@n@sp{\drawingwd}
-\special{dvitps: Literal "\psn@sp\space"}
-\psdimt@n@sp{\drawinght}
-\special{dvitps: Literal "\psn@sp\space"}
-\psdimt@n@sp{\psllx bp}
-\special{dvitps: Literal "\psn@sp\space"}
-\psdimt@n@sp{\pslly bp}
-\special{dvitps: Literal "\psn@sp\space"}
-\psdimt@n@sp{\psurx bp}
-\special{dvitps: Literal "\psn@sp\space"}
-\psdimt@n@sp{\psury bp}
-\special{dvitps: Literal "\psn@sp\space startTexFig\space"}
-\special{dvitps: Include1 "##1"}
-\special{dvitps: Literal "endTexFig\space"}
-}}
-\def\psforDVIALW{%   Try for dvialw, a UNIX public domain
-%---------------
-\def\PSspeci@l##1##2{
-\special{language "PS"
-literal "##2 1000 div dup scale"
-include "##1"}}}
-\def\psonlyboxes{%     Draft-like behaviour if none of the others works
-%---------------
-\def\PSspeci@l##1##2{%
-\at(0cm;0cm){\boxit{\vbox to\drawinght
-  {\vss
-  \hbox to\drawingwd{\at(0cm;0cm){\hbox{(##1)}}\hss}
-  }}}
-}%
-}
-%
-\def\psloc@lerr#1{%
-\let\savedPSspeci@l=\PSspeci@l%
-\def\PSspeci@l##1##2{%
-\at(0cm;0cm){\boxit{\vbox to\drawinght
-  {\vss
-  \hbox to\drawingwd{\at(0cm;0cm){\hbox{(##1) #1}}\hss}
-  }}}
-\let\PSspeci@l=\savedPSspeci@l% restore normal output for other figs!
-}%
-}
-%
-%\def\psfor...  add your own!
-%
-%  \ReadPSize{PSfilename} reads the dimensions of a PostScript drawing
-%      and stores it in \drawinght(wd)
-\newread\pst@mpin
-\newdimen\drawinght\newdimen\drawingwd
-\newdimen\psxoffset\newdimen\psyoffset
-\newbox\drawingBox
-\newif\ifNotB@undingBox
-\newhelp\PShelp{Proceed: you'll have a 5cm square blank box instead of
-your graphics (Jean Orloff).}
-\def\@mpty{}
-\def\s@tsize#1 #2 #3 #4\@ndsize{
-  \def\psllx{#1}\def\pslly{#2}%
-  \def\psurx{#3}\def\psury{#4}%  needed by a crazyness of dvips!
-  \ifx\psurx\@mpty\NotB@undingBoxtrue% this is not a valid one!
-  \else
-    \drawinght=#4bp\advance\drawinght by-#2bp
-    \drawingwd=#3bp\advance\drawingwd by-#1bp
-%  !Units related by crazy factors as bp/pt=72.27/72 should be BANNED!
-  \fi
-  }
-\def\sc@nline#1:#2\@ndline{\edef\p@rameter{#1}\edef\v@lue{#2}}
-\def\g@bblefirstblank#1#2:{\ifx#1 \else#1\fi#2}
-\def\psm@keother#1{\catcode`#112\relax}% borrowed from latex
-\def\execute#1{#1}% Seems stupid, but cs are identified BEFORE execution
-{\catcode`\%=12
-\xdef\B@undingBox{%%BoundingBox}
-}   %% is not a true comment in PostScript, even if % is!
-\def\ReadPSize#1{
- \edef\PSfilename{#1}
- \openin\pst@mpin=#1\relax
- \ifeof\pst@mpin \errhelp=\PShelp
-   \errmessage{I haven't found your postscript file (\PSfilename)}
-   \psloc@lerr{was not found}
-   \s@tsize 0 0 142 142\@ndsize
-   \closein\pst@mpin
- \else
-   \immediate\write\psbj@inaux{#1,}
-   \loop
-     \executeinspecs{\catcode`\ =10\global\read\pst@mpin to\n@xtline}
-     \ifeof\pst@mpin
-       \errhelp=\PShelp
-       \errmessage{(\PSfilename) is not an Encapsulated PostScript File:
-           I could not find any \B@undingBox: line.}
-       \edef\v@lue{0 0 142 142:}
-       \psloc@lerr{is not an EPSFile}
-       \NotB@undingBoxfalse
-     \else
-       \expandafter\sc@nline\n@xtline:\@ndline
-       \ifx\p@rameter\B@undingBox\NotB@undingBoxfalse
-         \edef\t@mp{%
-           \expandafter\g@bblefirstblank\v@lue\space\space\space}
-         \expandafter\s@tsize\t@mp\@ndsize
-       \else\NotB@undingBoxtrue
-       \fi
-     \fi
-   \ifNotB@undingBox\repeat
-   \closein\pst@mpin
- \fi
-\message{#1}
-}
-%
-% \psboxto(xdim;ydim){psfilename}: you specify the dimensions and
-%    TeX uniformly scales to fit the largest one. If xdim=0pt, the
-%    scale is fully determined by ydim and vice versa.
-%    Notice: psboxes are a real vboxes; couldn't take hbox otherwise all
-%    indentation and all cr's would be interpreted as spaces (hugh!).
-%
-\newcount\xscale \newcount\yscale \newdimen\pscm\pscm=1cm
-\newdimen\d@mx \newdimen\d@my
-\let\ps@nnotation=\relax
-\def\psboxto(#1;#2)#3{\vbox{
-   \ReadPSize{#3}
-   \divide\drawingwd by 1000
-   \divide\drawinght by 1000
-   \d@mx=#1
-   \ifdim\d@mx=0pt\xscale=1000
-         \else \xscale=\d@mx \divide \xscale by \drawingwd\fi
-   \d@my=#2
-   \ifdim\d@my=0pt\yscale=1000
-         \else \yscale=\d@my \divide \yscale by \drawinght\fi
-   \ifnum\yscale=1000
-         \else\ifnum\xscale=1000\xscale=\yscale
-                    \else\ifnum\yscale<\xscale\xscale=\yscale\fi
-              \fi
-   \fi
-   \divide \psxoffset by 1000\multiply\psxoffset by \xscale
-   \divide \psyoffset by 1000\multiply\psyoffset by \xscale
-   \global\divide\pscm by 1000
-   \global\multiply\pscm by\xscale
-   \multiply\drawingwd by\xscale \multiply\drawinght by\xscale
-   \ifdim\d@mx=0pt\d@mx=\drawingwd\fi
-   \ifdim\d@my=0pt\d@my=\drawinght\fi
-   \message{scaled \the\xscale}
- \hbox to\d@mx{\hss\vbox to\d@my{\vss
-   \global\setbox\drawingBox=\hbox to 0pt{\kern\psxoffset\vbox to 0pt{
-      \kern-\psyoffset
-      \PSspeci@l{\PSfilename}{\the\xscale}
-      \vss}\hss\ps@nnotation}
-   \global\ht\drawingBox=\the\drawinght
-   \global\wd\drawingBox=\the\drawingwd
-   \baselineskip=0pt
-   \copy\drawingBox
- \vss}\hss}
-  \global\psxoffset=0pt
-  \global\psyoffset=0pt% These are local to one figure
-  \global\pscm=1cm
-  \global\drawingwd=\drawingwd
-  \global\drawinght=\drawinght
-}}
-%
-% \psboxscaled{scalefactor*1000}{PSfilename} allows to bypass the
-%   rounding errors of TeX integer divisions for situations where the
-%   TeX box should fit the original BoundingBox with a precision better
-%   than 1/1000.
-%
-\def\psboxscaled#1#2{\vbox{
-  \ReadPSize{#2}
-  \xscale=#1
-  \message{scaled \the\xscale}
-  \divide\drawingwd by 1000\multiply\drawingwd by\xscale
-  \divide\drawinght by 1000\multiply\drawinght by\xscale
-  \divide \psxoffset by 1000\multiply\psxoffset by \xscale
-  \divide \psyoffset by 1000\multiply\psyoffset by \xscale
-  \global\divide\pscm by 1000
-  \global\multiply\pscm by\xscale
-  \global\setbox\drawingBox=\hbox to 0pt{\kern\psxoffset\vbox to 0pt{
-     \kern-\psyoffset
-     \PSspeci@l{\PSfilename}{\the\xscale}
-     \vss}\hss\ps@nnotation}
-  \global\ht\drawingBox=\the\drawinght
-  \global\wd\drawingBox=\the\drawingwd
-  \baselineskip=0pt
-  \copy\drawingBox
-  \global\psxoffset=0pt
-  \global\psyoffset=0pt% These are local to one figure
-  \global\pscm=1cm
-  \global\drawingwd=\drawingwd
-  \global\drawinght=\drawinght
-}}
-%
-%  \psbox{PSfilename} makes a TeX box having the minimal size to
-%      enclose the picture
-\def\psbox#1{\psboxscaled{1000}{#1}}
-%
-%
-%  \joinfiles file1, file2, ...n \into joinedfilename .
-%     makes one file out of many
-%  \splitfile joinedfilename
-%     the opposite
-%
-%\def\execute#1{#1}% NOT stupid: cs in #1 are then identified BEFORE execution
-%\def\psm@keother#1{\catcode`#112\relax}% borrowed from latex
-%\def\executeinspecs#1{%
-%\execute{\begingroup\let\do\psm@keother\dospecials\catcode`\^^M=9#1\endgroup}}
-%\newread\pst@mpin
-\newif\ifn@teof\n@teoftrue
-\newif\ifc@ntrolline
-\newif\ifmatch
-\newread\j@insplitin
-\newwrite\j@insplitout
-\newwrite\psbj@inaux
-\immediate\openout\psbj@inaux=psbjoin.aux
-\immediate\write\psbj@inaux{\string\joinfiles}
-\immediate\write\psbj@inaux{\jobname,}
-%
-% We redefine input to keep track of the various files inputted
-%
-\immediate\let\oldinput=\input
-\def\input#1 {
- \immediate\write\psbj@inaux{#1,}
- \oldinput #1 }
-\def\empty{}
-\def\setmatchif#1\contains#2{
-  \def\match##1#2##2\endmatch{
-    \def\tmp{##2}
-    \ifx\empty\tmp
-      \matchfalse
-    \else
-      \matchtrue
-    \fi}
-  \match#1#2\endmatch}
-\def\warnopenout#1#2{
- \setmatchif{TrashMe,psbjoin.aux,psbjoin.all}\contains{#2}
- \ifmatch
- \else
-   \immediate\openin\pst@mpin=#2
-   \ifeof\pst@mpin
-     \else
-     \errhelp{If the content of this file is so precious to you, abort (ie
-press x or e) and rename it before retrying.}
-     \errmessage{I'm just about to replace your file named #2}
-   \fi
-   \immediate\closein\pst@mpin
- \fi
- \message{#2}
- \immediate\openout#1=#2}
-%  No comments allowed below: % will have an unusual catcode
-{
-\catcode`\%=12
-\gdef\splitfile#1 {
- \immediate\openin\j@insplitin=#1
- \message{Splitting file #1 into:}
- \warnopenout\j@insplitout{TrashMe}
- \loop
-   \ifeof
-     \j@insplitin\immediate\closein\j@insplitin\n@teoffalse
-   \else
-     \n@teoftrue
-     \executeinspecs{\global\read\j@insplitin to\spl@tinline\expandafter
-       \ch@ckbeginnewfile\spl@tinline%Beginning-Of-File-Named:%\endcheck}
-     \ifc@ntrolline
-     \else
-       \toks0=\expandafter{\spl@tinline}
-       \immediate\write\j@insplitout{\the\toks0}
-     \fi
-   \fi
- \ifn@teof\repeat
- \immediate\closeout\j@insplitout}
-\gdef\ch@ckbeginnewfile#1%Beginning-Of-File-Named:#2%#3\endcheck{
- \def\t@mp{#1}
- \ifx\empty\t@mp
-   \def\t@mp{#3}
-   \ifx\empty\t@mp
-     \global\c@ntrollinefalse
-   \else
-     \immediate\closeout\j@insplitout
-     \warnopenout\j@insplitout{#2}
-     \global\c@ntrollinetrue
-   \fi
- \else
-   \global\c@ntrollinefalse
- \fi}
-\gdef\joinfiles#1\into#2 {
- \message{Joining following files into}
- \warnopenout\j@insplitout{#2}
- \message{:}
- {
- \edef\w@##1{\immediate\write\j@insplitout{##1}}
- \w@{% This text was produced with psbox's \string\joinfiles.}
- \w@{% To decompose and tex it:}
- \w@{%-save this with a filename CONTAINING ONLY LETTERS, and no extensions}
- \w@{% (say, JOINTFIL), in some uncrowded directory;}
- \w@{%-make sure you can \string\input\space psbox.tex (version>=1.3);}
- \w@{%-tex JOINTFIL using Plain, or LaTeX, or whatever is needed by}
- \w@{% the first part in the joining (after splitting JOINTFIL into}
- \w@{% it's constituents, TeX will try to process it as it stands).}
- \w@{\string\input\space psbox.tex}
- \w@{\string\splitfile{\string\jobname}}
- }
- \tre@tfilelist#1, \endtre@t
- \immediate\closeout\j@insplitout}
-\gdef\tre@tfilelist#1, #2\endtre@t{
- \def\t@mp{#1}
- \ifx\empty\t@mp
-   \else
-   \llj@in{#1}
-   \tre@tfilelist#2, \endtre@t
- \fi}
-\gdef\llj@in#1{
- \immediate\openin\j@insplitin=#1
- \ifeof\j@insplitin
-   \errmessage{I couldn't find file #1.}
-   \else
-   \message{#1}
-   \toks0={%Beginning-Of-File-Named:#1}
-   \immediate\write\j@insplitout{\the\toks0}
-   \executeinspecs{\global\read\j@insplitin to\oldj@ininline}
-   \loop
-     \ifeof\j@insplitin\immediate\closein\j@insplitin\n@teoffalse
-       \else\n@teoftrue
-       \executeinspecs{\global\read\j@insplitin to\j@ininline}
-       \toks0=\expandafter{\oldj@ininline}
-       \let\oldj@ininline=\j@ininline
-       \immediate\write\j@insplitout{\the\toks0}
-     \fi
-   \ifn@teof
-   \repeat
-   \immediate\closein\j@insplitin
- \fi}
-}
-% To be put at the end of a file, for making an tar-like file containing
-%   everything it used.
-\def\autojoin{
- \immediate\write\psbj@inaux{\string\into\space psbjoin.all}
- \immediate\closeout\psbj@inaux
- \input psbjoin.aux
-}
-%
-%  Annotations & Captions etc...
-%
-%
-% \centinsert{anybox} is just a centered \midinsert, but is included as
-%    people barely use the original inserts from TeX.
-%
-\def\centinsert#1{\midinsert\line{\hss#1\hss}\endinsert}
-\def\psannotate#1#2{\def\ps@nnotation{#2\global\let\ps@nnotation=\relax}#1}
-\def\pscaption#1#2{\vbox{
-   \setbox\drawingBox=#1
-   \copy\drawingBox
-   \vskip\baselineskip
-   \vbox{\hsize=\wd\drawingBox\setbox0=\hbox{#2}
-     \ifdim\wd0>\hsize
-       \noindent\unhbox0\tolerance=5000
-    \else\centerline{\box0}
-    \fi
-}}}
-% for compatibility with older versions
-\def\psfig#1#2#3{\pscaption{\psannotate{#1}{#2}}{#3}}
-\def\psfigurebox#1#2#3{\pscaption{\psannotate{\psbox{#1}}{#2}}{#3}}
-%
-% \at(#1;#2)#3 puts #3 at #1-higher and #2-right of the current
-%    position without moving it (to be used in annotations).
-\def\at(#1;#2)#3{\setbox0=\hbox{#3}\ht0=0pt\dp0=0pt
-  \rlap{\kern#1\vbox to0pt{\kern-#2\box0\vss}}}
-%
-% \gridfill(ht;wd) makes a 1cm*1cm grid of ht by wd whose lower-left
-%   corner is the current point
-\newdimen\gridht \newdimen\gridwd
-\def\gridfill(#1;#2){
-  \setbox0=\hbox to 1\pscm
-  {\vrule height1\pscm width.4pt\leaders\hrule\hfill}
-  \gridht=#1
-  \divide\gridht by \ht0
-  \multiply\gridht by \ht0
-  \gridwd=#2
-  \divide\gridwd by \wd0
-  \multiply\gridwd by \wd0
-  \advance \gridwd by \wd0
-  \vbox to \gridht{\leaders\hbox to\gridwd{\leaders\box0\hfill}\vfill}}
-%
-% Useful to measure where to put annotations
-\def\fillinggrid{\at(0cm;0cm){\vbox{
-  \gridfill(\drawinght;\drawingwd)}}}
-%
-% \textleftof\anybox: Sample text\endtext
-%   inserts "Sample text" on the left of \anybox ie \vbox, \psbox.
-%   \textrightof is the symmetric (not documented, too uggly)
-% Welcome any suggestion about clean wraparound macros from
-%   TeXhackers reading this
-%
-\def\textleftof#1:{
-  \setbox1=#1
-  \setbox0=\vbox\bgroup
-    \advance\hsize by -\wd1 \advance\hsize by -2em}
-\def\textrightof#1:{
-  \setbox0=#1
-  \setbox1=\vbox\bgroup
-    \advance\hsize by -\wd0 \advance\hsize by -2em}
-\def\endtext{
-  \egroup
-  \hbox to \hsize{\valign{\vfil##\vfil\cr%
-\box0\cr%
-\noalign{\hss}\box1\cr}}}
-%
-% \frameit{\thick}{\skip}{\anybox}
-%    draws with thickness \thick a box around \anybox, leaving \skip of
-%    blank around it. eg \frameit{0.5pt}{1pt}{\hbox{hello}}
-% \boxit{\anybox} is a shortcut.
-\def\frameit#1#2#3{\hbox{\vrule width#1\vbox{
-  \hrule height#1\vskip#2\hbox{\hskip#2\vbox{#3}\hskip#2}%
-        \vskip#2\hrule height#1}\vrule width#1}}
-\def\boxit#1{\frameit{0.4pt}{0pt}{#1}}
-%
-%
-\catcode`\@=12 % cs containing @ are unreachable
-%
-% CUSTOMIZE YOUR DEFAULT DRIVER:
-%    Uncomment the line corresponding to your TeX system:
-%\psfortextures%     For TeXtures on the Macintosh
-%\psforoztex   %     For OzTeX shareware on the Macintosh
-%\psfordvitops %     For the DVItoPS converter for TeX on IBM mainframes
- \psfordvips   %     For DVIPS converter on VAX and UNIX
-%\psfordvitps  %     For dvitps from TeXPS package under UNIX
-%\psforDVIALW  %     For DVIALW, UNIX public domain
-%\psonlyboxes  %     Blank Boxes (when all else fails).
diff --git a/contrib/docs/latex/mmedia/sample.tex b/contrib/docs/latex/mmedia/sample.tex
deleted file mode 100644
index 8b8e65c0af..0000000000
--- a/contrib/docs/latex/mmedia/sample.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\chapter{MMboard: a sample MMedia application}\label{mmboard}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-To be written.
-
diff --git a/contrib/docs/latex/mmedia/sndaiff.tex b/contrib/docs/latex/mmedia/sndaiff.tex
deleted file mode 100644
index fc909dd23a..0000000000
--- a/contrib/docs/latex/mmedia/sndaiff.tex
+++ /dev/null
@@ -1,68 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndaiff.h at 26/Feb/00 14:52:29
-%
-
-\section{\class{wxSoundAiff}}\label{wxsoundaiff}
-
-AIFF codec
-
-\wxheading{Derived from}
-
-\helpref{wxSoundFileStream}{wxsoundfilestream}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundAiff::wxSoundAiff}\label{wxsoundaiffwxsoundaiff}
-
-\func{}{wxSoundAiff}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-\func{}{wxSoundAiff}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-\membersection{wxSoundAiff::\destruct{wxSoundAiff}}\label{wxsoundaiffdtor}
-
-\func{}{\destruct{wxSoundAiff}}{\void}
-
-
-\membersection{wxSoundAiff::CanRead}\label{wxsoundaiffcanread}
-
-\func{bool}{CanRead}{\void}
-
-
-\membersection{wxSoundAiff::GetCodecName}\label{wxsoundaiffgetcodecname}
-
-\constfunc{wxString}{GetCodecName}{\void}
-
-
-\membersection{wxSoundAiff::PrepareToPlay}\label{wxsoundaiffpreparetoplay}
-
-\func{bool}{PrepareToPlay}{\void}
-
-
-\membersection{wxSoundAiff::PrepareToRecord}\label{wxsoundaiffpreparetorecord}
-
-\func{bool}{PrepareToRecord}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundAiff::FinishRecording}\label{wxsoundaifffinishrecording}
-
-\func{bool}{FinishRecording}{\void}
-
-
-\membersection{wxSoundAiff::RepositionStream}\label{wxsoundaiffrepositionstream}
-
-\func{bool}{RepositionStream}{\param{wxUint32 }{position}}
-
-
-\membersection{wxSoundAiff::GetData}\label{wxsoundaiffgetdata}
-
-\func{wxUint32}{GetData}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundAiff::PutData}\label{wxsoundaiffputdata}
-
-\func{wxUint32}{PutData}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
diff --git a/contrib/docs/latex/mmedia/sndbase.tex b/contrib/docs/latex/mmedia/sndbase.tex
deleted file mode 100644
index 3199db9b00..0000000000
--- a/contrib/docs/latex/mmedia/sndbase.tex
+++ /dev/null
@@ -1,294 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Name:        sndbase.tex
-%% Purpose:     wxMMedia docs
-%% Author:      Guilhem Lavaux <lavaux@easynet.fr>
-%% Modified by:
-%% Created:     2000
-%% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% Licence:     wxWindows licence
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{\class{wxSoundStream}}\label{wxsoundstream}
-
-Base class for sound streams
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Include files}
-
-<wx/mmedia/sndbase.h>
-
-\wxheading{Data structures}
-
-%%
-%% wxSoundStream errors
-%%
-
-\wxheading{wxSoundStream errors}
-
-\twocolwidtha{7cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxSOUND\_NOERR}}{No error occurred}
-\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occurred, it may concern
-either a driver or a file}
-\twocolitem{{\bf wxSOUND\_INVFRMT}}{The sound format passed to the function is
-invalid. Generally, it means that you passed out of range values to the codec
-stream or you don't pass the right sound format object to the right sound codec
-stream.}
-\twocolitem{{\bf wxSOUND\_INVDEV}}{Invalid device. Generally, it means that the
-sound stream didn't manage to open the device driver due to an invalid parameter
-or to the fact that sound is not supported on this computer.}
-\twocolitem{{\bf wxSOUND\_NOEXACT}}{No exact matching sound codec has been found for
-this sound format. It means that the sound driver didn't manage to setup the sound
-card with the specified values.}
-\twocolitem{{\bf wxSOUND\_NOCODEC}}{No matching codec has been found. Generally, it 
-may happen when you call wxSoundRouterStream::SetSoundFormat().}
-\twocolitem{{\bf wxSOUND\_MEMERR}}{Not enough memory.}
-\end{twocollist}
-
-%%
-%% C callback
-%%
-
-\wxheading{C callback for wxSound event}
-
-When a sound event is generated, it may either call the internal sound event 
-processor (which can be inherited) or call a C function. Its definition is:
-
-\begin{verbatim}
-  typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt,
-                                  void *cdata);
-\end{verbatim}
-
-The {\bf stream} parameter represents the current wxSoundStream.
-
-The {\bf evt} parameter represents the sound event which is the cause of the calling. (See \helpref{wxSound events}{wxsoundstream}).
-
-The {\bf cdata} parameter represents the user callback data which were specified
-when the user called \helpref{wxSoundStream::Register}{wxsoundstreamregister}.
-
-{\it Note:} There are two other ways to catch sound events: you can inherit the
-sound stream and redefine \helpref{wxSoundStream::OnSoundEvent}{wxsoundstreamonsoundevent}, or you can reroute the events to another sound stream using \helpref{wxSoundStream::SetEventHandler}{wxsoundstreamseteventhandler}.
-
-%%
-%% wxSoundStream streaming mode
-%%
-
-\wxheading{wxSound streaming mode}
-
-The wxSoundStream object can work in three different modes. These modes are specified
-at the call to \helpref{wxSoundStream::StartProduction}{wxsoundstreamstartproduction} 
-and cannot be changed until you call 
-\helpref{wxSoundStream::StopProduction}{wxsoundstreamstopproduction}.
-
-The {\bf wxSOUND\_INPUT} mode is the recording mode. It generates {\bf wxSOUND\_INPUT} 
-events and you cannot use wxSoundStream::Write().
-
-The {\bf wxSOUND\_OUTPUT} mode is the playing mode. It generates {\bf wxSOUND\_OUTPUT} 
-events and you cannot use wxSoundStream::Read().
-
-The {\bf wxSOUND\_DUPLEX} mode activates the full duplex mode. The full duplex requires
-you to make synchronous call to \helpref{wxSoundStream::Read}{wxsoundstreamread} and 
-\helpref{wxSoundStream::Write}{wxsoundstreamwrite}. This means that you must be
-careful with realtime problems. Each time you call Read you must call Write.
-
-%%
-%% wxSoundStream events
-%%
-
-\wxheading{wxSoundStream events}
-
-The sound events are generated when the sound driver (or the sound stream) completes
-a previous sound buffer. There are two possible sound events and two meanings.
-
-The {\bf wxSOUND\_INPUT} event is generated when the sound stream has a new input
-buffer ready to be read. You know that you can read a buffer of the size
-\helpref{GetBestSize()}{wxsoundstreamgetbestsize} without blocking. 
-
-The {\bf wxSOUND\_OUTPUT} event is generated when the sound stream has completed a
-previous buffer. This buffer has been sent to the sound driver and it is ready to
-process a new buffer. Consequently, \helpref{Write}{wxsoundstreamwrite} will not
-block too.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-%% Ctor && Dtor
-
-\membersection{wxSoundStream::wxSoundStream}\label{wxsoundstreamwxsoundstream}
-
-\func{}{wxSoundStream}{\void}
-
-Default constructor.
-
-\membersection{wxSoundStream::\destruct{wxSoundStream}}\label{wxsoundstreamdtor}
-
-\func{}{\destruct{wxSoundStream}}{\void}
-
-Destructor. The destructor stops automatically all started production and destroys
-any temporary buffer.
-
-%%
-%% Read
-%%
-
-\membersection{wxSoundStream::Read}\label{wxsoundstreamread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-Reads {\it len} bytes from the sound stream. This call may block the user so
-use it carefully when you need to intensively refresh the GUI. You may be
-interested by sound events: see \helpref{wxSoundStream::OnSoundEvent}{wxsoundstreamonsoundevent}. 
-
-It is better to use the size returned by \helpref{wxSoundStream::GetBestSize}{wxsoundstreamgetbestsize}: this may improve performance or accuracy of the
-sound event system.
-
-\wxheading{Parameters}
-
-\docparam{len}{{\it len} is expressed in bytes. If you need to do conversions between bytes
-and seconds use wxSoundFormat.
-See \helpref{wxSoundFormatBase}{wxsoundformatbase}, \helpref{wxSoundStream::GetSoundFormat}{wxsoundstreamgetsoundformat}.}
-
-\docparam{data}{Data in \it{buffer} are coded using the sound format attached to this sound 
-stream. The format is specified with 
-\helpref{SetSoundFormat}{wxsoundstreamsetsoundformat}.}
-
-%%
-%% Write
-%%
-
-\membersection{wxSoundStream::Write}\label{wxsoundstreamwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-Writes \it{len} bytes to the sound stream. This call may block the user so
-use it carefully. You may be interested by sound events: see
-\helpref{wxSoundStream::OnSoundEvent}{wxsoundstreamonsoundevent}.
-
-It is better to use the size returned by \helpref{wxSoundStream::GetBestSize}{wxsoundstreamgetbestsize}: this may improve performance or accuracy of the
-sound event system.
-
-\wxheading{Parameters}
-
-\docparam{len}{This is expressed in bytes. If you need to do conversions between bytes
-and seconds use wxSoundFormat.
-See \helpref{wxSoundFormatBase}{wxsoundformatbase}, \helpref{wxSoundStream::GetSoundFormat}{wxsoundstreamgetsoundformat}.}
-
-\docparam{buffer}{Data in \it{buffer} are coded using the sound format attached to this sound 
-stream. The format is specified with 
-\helpref{SetSoundFormat}{wxsoundstreamsetsoundformat}.}
-
-%%
-%% GetBestSize
-%%
-
-\membersection{wxSoundStream::GetBestSize}\label{wxsoundstreamgetbestsize}
-
-\constfunc{wxUint32}{GetBestSize}{\void}
-
-This function returns the best size for IO calls. The best size provides you
-a good alignment for data to be written (or read) to (or from) the sound stream.
-So, when, for example, a sound event is sent, you are sure the sound stream
-will not block for this buffer size.
-
-%%
-%% wxSoundStream:SetSoundFormat
-%%
-
-\membersection{wxSoundStream::SetSoundFormat}\label{wxsoundstreamsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-SetSoundFormat is one of the key function of the wxSoundStream object.
-It specifies the sound format the user needs. SetSoundFormat tries to
-apply the format to the current sound stream (it can be a sound file or a
-sound driver). Then, either it manages to apply it and it returns {\bf TRUE},
-or it could not and it returns {\bf FALSE}. In this case, you must check
-the error with 
-\helpref{wxSoundStream::GetError}{wxsoundstreamgeterror}. See 
-\helpref{wxSoundStream errors section}{wxsoundstream} for more details.
-
-\wxheading{Note}
-
-The {\bf format} object can be destroyed after the call. The object does not need it.
-
-\wxheading{Note}
-
-If the error is {\bf wxSOUND\_NOTEXACT}, the stream tries to find the best
-approaching format and setups it. You can check the format which it applied
-with \helpref{wxSoundStream::GetSoundFormat}{wxsoundstreamgetsoundformat}.
-
-%%
-%% GetSoundFormat
-%%
-\membersection{wxSoundStream::GetSoundFormat}\label{wxsoundstreamgetsoundformat}
-\constfunc{wxSoundFormatBase\&}{GetSoundFormat}{\void}
-
-It returns a reference to the current sound format of the stream represented by a
-wxSoundFormatBase object. This object {\it must not} be destroyed by anyone except
-the stream itself.
-
-%%
-%% SetCallback
-%%
-\membersection{wxSoundStream::SetCallback}\label{wxsoundstreamregister}
-
-\func{void}{Register}{\param{int }{evt}, \param{wxSoundCallback }{cbk}, \param{void* }{cdata}}
-
-It installs a C callback for wxSoundStream events. The C callbacks are still
-useful to avoid hard inheritance. You can install only one callback per event.
-Each callback has its callback data.
-
-%%
-%% StartProduction
-%%
-\membersection{wxSoundStream::StartProduction}\label{wxsoundstreamstartproduction}
-
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-StartProduction starts the sound streaming. {\it evt} may be one of 
-{\bf wxSOUND\_INPUT}, {\bf wxSOUND\_OUTPUT} or {\bf wxSOUND\_DUPLEX}.
-You cannot specify several flags at the same time. Starting the production
-may automaticaly in position of buffer underrun (only in the case you activated
-recording). Actually this may happen the sound IO queue is too short.
-It is also advised that you fill quickly enough the sound IO queue when the
-driver requests it (through a wxSoundEvent).
-
-\membersection{wxSoundStream::StopProduction}\label{wxsoundstreamstopproduction}
-
-\func{bool}{StopProduction}{\void}
-
-I stops the async notifier and the sound streaming straightly.
-
-\membersection{wxSoundStream::SetEventHandler}\label{wxsoundstreamseteventhandler}
-
-\func{void}{SetEventHandler}{\param{wxSoundStream* }{handler}}
-
-Sets the event handler: if it is non-null, all events are routed to it.
-
-\membersection{wxSoundStream::GetError}\label{wxsoundstreamgeterror}
-
-\constfunc{wxSoundError}{GetError}{\void}
-
-It returns the last error which occurred.
-
-\membersection{wxSoundStream::GetLastAccess}\label{wxsoundstreamgetlastaccess}
-
-\constfunc{wxUint32}{GetLastAccess}{\void}
-
-It returns the number of bytes which were effectively written to/read from the sound stream.
-
-\membersection{wxSoundStream::QueueFilled}\label{wxsoundstreamqueuefilled}
-
-\constfunc{bool}{QueueFilled}{\void}
-
-It returns whether the sound IO queue is full. When it is full, the next IO call will block
-until the IO queue has at least one empty entry.
-
-\membersection{wxSoundStream::OnSoundEvent}\label{wxsoundstreamonsoundevent}
-
-\func{void}{OnSoundEvent}{\param{int }{evt}}
-
-It is called by the wxSoundStream when a new sound event occurred.
-
diff --git a/contrib/docs/latex/mmedia/sndcodec.tex b/contrib/docs/latex/mmedia/sndcodec.tex
deleted file mode 100644
index d836c0b728..0000000000
--- a/contrib/docs/latex/mmedia/sndcodec.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndcodec.h at 26/Feb/00 14:26:29
-%
-
-\section{\class{wxSoundStreamCodec}}\label{wxsoundstreamcodec}
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStream}{wxsoundstream}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSoundStreamCodec::wxSoundStreamCodec}\label{wxsoundstreamcodecwxsoundstreamcodec}
-
-\func{}{wxSoundStreamCodec}{\param{wxSoundStream\& }{snd\_io}}
-
-
-\membersection{wxSoundStreamCodec::\destruct{wxSoundStreamCodec}}\label{wxsoundstreamcodecdtor}
-
-\func{}{\destruct{wxSoundStreamCodec}}{\void}
-
-
-\membersection{wxSoundStreamCodec::StartProduction}\label{wxsoundstreamcodecstartproduction}
-
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-
-\membersection{wxSoundStreamCodec::StopProduction}\label{wxsoundstreamcodecstopproduction}
-
-\func{bool}{StopProduction}{\void}
-
-
-\membersection{wxSoundStreamCodec::GetBestSize}\label{wxsoundstreamcodecgetbestsize}
-
-\constfunc{wxUint32}{GetBestSize}{\void}
-
diff --git a/contrib/docs/latex/mmedia/sndesd.tex b/contrib/docs/latex/mmedia/sndesd.tex
deleted file mode 100644
index 4d860e2025..0000000000
--- a/contrib/docs/latex/mmedia/sndesd.tex
+++ /dev/null
@@ -1,64 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndesd.h at 26/Feb/00 14:26:56
-%
-
-\section{\class{wxSoundStreamESD}}\label{wxsoundstreamesd}
-
-ESD output class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStream}{wxsoundstream}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamESD::wxSoundStreamESD}\label{wxsoundstreamesdwxsoundstreamesd}
-
-\func{}{wxSoundStreamESD}{\param{const wxString\& }{hostname = "localhost"}}
-
-
-\membersection{wxSoundStreamESD::\destruct{wxSoundStreamESD}}\label{wxsoundstreamesddtor}
-
-\func{}{\destruct{wxSoundStreamESD}}{\void}
-
-
-\membersection{wxSoundStreamESD::Read}\label{wxsoundstreamesdread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamESD::Write}\label{wxsoundstreamesdwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamESD::SetSoundFormat}\label{wxsoundstreamesdsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-
-\membersection{wxSoundStreamESD::StartProduction}\label{wxsoundstreamesdstartproduction}
-
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-
-\membersection{wxSoundStreamESD::StopProduction}\label{wxsoundstreamesdstopproduction}
-
-\func{bool}{StopProduction}{\void}
-
-
-\membersection{wxSoundStreamESD::WakeUpEvt}\label{wxsoundstreamesdwakeupevt}
-
-\func{void}{WakeUpEvt}{\param{int }{evt}}
-
-You should not call this.
-
-
-\membersection{wxSoundStreamESD::QueueFilled}\label{wxsoundstreamesdqueuefilled}
-
-\constfunc{bool}{QueueFilled}{\void}
-
diff --git a/contrib/docs/latex/mmedia/sndfg72x.tex b/contrib/docs/latex/mmedia/sndfg72x.tex
deleted file mode 100644
index 46d97f6f72..0000000000
--- a/contrib/docs/latex/mmedia/sndfg72x.tex
+++ /dev/null
@@ -1,87 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndg72x.h at 26/Feb/00 14:52:19
-%
-
-
-\section{\class{wxSoundFormatG72X}}\label{wxsoundformatg72x}
-
-
-G72X format
-
-\wxheading{Derived from}
-
-\helpref{wxSoundFormatBase}{wxsoundformatbase}
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef enum {
-  wxSOUND\_G721,
-  wxSOUND\_G723\_24,
-  wxSOUND\_G723\_40
-} wxSoundG72XType
-\end{verbatim}}
-
-{\small \begin{verbatim}
-typedef struct g72x\_state g72state
-\end{verbatim}}
-
-This fixes a bug in Mingw95
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSoundFormatG72X::wxSoundFormatG72X}\label{wxsoundformatg72xwxsoundformatg72x}
-
-\func{}{wxSoundFormatG72X}{\void}
-
-
-\membersection{wxSoundFormatG72X::\destruct{wxSoundFormatG72X}}\label{wxsoundformatg72xdtor}
-
-\func{}{\destruct{wxSoundFormatG72X}}{\void}
-
-
-\membersection{wxSoundFormatG72X::SetG72XType}\label{wxsoundformatg72xsetg72xtype}
-
-\func{void}{SetG72XType}{\param{wxSoundG72XType }{type}}
-
-
-\membersection{wxSoundFormatG72X::GetG72XType}\label{wxsoundformatg72xgetg72xtype}
-
-\constfunc{wxSoundG72XType}{GetG72XType}{\void}
-
-
-\membersection{wxSoundFormatG72X::SetSampleRate}\label{wxsoundformatg72xsetsamplerate}
-
-\func{void}{SetSampleRate}{\param{wxUint32 }{srate}}
-
-
-\membersection{wxSoundFormatG72X::GetSampleRate}\label{wxsoundformatg72xgetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-
-\membersection{wxSoundFormatG72X::GetType}\label{wxsoundformatg72xgettype}
-
-\constfunc{wxSoundFormatType}{GetType}{\void}
-
-
-\membersection{wxSoundFormatG72X::Clone}\label{wxsoundformatg72xclone}
-
-\constfunc{wxSoundFormatBase*}{Clone}{\void}
-
-
-\membersection{wxSoundFormatG72X::GetTimeFromBytes}\label{wxsoundformatg72xgettimefrombytes}
-
-\constfunc{wxUint32}{GetTimeFromBytes}{\param{wxUint32 }{bytes}}
-
-
-\membersection{wxSoundFormatG72X::GetBytesFromTime}\label{wxsoundformatg72xgetbytesfromtime}
-
-\constfunc{wxUint32}{GetBytesFromTime}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundFormatG72X::operator!=}\label{wxsoundformatg72xoperatorneq}
-
-\constfunc{bool}{operator!=}{\param{const wxSoundFormatBase\& }{frmt2}}
-
diff --git a/contrib/docs/latex/mmedia/sndfile.tex b/contrib/docs/latex/mmedia/sndfile.tex
deleted file mode 100644
index 7a6b9c9eca..0000000000
--- a/contrib/docs/latex/mmedia/sndfile.tex
+++ /dev/null
@@ -1,243 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Name:        sndfile.tex
-%% Purpose:     wxMMedia docs
-%% Author:      Guilhem Lavaux <lavaux@easynet.fr>
-%% Modified by:
-%% Created:     2000
-%% RCS-ID:      $Id$
-%% Copyright:   (c) wxWindows team
-%% Licence:     wxWindows licence
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{\class{wxSoundFileStream}}\label{wxsoundfilestream}
-
-Base class for file coders/decoders. This class is not constructor (it is an abstract
-class).
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStream}{wxsoundstream}
-
-\wxheading{Include file}
-
-wx/sndfile.h
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSoundFileStream::wxSoundFileStream}\label{wxsoundfilestreamwxsoundfilestream}
-
-\func{}{wxSoundFileStream}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-It constructs a new file decoder object which will send 
-audio data to the specified sound stream. 
-The {\it stream} is the input stream to be decoded. The
-{\it io\_sound} is the destination sound stream.
-Once it has been constructed, you cannot change any of
-the specified streams nor the direction of the stream.
-
-You will have access to the playback functions.
-
-\func{}{wxSoundFileStream}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-It constructs a new file coder object which will get
-data to be recorded from the specified sound stream.
-The {\it stream} is the output wxStream. The {\it io\_sound}
-is the source sound stream of the audio data. Once
-it has been constructed, you cannot change any of
-the specified streams nor the direction of the stream.
-
-\membersection{wxSoundFileStream::\destruct{wxSoundFileStream}}\label{wxsoundfilestreamdtor}
-\func{}{\destruct{wxSoundFileStream}}{\void}
-
-It destroys the current sound file codec.
-
-\membersection{wxSoundFileStream::Play}\label{wxsoundfilestreamplay}
-\func{bool}{Play}{\void}
-
-It starts playing the file. The playing begins, in background
-in nearly all cases, after the return of the function. The
-codec returns to a {\bf stopped} state when it reaches the
-end of the file.
-On success, it returns TRUE.
-
-\membersection{wxSoundFileStream::Record}\label{wxsoundfilestreamrecord}
-\func{bool}{Record}{\param{wxUint32 }{time}}
-
-It starts recording data from the sound stream and writing them
-to the output stream. You have to precise the recording length in
-parameter. This length is expressed in seconds. If you want to
-control the record length (using \helpref{Stop}{wxsoundfilestreamstop}),
-you can set it to wxSOUND\_INFINITE\_TIME.
-
-On success, it returns TRUE.
-
-\membersection{wxSoundFileStream::Stop}\label{wxsoundfilestreamstop}
-\func{bool}{Stop}{\void}
-
-It stops either recording or playing. Whatever happens (even unexpected
-errors), the stream is stopped when the function returns. When you are
-in recording mode, the file headers are updated and flushed if possible
-(ie: if the output stream is seekable).
-
-On success, it returns TRUE.
-
-\membersection{wxSoundFileStream::Pause}\label{wxsoundfilestreampause}
-\func{bool}{Pause}{\void}
-
-The file codec tries to pause the stream: it means that it stops audio
-production but keep the file pointer at the place.
-
-If the file codec is already paused, it returns FALSE.
-
-On success, it returns TREE.
-
-\membersection{wxSoundFileStream::Resume}\label{wxsoundfilestreamresume}
-\func{bool}{Resume}{\void}
-
-When the file codec has been paused using
-\helpref{Pause}{wxsoundfilestreampause}, you could be interrested in
-resuming it. This is the goal of this function.
-
-\membersection{wxSoundFileStream::IsStopped}\label{wxsoundfilestreamisstopped}
-\constfunc{bool}{IsStopped}{\void}
-
-It returns TRUE when the stream is stopped, in another case it returns
-FALSE.
-
-\membersection{wxSoundFileStream::IsPaused}\label{wxsoundfilestreamispaused}
-\constfunc{bool}{IsPaused}{\void}
-
-It returns TRUE when the stream is paused, in another case it returns
-FALSE.
-
-\membersection{wxSoundFileStream::StartProduction}\label{wxsoundfilestreamstartproduction}
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-It is really not advised you call this function. From the wxSoundFileStream
-point of view it is an internal function. Internally, it is called after
-the file stream has been prepared to be played or to receive audio data and 
-when it wants to start processing audio data.
-
-\membersection{wxSoundFileStream::StopProduction}\label{wxsoundfilestreamstopproduction}
-\func{bool}{StopProduction}{\void}
-
-As for \helpref{StartProduction}{wxsoundfilestreamstopproduction}, it is not
-advised for you to call this function. It is called by
-\helpref{Stop}{wxsoundfilestreamstop} when it needs to stop the audio data
-processing.
-
-\membersection{wxSoundFileStream::GetLength}\label{wxsoundfilestreamgetlength}
-\func{wxUint32}{GetLength}{\void}
-
-It returns the audio data length of the file stream. This length is expressed
-in bytes. If you need the length in seconds, you will need to use
-\helpref{GetSoundFormat}{wxsoundstreamgetsoundformat} and
-\helpref{GetTimeFromBytes}{wxsoundformatbasegettimefrombytes}.
-
-\membersection{wxSoundFileStream::GetPosition}\label{wxsoundfilestreamgetposition}
-\func{wxUint32}{GetPosition}{\void}
-
-It returns the current position in the soundfile stream. The position
-is expressed in bytes. If you need the length in seconds, you will need to use
-\helpref{GetSoundFormat}{wxsoundstreamgetsoundformat} and
-\helpref{GetTimeFromBytes}{wxsoundformatbasegettimefrombytes}.
-
-\membersection{wxSoundFileStream::SetPosition}\label{wxsoundfilestreamsetposition}
-\func{wxUint32}{SetPosition}{\param{wxUint32 }{new\_position}}
-
-It sets the current in the soundfile stream. The position
- {\it new\_position} must be expressed in bytes. You can get
-a length/position in bytes from a time value using
-\helpref{GetSoundFormat}{wxsoundstreamgetsoundformat} and 
-\helpref{GetTimeFromBytes}{wxsoundformatbasegettimefrombytes}.
-
-On success, it returns TRUE.
-
-\wxheading{Warning}
-
-Some wxStream may not be capable to support this function as
-it may not support the seekable functionnality. If this happens,
-it returns FALSE and leave the stream at the same position.
-
-\membersection{wxSoundFileStream::Read}\label{wxsoundfilestreamread}
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-You can obtain the audio data encoded in the file using this function.
-But it must be considered as an internal function. Used carelessly, it
-may corrupt the current state of the stream.
-Data are returned using in the original file coding (You must use a sound
-format object to decode it).
-
-\membersection{wxSoundFileStream::Write}\label{wxsoundfilestreamwrite}
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-You can put encoded audio data to the file using this function.
-But it must be considered as an internal function. Used carelessly, it
-may corrupt the current state of the stream.
-Data must be coded with the specified file coding (You must use a sound
-format object to do this).
-
-\membersection{wxSoundFileStream::SetSoundFormat}\label{wxsoundfilestreamsetsoundformat}
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-\membersection{wxSoundFileStream::GetCodecName}\label{wxsoundfilestreamgetcodecname}
-\constfunc{wxString}{GetCodecName}{\void}
-
-This function returns the Codec name. This is useful for those who
-want to build a player (But also in some other case).
-
-\membersection{wxSoundFileStream::CanRead}\label{wxsoundfilestreamcanread}
-\func{bool}{CanRead}{\void}
-
-You should use this function to test whether this file codec can read
-the stream you passed to it.
-
-\membersection{wxSoundFileStream::PrepareToPlay}\label{wxsoundfilestreampreparetoplay}
-\func{bool}{PrepareToPlay}{\void}
-
-It is called by wxSoundFileStream to prepare the specific file loader
-to prepare itself to play the file. Actually, this includes reading
-headers and setting the various parameters of the sound format.
-This should not be called by an external user but it should be
-implemented when you inherit wxSoundFileStream to build a new codec.
-
-It must return when the file is identified and the parameters have
-been set. In all other cases, you must return FALSE.
-
-\membersection{wxSoundFileStream::PrepareToRecord}\label{wxsoundfilestreampreparetorecord}
-\func{bool}{PrepareToRecord}{\param{wxUint32 }{time}}
-
-\membersection{wxSoundFileStream::FinishRecording}\label{wxsoundfilestreamfinishrecording}
-\func{bool}{FinishRecording}{\void}
-
-\membersection{wxSoundFileStream::RepositionStream}\label{wxsoundfilestreamrepositionstream}
-\func{bool}{RepositionStream}{\param{wxUint32 }{position}}
-
-This is called by wxSoundFileStream::SetPosition to seek the input stream
-to the right position. This must be overidden by the file codec class.
-The position is relative to the beginning of the samples.
-If it is impossible (as for a piped input stream), you must return FALSE.
-
-\membersection{wxSoundFileStream::FinishPreparation}\label{wxsoundfilestreamfinishpreparation}
-\func{void}{FinishPreparation}{\param{wxUint32 }{len}}
-
-This is an internal function but it must called by the file codec class when
-the "playing" preparation is finished and you know the size of the stream.
-If it is an {\it infinite} stream, you should set this to wxSOUND\_INFINITE\_TIME.
-
-\membersection{wxSoundFileStream::GetData}\label{wxsoundfilestreamgetdata}
-\func{wxUint32}{GetData}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-This is called by wxSoundFileStream when it needs to get new sound data to
-send to the device driver (or to a conversion codec). This must be eventually
-overidden by the file codec class. The default behaviour is simply to read from
-the input stream.
-
-\membersection{wxSoundFileStream::PutData}\label{wxsoundfilestreamputdata}
-\func{wxUint32}{PutData}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-This is called by wxSoundFileStream when it needs to put new sound data received
-from the device driver (or from a conversion codec). This must be eventually
-overidden by the file codec class. The default behaviour is simply to write to
-the input stream.
diff --git a/contrib/docs/latex/mmedia/sndfpcm.tex b/contrib/docs/latex/mmedia/sndfpcm.tex
deleted file mode 100644
index 9c14d08a9e..0000000000
--- a/contrib/docs/latex/mmedia/sndfpcm.tex
+++ /dev/null
@@ -1,104 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndpcm.h at 26/Feb/00 14:26:33
-%
-
-
-\section{\class{wxSoundFormatPcm}}\label{wxsoundformatpcm}
-
-
-PCM specification class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundFormatBase}{wxsoundformatbase}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundFormatPcm::wxSoundFormatPcm}\label{wxsoundformatpcmwxsoundformatpcm}
-
-\func{}{wxSoundFormatPcm}{\param{wxUint32 }{srate = 22500}, \param{wxUint8 }{bps = 8}, \param{wxUint16 }{channels = 2}, \param{bool }{sign = TRUE}, \param{int }{order = wxLITTLE\_ENDIAN}}
-
-
-\membersection{wxSoundFormatPcm::\destruct{wxSoundFormatPcm}}\label{wxsoundformatpcmdtor}
-
-\func{}{\destruct{wxSoundFormatPcm}}{\void}
-
-
-\membersection{wxSoundFormatPcm::SetSampleRate}\label{wxsoundformatpcmsetsamplerate}
-
-\func{void}{SetSampleRate}{\param{wxUint32 }{srate}}
-
-
-\membersection{wxSoundFormatPcm::SetBPS}\label{wxsoundformatpcmsetbps}
-
-\func{void}{SetBPS}{\param{wxUint8 }{bps}}
-
-
-\membersection{wxSoundFormatPcm::SetChannels}\label{wxsoundformatpcmsetchannels}
-
-\func{void}{SetChannels}{\param{wxUint16 }{nchannels}}
-
-
-\membersection{wxSoundFormatPcm::SetOrder}\label{wxsoundformatpcmsetorder}
-
-\func{void}{SetOrder}{\param{int }{order}}
-
-
-\membersection{wxSoundFormatPcm::Signed}\label{wxsoundformatpcmsigned}
-
-\func{void}{Signed}{\param{bool }{sign}}
-
-
-\membersection{wxSoundFormatPcm::GetSampleRate}\label{wxsoundformatpcmgetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-
-\membersection{wxSoundFormatPcm::GetBPS}\label{wxsoundformatpcmgetbps}
-
-\constfunc{wxUint8}{GetBPS}{\void}
-
-
-\membersection{wxSoundFormatPcm::GetChannels}\label{wxsoundformatpcmgetchannels}
-
-\constfunc{wxUint16}{GetChannels}{\void}
-
-
-\membersection{wxSoundFormatPcm::GetOrder}\label{wxsoundformatpcmgetorder}
-
-\constfunc{int}{GetOrder}{\void}
-
-
-\membersection{wxSoundFormatPcm::Signed}\label{wxsoundformatpcmgetsigned}
-
-\constfunc{bool}{Signed}{\void}
-
-
-\membersection{wxSoundFormatPcm::GetType}\label{wxsoundformatpcmgettype}
-
-\constfunc{wxSoundFormatType}{GetType}{\void}
-
-
-\membersection{wxSoundFormatPcm::Clone}\label{wxsoundformatpcmclone}
-
-\constfunc{wxSoundFormatBase*}{Clone}{\void}
-
-
-\membersection{wxSoundFormatPcm::GetTimeFromBytes}\label{wxsoundformatpcmgettimefrombytes}
-
-\constfunc{wxUint32}{GetTimeFromBytes}{\param{wxUint32 }{bytes}}
-
-
-\membersection{wxSoundFormatPcm::GetBytesFromTime}\label{wxsoundformatpcmgetbytesfromtime}
-
-\constfunc{wxUint32}{GetBytesFromTime}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundFormatPcm::operator!}\label{wxsoundformatpcmoperatornot}
-
-\constfunc{bool}{operator!}{\param{const wxSoundFormatBase\& }{frmt2}}
-
diff --git a/contrib/docs/latex/mmedia/sndfrmt.tex b/contrib/docs/latex/mmedia/sndfrmt.tex
deleted file mode 100644
index 388afc7fcd..0000000000
--- a/contrib/docs/latex/mmedia/sndfrmt.tex
+++ /dev/null
@@ -1,69 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndbase.h at 26/Feb/00 14:23:29
-%
-
-
-\section{\class{wxSoundFormatBase}}\label{wxsoundformatbase}
-
-
-Base class for sound format specification
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef enum {
-  wxSOUND\_NOFORMAT,
-  wxSOUND\_PCM,
-  wxSOUND\_ULAW,
-  wxSOUND\_G72X,
-  wxSOUND\_MSADPCM
-} wxSoundFormatType
-\end{verbatim}}
-
-wxSoundFormatType: it specifies the format family of the sound data
-which will be passed to the stream.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSoundFormatBase::wxSoundFormatBase}\label{wxsoundformatbasewxsoundformatbase}
-
-\func{}{wxSoundFormatBase}{\void}
-
-
-\membersection{wxSoundFormatBase::\destruct{wxSoundFormatBase}}\label{wxsoundformatbasedtor}
-
-\func{}{\destruct{wxSoundFormatBase}}{\void}
-
-
-\membersection{wxSoundFormatBase::GetType}\label{wxsoundformatbasegettype}
-
-\constfunc{wxSoundFormatType}{GetType}{\void}
-
-It returns a "standard" format type.
-
-
-\membersection{wxSoundFormatBase::Clone}\label{wxsoundformatbaseclone}
-
-\constfunc{wxSoundFormatBase*}{Clone}{\void}
-
-It clones the current format.
-
-
-\membersection{wxSoundFormatBase::GetTimeFromBytes}\label{wxsoundformatbasegettimefrombytes}
-
-\constfunc{wxUint32}{GetTimeFromBytes}{\param{wxUint32 }{bytes}}
-
-
-\membersection{wxSoundFormatBase::GetBytesFromTime}\label{wxsoundformatbasegetbytesfromtime}
-
-\constfunc{wxUint32}{GetBytesFromTime}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundFormatBase::operator!=}\label{wxsoundformatbaseoperatorneq}
-
-\constfunc{bool}{operator!=}{\param{const wxSoundFormatBase\& }{frmt2}}
diff --git a/contrib/docs/latex/mmedia/sndfulaw.tex b/contrib/docs/latex/mmedia/sndfulaw.tex
deleted file mode 100644
index 538257137f..0000000000
--- a/contrib/docs/latex/mmedia/sndfulaw.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndulaw.h at 26/Feb/00 14:52:25
-%
-
-
-\section{\class{wxSoundFormatUlaw}}\label{wxsoundformatulaw}
-
-
-ULAW format
-
-\wxheading{Derived from}
-
-\helpref{wxSoundFormatBase}{wxsoundformatbase}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundFormatUlaw::wxSoundFormatUlaw}\label{wxsoundformatulawwxsoundformatulaw}
-
-\func{}{wxSoundFormatUlaw}{\void}
-
-
-\membersection{wxSoundFormatUlaw::\destruct{wxSoundFormatUlaw}}\label{wxsoundformatulawdtor}
-
-\func{}{\destruct{wxSoundFormatUlaw}}{\void}
-
-
-\membersection{wxSoundFormatUlaw::SetSampleRate}\label{wxsoundformatulawsetsamplerate}
-
-\func{void}{SetSampleRate}{\param{wxUint32 }{srate}}
-
-
-\membersection{wxSoundFormatUlaw::GetSampleRate}\label{wxsoundformatulawgetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-
-\membersection{wxSoundFormatUlaw::SetChannels}\label{wxsoundformatulawsetchannels}
-
-\func{void}{SetChannels}{\param{wxUint8 }{channels}}
-
-
-\membersection{wxSoundFormatUlaw::GetChannels}\label{wxsoundformatulawgetchannels}
-
-\constfunc{wxUint8}{GetChannels}{\void}
-
-
-\membersection{wxSoundFormatUlaw::GetType}\label{wxsoundformatulawgettype}
-
-\constfunc{wxSoundFormatType}{GetType}{\void}
-
-
-\membersection{wxSoundFormatUlaw::Clone}\label{wxsoundformatulawclone}
-
-\constfunc{wxSoundFormatBase*}{Clone}{\void}
-
-
-\membersection{wxSoundFormatUlaw::GetTimeFromBytes}\label{wxsoundformatulawgettimefrombytes}
-
-\constfunc{wxUint32}{GetTimeFromBytes}{\param{wxUint32 }{bytes}}
-
-
-\membersection{wxSoundFormatUlaw::GetBytesFromTime}\label{wxsoundformatulawgetbytesfromtime}
-
-\constfunc{wxUint32}{GetBytesFromTime}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundFormatUlaw::operator!=}\label{wxsoundformatulawoperatorneq}
-
-\constfunc{bool}{operator!=}{\param{const wxSoundFormatBase\& }{frmt2}}
-
diff --git a/contrib/docs/latex/mmedia/sndg72x.tex b/contrib/docs/latex/mmedia/sndg72x.tex
deleted file mode 100644
index a9e61779a9..0000000000
--- a/contrib/docs/latex/mmedia/sndg72x.tex
+++ /dev/null
@@ -1,54 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndg72x.h at 26/Feb/00 14:52:19
-%
-
-
-\section{\class{wxSoundStreamG72X}}\label{wxsoundstreamg72x}
-
-
-ULAW converter class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStreamCodec}{wxsoundstreamcodec}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamG72X::wxSoundStreamG72X}\label{wxsoundstreamg72xwxsoundstreamg72x}
-
-\func{}{wxSoundStreamG72X}{\param{wxSoundStream\& }{sndio}}
-
-
-\membersection{wxSoundStreamG72X::\destruct{wxSoundStreamG72X}}\label{wxsoundstreamg72xdtor}
-
-\func{}{\destruct{wxSoundStreamG72X}}{\void}
-
-
-\membersection{wxSoundStreamG72X::Read}\label{wxsoundstreamg72xread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamG72X::Write}\label{wxsoundstreamg72xwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamG72X::SetSoundFormat}\label{wxsoundstreamg72xsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-
-\membersection{wxSoundStreamG72X::PutBits}\label{wxsoundstreamg72xputbits}
-
-\func{void}{PutBits}{\param{wxUint8 }{bits}}
-
-
-\membersection{wxSoundStreamG72X::GetBits}\label{wxsoundstreamg72xgetbits}
-
-\func{wxUint8}{GetBits}{\void}
-
diff --git a/contrib/docs/latex/mmedia/sndoss.tex b/contrib/docs/latex/mmedia/sndoss.tex
deleted file mode 100644
index f086ca0bf1..0000000000
--- a/contrib/docs/latex/mmedia/sndoss.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndoss.h at 26/Feb/00 14:26:53
-%
-
-
-\section{\class{wxSoundStreamOSS}}\label{wxsoundstreamoss}
-
-
-OSS output class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStream}{wxsoundstream}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamOSS::wxSoundStreamOSS}\label{wxsoundstreamosswxsoundstreamoss}
-
-\func{}{wxSoundStreamOSS}{\param{const wxString\& }{dev\_name = \_T("/dev/dsp")}}
-
-
-\membersection{wxSoundStreamOSS::\destruct{wxSoundStreamOSS}}\label{wxsoundstreamossdtor}
-
-\func{}{\destruct{wxSoundStreamOSS}}{\void}
-
-
-\membersection{wxSoundStreamOSS::Read}\label{wxsoundstreamossread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamOSS::Write}\label{wxsoundstreamosswrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamOSS::GetBestSize}\label{wxsoundstreamossgetbestsize}
-
-\constfunc{wxUint32}{GetBestSize}{\void}
-
-
-\membersection{wxSoundStreamOSS::SetSoundFormat}\label{wxsoundstreamosssetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-
-\membersection{wxSoundStreamOSS::StartProduction}\label{wxsoundstreamossstartproduction}
-
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-
-\membersection{wxSoundStreamOSS::StopProduction}\label{wxsoundstreamossstopproduction}
-
-\func{bool}{StopProduction}{\void}
-
-
-\membersection{wxSoundStreamOSS::QueueFilled}\label{wxsoundstreamossqueuefilled}
-
-\constfunc{bool}{QueueFilled}{\void}
-
-
-\membersection{wxSoundStreamOSS::WakeUpEvt}\label{wxsoundstreamosswakeupevt}
-
-\func{void}{WakeUpEvt}{\param{int }{evt}}
-
-You should not call this.
-
diff --git a/contrib/docs/latex/mmedia/sndpcm.tex b/contrib/docs/latex/mmedia/sndpcm.tex
deleted file mode 100644
index 6e392208e6..0000000000
--- a/contrib/docs/latex/mmedia/sndpcm.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndcpcm.h at 26/Feb/00 14:26:35
-%
-
-
-\section{\class{wxSoundStreamPcm}}\label{wxsoundstreampcm}
-
-
-PCM converter class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStreamCodec}{wxsoundstreamcodec}
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef void (*ConverterType)(const char *buf\_in, char *buf\_out, wxUint32 len) ConverterType
-\end{verbatim}}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamPcm::wxSoundStreamPcm}\label{wxsoundstreampcmwxsoundstreampcm}
-
-\func{}{wxSoundStreamPcm}{\param{wxSoundStream\& }{sndio}}
-
-
-\membersection{wxSoundStreamPcm::\destruct{wxSoundStreamPcm}}\label{wxsoundstreampcmdtor}
-
-\func{}{\destruct{wxSoundStreamPcm}}{\void}
-
-
-\membersection{wxSoundStreamPcm::Read}\label{wxsoundstreampcmread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamPcm::Write}\label{wxsoundstreampcmwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamPcm::SetSoundFormat}\label{wxsoundstreampcmsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
diff --git a/contrib/docs/latex/mmedia/sndrter.tex b/contrib/docs/latex/mmedia/sndrter.tex
deleted file mode 100644
index 4f9dba3cb0..0000000000
--- a/contrib/docs/latex/mmedia/sndrter.tex
+++ /dev/null
@@ -1,37 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndfile.h at 26/Feb/00 14:26:42
-%
-
-
-\section{\class{wxSoundRouterStream}}\label{wxsoundrouterstream}
-
-This is the router "codec" class. It should do codec routing when the device
-driver does not deal with a format.
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStreamCodec}{wxsoundstreamcodec}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSoundRouterStream::wxSoundRouterStream}\label{wxsoundrouterstreamwxsoundrouterstream}
-\func{}{wxSoundRouterStream}{\param{wxSoundStream\& }{sndio}}
-
-\helpref{wxSoundCodec}{wxsoundcodec}
-
-
-\membersection{wxSoundRouterStream::\destruct{wxSoundRouterStream}}\label{wxsoundrouterstreamdtor}
-\func{}{\destruct{wxSoundRouterStream}}{\void}
-
-Destructor.
-
-\membersection{wxSoundRouterStream::SetSoundFormat}\label{wxsoundrouterstreamsetsoundformat}
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-SetSoundFormat will first try to setup the device driver with the specified
-format. If this fails, it will try to find a codec which will convert the
-input format to a valid format for the device driver. It uses an internal
-codec database.
diff --git a/contrib/docs/latex/mmedia/sndulaw.tex b/contrib/docs/latex/mmedia/sndulaw.tex
deleted file mode 100644
index d091d63f30..0000000000
--- a/contrib/docs/latex/mmedia/sndulaw.tex
+++ /dev/null
@@ -1,49 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndulaw.h at 26/Feb/00 14:52:25
-%
-
-
-\section{\class{wxSoundStreamUlaw}}\label{wxsoundstreamulaw}
-
-
-ULAW converter class
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStreamCodec}{wxsoundstreamcodec}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamUlaw::wxSoundStreamUlaw}\label{wxsoundstreamulawwxsoundstreamulaw}
-
-\func{}{wxSoundStreamUlaw}{\param{wxSoundStream\& }{sndio}}
-
-
-\membersection{wxSoundStreamUlaw::\destruct{wxSoundStreamUlaw}}\label{wxsoundstreamulawdtor}
-
-\func{}{\destruct{wxSoundStreamUlaw}}{\void}
-
-
-\membersection{wxSoundStreamUlaw::Read}\label{wxsoundstreamulawread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamUlaw::Write}\label{wxsoundstreamulawwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamUlaw::SetSoundFormat}\label{wxsoundstreamulawsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{const wxSoundFormatBase\& }{format}}
-
-
-\membersection{wxSoundStreamUlaw::GetBestSize}\label{wxsoundstreamulawgetbestsize}
-
-\constfunc{wxUint32}{GetBestSize}{\void}
-
diff --git a/contrib/docs/latex/mmedia/sndwave.tex b/contrib/docs/latex/mmedia/sndwave.tex
deleted file mode 100644
index f3c72f0b4e..0000000000
--- a/contrib/docs/latex/mmedia/sndwave.tex
+++ /dev/null
@@ -1,91 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndwav.h at 26/Feb/00 14:26:40
-%
-
-
-\section{\class{wxSoundWave}}\label{wxsoundwave}
-
-
-WAVE codec
-
-\wxheading{Derived from}
-
-\helpref{wxSoundFileStream}{wxsoundfilestream}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundWave::wxSoundWave}\label{wxsoundwavewxsoundwave}
-
-\func{}{wxSoundWave}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-\func{}{wxSoundWave}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
-
-
-\membersection{wxSoundWave::\destruct{wxSoundWave}}\label{wxsoundwavedtor}
-
-\func{}{\destruct{wxSoundWave}}{\void}
-
-
-\membersection{wxSoundWave::CanRead}\label{wxsoundwavecanread}
-
-\func{bool}{CanRead}{\void}
-
-
-\membersection{wxSoundWave::GetCodecName}\label{wxsoundwavegetcodecname}
-
-\constfunc{wxString}{GetCodecName}{\void}
-
-
-\membersection{wxSoundWave::PrepareToPlay}\label{wxsoundwavepreparetoplay}
-
-\func{bool}{PrepareToPlay}{\void}
-
-
-\membersection{wxSoundWave::PrepareToRecord}\label{wxsoundwavepreparetorecord}
-
-\func{bool}{PrepareToRecord}{\param{wxUint32 }{time}}
-
-
-\membersection{wxSoundWave::FinishRecording}\label{wxsoundwavefinishrecording}
-
-\func{bool}{FinishRecording}{\void}
-
-
-\membersection{wxSoundWave::RepositionStream}\label{wxsoundwaverepositionstream}
-
-\func{bool}{RepositionStream}{\param{wxUint32 }{position}}
-
-
-\membersection{wxSoundWave::GetData}\label{wxsoundwavegetdata}
-
-\func{wxUint32}{GetData}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundWave::PutData}\label{wxsoundwaveputdata}
-
-\func{wxUint32}{PutData}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundWave::HandleOutputPCM}\label{wxsoundwavehandleoutputpcm}
-
-\func{bool}{HandleOutputPCM}{\param{wxDataInputStream\& }{data}, \param{wxUint16 }{channels}, \param{wxUint32 }{sample\_fq}, \param{wxUint32 }{byte\_p\_sec}, \param{wxUint16 }{byte\_p\_spl}, \param{wxUint16 }{bits\_p\_spl}}
-
-
-\membersection{wxSoundWave::HandleOutputG721}\label{wxsoundwavehandleoutputg721}
-
-\func{bool}{HandleOutputG721}{\param{wxDataInputStream\& }{data}, \param{wxUint16 }{channels}, \param{wxUint32 }{sample\_fq}, \param{wxUint32 }{byte\_p\_sec}, \param{wxUint16 }{byte\_p\_spl}, \param{wxUint16 }{bits\_p\_spl}}
-
-
-\membersection{wxSoundWave::HandleInputPCM}\label{wxsoundwavehandleinputpcm}
-
-\func{wxSoundFormatBase*}{HandleInputPCM}{\param{wxDataOutputStream\& }{data}}
-
-
-\membersection{wxSoundWave::HandleInputG72X}\label{wxsoundwavehandleinputg72x}
-
-\func{wxSoundFormatBase*}{HandleInputG72X}{\param{wxDataOutputStream\& }{data}}
-
diff --git a/contrib/docs/latex/mmedia/sndwin.tex b/contrib/docs/latex/mmedia/sndwin.tex
deleted file mode 100644
index b0fafe8bef..0000000000
--- a/contrib/docs/latex/mmedia/sndwin.tex
+++ /dev/null
@@ -1,140 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/sndwin.h at 26/Feb/00 14:26:51
-%
-
-
-\section{\class{wxSoundStreamWin}}\label{wxsoundstreamwin}
-
-\wxheading{Derived from}
-
-\helpref{wxSoundStream}{wxsoundstream}
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef struct \_wxSoundInternal wxSoundInternal
-\end{verbatim}}
-
-{\small \begin{verbatim}
-typedef struct \_wxSoundInfoHeader wxSoundInfoHeader
-\end{verbatim}}
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxSoundStreamWin::wxSoundStreamWin}\label{wxsoundstreamwinwxsoundstreamwin}
-
-\func{}{wxSoundStreamWin}{\void}
-
-
-\membersection{wxSoundStreamWin::\destruct{wxSoundStreamWin}}\label{wxsoundstreamwindtor}
-
-\func{}{\destruct{wxSoundStreamWin}}{\void}
-
-
-\membersection{wxSoundStreamWin::Write}\label{wxsoundstreamwinwrite}
-
-\func{wxSoundStream\&}{Write}{\param{const void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamWin::Read}\label{wxsoundstreamwinread}
-
-\func{wxSoundStream\&}{Read}{\param{void* }{buffer}, \param{wxUint32 }{len}}
-
-
-\membersection{wxSoundStreamWin::SetSoundFormat}\label{wxsoundstreamwinsetsoundformat}
-
-\func{bool}{SetSoundFormat}{\param{wxSoundFormatBase\& }{base}}
-
-
-\membersection{wxSoundStreamWin::StartProduction}\label{wxsoundstreamwinstartproduction}
-
-\func{bool}{StartProduction}{\param{int }{evt}}
-
-
-\membersection{wxSoundStreamWin::StopProduction}\label{wxsoundstreamwinstopproduction}
-
-\func{bool}{StopProduction}{\void}
-
-
-\membersection{wxSoundStreamWin::QueueFilled}\label{wxsoundstreamwinqueuefilled}
-
-\constfunc{bool}{QueueFilled}{\void}
-
-
-\membersection{wxSoundStreamWin::NotifyDoneBuffer}\label{wxsoundstreamwinnotifydonebuffer}
-
-\func{void}{NotifyDoneBuffer}{\param{wxUint32 }{dev\_handle}, \param{int }{flag}}
-
-Internal but defined as public
-
-
-\membersection{wxSoundStreamWin::GetBestSize}\label{wxsoundstreamwingetbestsize}
-
-\constfunc{wxUint32}{GetBestSize}{\void}
-
-
-\membersection{wxSoundStreamWin::CreateSndWindow}\label{wxsoundstreamwincreatesndwindow}
-
-\func{void}{CreateSndWindow}{\void}
-
-
-\membersection{wxSoundStreamWin::DestroySndWindow}\label{wxsoundstreamwindestroysndwindow}
-
-\func{void}{DestroySndWindow}{\void}
-
-
-\membersection{wxSoundStreamWin::OpenDevice}\label{wxsoundstreamwinopendevice}
-
-\func{bool}{OpenDevice}{\param{int }{mode}}
-
-
-\membersection{wxSoundStreamWin::CloseDevice}\label{wxsoundstreamwinclosedevice}
-
-\func{void}{CloseDevice}{\void}
-
-
-\membersection{wxSoundStreamWin::AllocHeader}\label{wxsoundstreamwinallocheader}
-
-\func{wxSoundInfoHeader*}{AllocHeader}{\param{int }{mode}}
-
-
-\membersection{wxSoundStreamWin::FreeHeader}\label{wxsoundstreamwinfreeheader}
-
-\func{void}{FreeHeader}{\param{wxSoundInfoHeader* }{header}, \param{int }{mode}}
-
-
-\membersection{wxSoundStreamWin::AllocHeaders}\label{wxsoundstreamwinallocheaders}
-
-\func{bool}{AllocHeaders}{\param{int }{mode}}
-
-
-\membersection{wxSoundStreamWin::FreeHeaders}\label{wxsoundstreamwinfreeheaders}
-
-\func{void}{FreeHeaders}{\param{int }{mode}}
-
-
-\membersection{wxSoundStreamWin::WaitFor}\label{wxsoundstreamwinwaitfor}
-
-\func{void}{WaitFor}{\param{wxSoundInfoHeader* }{info}}
-
-
-\membersection{wxSoundStreamWin::AddToQueue}\label{wxsoundstreamwinaddtoqueue}
-
-\func{bool}{AddToQueue}{\param{wxSoundInfoHeader* }{info}}
-
-
-\membersection{wxSoundStreamWin::ClearHeader}\label{wxsoundstreamwinclearheader}
-
-\func{void}{ClearHeader}{\param{wxSoundInfoHeader* }{info}}
-
-
-\membersection{wxSoundStreamWin::NextFragmentOutput}\label{wxsoundstreamwinnextfragmentoutput}
-
-\func{wxSoundInfoHeader*}{NextFragmentOutput}{\void}
-
-
-\membersection{wxSoundStreamWin::NextFragmentInput}\label{wxsoundstreamwinnextfragmentinput}
-
-\func{wxSoundInfoHeader*}{NextFragmentInput}{\void}
-
diff --git a/contrib/docs/latex/mmedia/tex2rtf.ini b/contrib/docs/latex/mmedia/tex2rtf.ini
deleted file mode 100644
index 179e4ea68c..0000000000
--- a/contrib/docs/latex/mmedia/tex2rtf.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-contentsDepth = 2
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "MMedia Manual"
-truncateFilenames = no
-combineSubSections = yes
-; A new option to allow references to wxWindows classes to be displayed as if
-; without the \helpref command.
-ignoreBadRefs = yes
-; Finally, a way to specify face names
-htmlFaceName = "Arial, Lucida, Helvetica"
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-htmlWorkshopFiles = true
-htmlIndex = true
-
-\overview [2] {\helpref{#1}{#2}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-%\wxheading [1]{{\bf \fcol{blue}{#1}}}
-\wxheading [1]{{\bf #1}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-\bftt [1] {\bf{\tt{#1}}}
-\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-%\pythonnote [1] {}
-\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1}
-
diff --git a/contrib/docs/latex/mmedia/texhelp.sty b/contrib/docs/latex/mmedia/texhelp.sty
deleted file mode 100644
index af91bd531d..0000000000
--- a/contrib/docs/latex/mmedia/texhelp.sty
+++ /dev/null
@@ -1,298 +0,0 @@
-% LaTeX style file
-% Name:   texhelp.sty
-% Author: Julian Smart
-%
-% Purpose
-% -------
-% Style file to enable the simultaneous preparation of printed LaTeX and on-line
-% hypertext manuals.
-% Use in conjunction with Tex2RTF (see Tex2RTF documentation).
-%
-% Note that if a non-ASCII character starts a newline and there should be a space
-% between the last word on the previous line and the first word on this line,
-% you need to use \rtfsp to generate a space in Windows Help. \rtfsp is ignored
-% in all other formats.
-%
-% Julian Smart
-% Artificial Intelligence Applications Institute
-%
-%
-% ============== C++/CLIPS Documentation Facilities ==============
-%
-% Each class definition should be typeset with e.g.
-%
-% \section{\class{Name}: Parent}
-%
-% followed by a description of the class.
-% Each member should follow:
-%
-% \membersection{wxName::Member}
-%
-% with a description of what this member does.
-% Then, one (or more if overloaded) member (function) in detail:
-%
-% \func{return type}{name}{args}
-% or
-% \member{type}{name}
-%
-% where args is a list of \param{type}{name}, ...
-
-% Function, e.g.
-% e.g. to typeset
-%
-% void DoIt(char *string);
-%
-% write:
-%
-% \func{void}{DoIt}{\param{char *}{string}}
-%
-
-\newcommand{\func}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} {\bf #2}\index{#2}}(#3)}
-
-% For function/type definition where the name is a pointer,
-% e.g. to typeset
-%
-% typedef void (*wxFunction)(wxObject&)
-%
-% write:
-%
-% \pfunc{typedef void}{wxFunction}{param{wxObject&}}
-
-\newcommand{\pfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} ({\bf *#2})\index{#2}}(#3)}
-
-% Use an ordinary \section command for class name definitions.
-
-% This is used for a member, such as wxBitmap: GetDepth
-\newcommand{\membersection}[1]{\subsection*{#1}\index{#1}}
-
-% CLIPS function
-\newcommand{\clipsfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\bf #1} ({\bf #2}\index{#2}}#3)}
-
-\newcommand{\clipssection}[1]{\chapter{#1}}
-
-% This is used for a CLIPS function name
-\newcommand{\functionsection}[1]{\subsection*{#1}}
-
-% Member: a type and a name
-\newcommand{\member}[2]{{\bf #1 \it #2}}
-
-% C++ Parameter: a type and a name (no intervening space)
-\newcommand{\param}[2]{{\it #1}{\bf #2}}
-
-% CLIPS Parameter: a type and a name (one intervening space)
-\newcommand{\cparam}[2]{{\bf #1} {\it #2}}
-
-% Class: puts in index
-\newcommand{\class}[1]{#1\index{#1}}
-
-%\newcommand{\docparam}[2]{\parskip=0pt {\it #1}\par\parskip=10pt\begin{indented}{1cm}{#2}\end{indented}}
-
-% Void type
-\newcommand{\void}{{\it void}}
-
-% Typeset destructor
-\newcommand{\destruct}[1]{{$\sim$}#1}
-
-% Typeset insert/extract operators
-\newcommand{\cinsert}{$<<$}
-\newcommand{\cextract}{$>>$}
-
-
-% =================== Hypertext facilities ===================
-%
-% To insert hyperlinks (or references, in Latex), \label the sections
-% or membersections \label{ref-label} immediately after the section, on the same line,
-% and use \helpref{text-to-show}{ref-label} to make a reference.
-%
-
-% Type text with section reference
-\newcommand{\helpref}[2]{{\it #1} (p.\ \pageref{#2}) }
-
-% Type text with URL in verbatim mode
-\newcommand{\urlref}[2]{#1 (\verb$#2$)}
-
-% Don't typeset section number in LaTeX
-\newcommand{\helprefn}[2]{{\it #1}}
-
-% Like helpref, but popup text in WinHelp instead of hyperlinked
-\newcommand{\popref}[2]{{\it #1}}
-
-% Like footnote, but popup text.
-\newcommand{\footnotepopup}[2]{{\it #1}\footnote{#2}}
-
-% =================== On-line help specific macros ===================
-%
-
-% Global document font size/family, help only.
-\newcommand{\helpfontsize}[1]{}
-\newcommand{\helpfontfamily}[1]{}
-
-% Ignore in all on-line help
-\newcommand{\helpignore}[1]{#1}
-% Only print in all on-line help
-\newcommand{\helponly}[1]{}
-
-% Ignore in LaTeX
-\newcommand{\latexignore}[1]{}
-% Only print in LaTeX
-\newcommand{\latexonly}[1]{#1}
-
-% Ignore in linear RTF
-\newcommand{\rtfignore}[1]{#1}
-% Only print in linear RTF
-\newcommand{\rtfonly}[1]{}
-
-% Ignore in WinHelp RTF
-\newcommand{\winhelpignore}[1]{#1}
-% Only print in WinHelp RTF
-\newcommand{\winhelponly}[1]{}
-
-% Ignore in wxHelp
-\newcommand{\xlpignore}[1]{#1}
-% Only print in wxHelp
-\newcommand{\xlponly}[1]{}
-
-% Ignore in HTML
-\newcommand{\htmlignore}[1]{#1}
-% Only print in HTML
-\newcommand{\htmlonly}[1]{}
-
-% Input a file only for help system (binder thickness is not a limitation
-% in help systems!)
-\newcommand{\helpinput}[1]{}
-
-\newcommand{\rtfsp}{ } % Force a space in RTF, ignore in Latex
-
-% =================== Miscellaneous macros ===================
-%
-% Headings consistent with generated ones
-\newcommand{\myheading}[1]{\vspace*{25pt}
-\begin{flushleft}
-{\LARGE \bf #1}
-\end{flushleft}
-\vskip 20pt
-}
-
-% Heading with entry in contents page.
-\newcommand{\chapterheading}[1]{\myheading{#1}
-\addcontentsline{toc}{chapter}{#1}}
-
-\newcommand{\sectionheading}[1]{\myheading{#1}
-\addcontentsline{toc}{section}{#1}}
-
-% Glossary environment
-\newenvironment{helpglossary}{\newpage\chapterheading{Glossary}\begin{description}}{\end{description}}
-
-% Glossary entry
-\newcommand{\gloss}[1]{\item[#1]\index{#1}}
-
-% Image: EPS in Latex, BMP or MF (whatever's available) in RTF. Requires psbox.
-\newcommand{\image}[2]{\psboxto(#1){#2}}
-
-% Image, left aligned (HTML)
-\newcommand{\imager}[2]{\psboxto(#1){#2}}
-
-% Image, right aligned (HTML)
-\newcommand{\imagel}[2]{\psboxto(#1){#2}}
-
-% Imagemap: principally for HTML only. In Latex,
-% acts like \image.
-\newcommand{\imagemap}[3]{\psboxto(#1){#2}}
-
-% Headers and footers
-% \setheader{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setheader}[6]{
-\lhead[\fancyplain{}{#1}]{\fancyplain{}{#4}}
-\chead[\fancyplain{}{#2}]{\fancyplain{}{#5}}
-\rhead[\fancyplain{}{#3}]{\fancyplain{}{#6}}
-}
-
-% \setfooter{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setfooter}[6]{
-\lfoot[\fancyplain{#1}{#1}]{\fancyplain{#4}{#4}}
-\cfoot[\fancyplain{#2}{#2}]{\fancyplain{#5}{#5}}
-\rfoot[\fancyplain{#3}{#3}]{\fancyplain{#6}{#6}}
-}
-
-% Needed for telling RTF where margin paragraph should go
-% in mirrored margins mode.
-\newcommand{\marginpareven}[1]{\hspace*{0pt}\marginpar{#1}}
-\newcommand{\marginparodd}[1]{\hspace*{0pt}\marginpar{#1}}
-
-% Environment for two-column table popular in WinHelp and manuals.
-\newcommand{\twocolwidtha}[1]{\def\twocolwidthaval{#1}}
-\newcommand{\twocolwidthb}[1]{\def\twocolwidthbval{#1}}
-\newcommand{\twocolspacing}[1]{\def\twocolspacingval{#1}}
-
-\twocolwidtha{3cm}
-\twocolwidthb{8.5cm}
-\twocolspacing{2}
-
-\newcommand{\twocolitem}[2]{#1 & #2\\}
-\newcommand{\twocolitemruled}[2]{#1 & #2\\\hline}
-
-\newenvironment{twocollist}{\renewcommand{\arraystretch}{\twocolspacingval}\begin{tabular}{lp{\twocolwidthbval}}}%
-{\end{tabular}\renewcommand{\arraystretch}{1}}
-
-% Specifying table rows for RTF compatibility
-\newcommand{\row}[1]{#1\\}
-
-% Use for the last ruled row for correct RTF generation.
-\newcommand{\ruledrow}[1]{#1\\\hline}
-
-% Indentation environment. Arg1 is left margin size
-\newenvironment{indented}[1]{\begin{list}{}{\leftmargin=#1}\item[]}%
-{\end{list}}
-
-% Framed box of text, normal formatting.
-\newcommand{\normalbox}[1]{\fbox{\vbox{#1}}}
-% Double-framed box of text.
-\newcommand{\normalboxd}[1]{\fbox{\fbox{\vbox{#1}}}}
-
-% WITHDRAWN -- can't do in RTF, easily.
-% Framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredbox}[2]{\begin{center}\fbox{\parbox{#1}{\raggedright#2}}\end{center}}
-% Double-framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredboxd}[2]{\begin{center}\fbox{\fbox{\parbox{#1}{\raggedright#2}}}\end{center}}
-
-% toocomplex environment: simply prints the argument in LaTeX,
-% comes out verbatim in all generated formats.
-\newenvironment{toocomplex}{}{}
-
-% Colour: dummy commands since LaTeX doesn't support colour.
-% \definecolour{name}{red}{blue}{green}
-% \fcol{name}{text} ; Foreground
-% \bcol{name}{text} ; Background
-\newcommand{\definecolour}[4]{}
-\newcommand{\definecolor}[4]{}
-\newcommand{\fcol}[2]{#2}
-\newcommand{\bcol}[2]{#2}
-\newcommand{\sethotspotcolour}[1]{}
-\newcommand{\sethotspotunderline}[1]{}
-\newcommand{\settransparency}[1]{}
-\newcommand{\backslashraw}[0]{}
-\newcommand{\lbraceraw}[0]{}
-\newcommand{\rbraceraw}[0]{}
-\newcommand{\registered}[0]{(r)}
-\newcommand{\background}[1]{}
-\newcommand{\textcolour}[1]{}
-\newcommand{\overview}[2]{See \helpref{#1}{#2}.}
-\newcommand{\docparam}[2]{{\it #1}\begin{list}{}{\leftmargin=1cm}\item[]
-#2%
-\end{list}}
-\newcommand{\wxheading}[1]{{\bf #1}}
-\newcommand{\const}[0]{{\bf const}}
-\newcommand{\constfunc}[3]{{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\newcommand{\windowstyle}[1]{{\bf #1}\index{#1}}
-
-\addtolength{\textwidth}{1in}
-\addtolength{\oddsidemargin}{-0.5in}
-\addtolength{\topmargin}{-0.5in}
-\addtolength{\textheight}{1in}
-\sloppy
-
diff --git a/contrib/docs/latex/mmedia/topics.tex b/contrib/docs/latex/mmedia/topics.tex
deleted file mode 100644
index 02159265ed..0000000000
--- a/contrib/docs/latex/mmedia/topics.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\chapter{Topic overviews}\label{overviews}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-The following sections describe particular topics.
-
-\section{MMedia extension overview}\label{mmedoverview}
-
-To be written.
-
diff --git a/contrib/docs/latex/mmedia/up.gif b/contrib/docs/latex/mmedia/up.gif
deleted file mode 100644
index 316d0d2a14..0000000000
Binary files a/contrib/docs/latex/mmedia/up.gif and /dev/null differ
diff --git a/contrib/docs/latex/mmedia/vidbase.tex b/contrib/docs/latex/mmedia/vidbase.tex
deleted file mode 100644
index 38ece531c2..0000000000
--- a/contrib/docs/latex/mmedia/vidbase.tex
+++ /dev/null
@@ -1,173 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/vidbase.h at 26/Feb/00 14:51:56
-%
-
-\section{\class{wxVideoBaseDriver}}\label{wxvideobasedriver}
-
-Classes definition
-
-\wxheading{Derived from}
-
-wxObject
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef enum {
-  wxVIDEO\_MSAVI,
-  wxVIDEO\_MPEG,
-  wxVIDEO\_QT,
-  wxVIDEO\_GIF,
-  wxVIDEO\_JMOV,
-  wxVIDEO\_FLI,
-  wxVIDEO\_IFF,
-  wxVIDEO\_SGI,
-  wxVIDEO\_MPEG2
-} wxVideoType
-\end{verbatim}}
-
-wxMMedia2 (video) types
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxVideoBaseDriver::wxVideoBaseDriver}\label{wxvideobasedriverwxvideobasedriver}
-
-\func{}{wxVideoBaseDriver}{\void}
-
-Ctors
-
-
-\membersection{wxVideoBaseDriver::wxVideoBaseDriver}\label{wxvideobasedriverwxvideobasedriver}
-
-\func{}{wxVideoBaseDriver}{\param{wxInputStream\& }{str}}
-
-
-\membersection{wxVideoBaseDriver::wxVideoBaseDriver}\label{wxvideobasedriverwxvideobasedriver}
-
-\func{}{wxVideoBaseDriver}{\param{const wxString\& }{filename}}
-
-
-\membersection{wxVideoBaseDriver::\destruct{wxVideoBaseDriver}}\label{wxvideobasedriverdtor}
-
-\func{}{\destruct{wxVideoBaseDriver}}{\void}
-
-Dtor
-
-
-\membersection{wxVideoBaseDriver::Play}\label{wxvideobasedriverplay}
-
-\func{bool}{Play}{\void}
-
-Usual functions ... They all return FALSE in case of errors.
-
-
-\membersection{wxVideoBaseDriver::Stop}\label{wxvideobasedriverstop}
-
-\func{bool}{Stop}{\void}
-
-
-\membersection{wxVideoBaseDriver::Pause}\label{wxvideobasedriverpause}
-
-\func{bool}{Pause}{\void}
-
-
-\membersection{wxVideoBaseDriver::Resume}\label{wxvideobasedriverresume}
-
-\func{bool}{Resume}{\void}
-
-
-\membersection{wxVideoBaseDriver::SetSize}\label{wxvideobasedriversetsize}
-
-\func{bool}{SetSize}{\param{wxSize }{size}}
-
-Size management
-
-
-\membersection{wxVideoBaseDriver::GetSize}\label{wxvideobasedrivergetsize}
-
-\constfunc{bool}{GetSize}{\param{wxSize\& }{size}}
-
-
-\membersection{wxVideoBaseDriver::IsCapable}\label{wxvideobasedriveriscapable}
-
-\constfunc{bool}{IsCapable}{\param{wxVideoType }{WXUNUSED(v\_type)}}
-
-Test the capability of the driver to handle the specified type
-
-
-\membersection{wxVideoBaseDriver::GetMovieCodec}\label{wxvideobasedrivergetmoviecodec}
-
-\constfunc{wxString}{GetMovieCodec}{\void}
-
-Return the video codec name
-
-
-\membersection{wxVideoBaseDriver::GetAudioCodec}\label{wxvideobasedrivergetaudiocodec}
-
-\constfunc{wxString}{GetAudioCodec}{\void}
-
-Return the audio codec name
-
-
-\membersection{wxVideoBaseDriver::GetSampleRate}\label{wxvideobasedrivergetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-Return misc info about audio
-
-
-\membersection{wxVideoBaseDriver::GetChannels}\label{wxvideobasedrivergetchannels}
-
-\constfunc{wxUint8}{GetChannels}{\void}
-
-
-\membersection{wxVideoBaseDriver::GetBPS}\label{wxvideobasedrivergetbps}
-
-\constfunc{wxUint8}{GetBPS}{\void}
-
-
-\membersection{wxVideoBaseDriver::GetFrameRate}\label{wxvideobasedrivergetframerate}
-
-\constfunc{double}{GetFrameRate}{\void}
-
-Return frame rate
-
-
-\membersection{wxVideoBaseDriver::GetNbFrames}\label{wxvideobasedrivergetnbframes}
-
-\constfunc{wxUint32}{GetNbFrames}{\void}
-
-Return number of frames
-
-
-\membersection{wxVideoBaseDriver::OnFinished}\label{wxvideobasedriveronfinished}
-
-\func{void}{OnFinished}{\void}
-
-Called when the movie finished
-
-
-\membersection{wxVideoBaseDriver::AttachOutput}\label{wxvideobasedriverattachoutput}
-
-\func{bool}{AttachOutput}{\param{wxWindow\& }{output}}
-
-Attaches the video output to a window. The video will be shown in that window.
-
-
-\membersection{wxVideoBaseDriver::DetachOutput}\label{wxvideobasedriverdetachoutput}
-
-\func{void}{DetachOutput}{\void}
-
-
-\membersection{wxVideoBaseDriver::IsPaused}\label{wxvideobasedriverispaused}
-
-\constfunc{bool}{IsPaused}{\void}
-
-They return the state of the movie.
-
-
-\membersection{wxVideoBaseDriver::IsStopped}\label{wxvideobasedriverisstopped}
-
-\constfunc{bool}{IsStopped}{\void}
-
diff --git a/contrib/docs/latex/mmedia/vidwin.tex b/contrib/docs/latex/mmedia/vidwin.tex
deleted file mode 100644
index 9aad585f28..0000000000
--- a/contrib/docs/latex/mmedia/vidwin.tex
+++ /dev/null
@@ -1,148 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/vidwin.h at 26/Feb/00 14:52:03
-%
-
-
-\section{\class{wxVideoWindows}}\label{wxvideowindows}
-
-
-
-Class definition
-
-\wxheading{Derived from}
-
-\helpref{wxVideoBaseDriver}{wxvideobasedriver}
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef struct VIDW\_Internal {
-    MCIDEVICEID m\_dev\_id
-};
-\end{verbatim}}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxVideoWindows::OpenFile}\label{wxvideowindowsopenfile}
-
-\func{void}{OpenFile}{\void}
-
-
-\membersection{wxVideoWindows::wxVideoWindows}\label{wxvideowindowswxvideowindows}
-
-\func{}{wxVideoWindows}{\void}
-
-
-\membersection{wxVideoWindows::wxVideoWindows}\label{wxvideowindowswxvideowindows}
-
-\func{}{wxVideoWindows}{\param{wxInputStream\& }{str}}
-
-
-\membersection{wxVideoWindows::wxVideoWindows}\label{wxvideowindowswxvideowindows}
-
-\func{}{wxVideoWindows}{\param{const wxString\& }{fname}}
-
-
-\membersection{wxVideoWindows::\destruct{wxVideoWindows}}\label{wxvideowindowsdtor}
-
-\func{}{\destruct{wxVideoWindows}}{\void}
-
-
-\membersection{wxVideoWindows::Play}\label{wxvideowindowsplay}
-
-\func{bool}{Play}{\void}
-
-
-\membersection{wxVideoWindows::Stop}\label{wxvideowindowsstop}
-
-\func{bool}{Stop}{\void}
-
-
-\membersection{wxVideoWindows::Pause}\label{wxvideowindowspause}
-
-\func{bool}{Pause}{\void}
-
-
-\membersection{wxVideoWindows::Resume}\label{wxvideowindowsresume}
-
-\func{bool}{Resume}{\void}
-
-
-\membersection{wxVideoWindows::GetSize}\label{wxvideowindowsgetsize}
-
-\constfunc{bool}{GetSize}{\param{wxSize\& }{size}}
-
-
-\membersection{wxVideoWindows::SetSize}\label{wxvideowindowssetsize}
-
-\func{bool}{SetSize}{\param{wxSize }{size}}
-
-
-\membersection{wxVideoWindows::GetMovieCodec}\label{wxvideowindowsgetmoviecodec}
-
-\constfunc{wxString}{GetMovieCodec}{\void}
-
-Return codec name for each stream.
-
-
-\membersection{wxVideoWindows::GetAudioCodec}\label{wxvideowindowsgetaudiocodec}
-
-\constfunc{wxString}{GetAudioCodec}{\void}
-
-
-\membersection{wxVideoWindows::GetSampleRate}\label{wxvideowindowsgetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-Return misc. info about audio
-
-
-\membersection{wxVideoWindows::GetChannels}\label{wxvideowindowsgetchannels}
-
-\constfunc{wxUint8}{GetChannels}{\void}
-
-
-\membersection{wxVideoWindows::GetBPS}\label{wxvideowindowsgetbps}
-
-\constfunc{wxUint8}{GetBPS}{\void}
-
-
-\membersection{wxVideoWindows::GetFrameRate}\label{wxvideowindowsgetframerate}
-
-\constfunc{double}{GetFrameRate}{\void}
-
-Return the frame rate of the video (in frames/second)
-
-
-\membersection{wxVideoWindows::GetNbFrames}\label{wxvideowindowsgetnbframes}
-
-\constfunc{wxUint32}{GetNbFrames}{\void}
-
-Return the total number of frames in the movie
-
-
-\membersection{wxVideoWindows::IsCapable}\label{wxvideowindowsiscapable}
-
-\func{bool}{IsCapable}{\param{wxVideoType }{v\_type}}
-
-
-\membersection{wxVideoWindows::AttachOutput}\label{wxvideowindowsattachoutput}
-
-\func{bool}{AttachOutput}{\param{wxWindow\& }{output}}
-
-
-\membersection{wxVideoWindows::DetachOutput}\label{wxvideowindowsdetachoutput}
-
-\func{void}{DetachOutput}{\void}
-
-
-\membersection{wxVideoWindows::IsPaused}\label{wxvideowindowsispaused}
-
-\constfunc{bool}{IsPaused}{\void}
-
-
-\membersection{wxVideoWindows::IsStopped}\label{wxvideowindowsisstopped}
-
-\constfunc{bool}{IsStopped}{\void}
-
diff --git a/contrib/docs/latex/mmedia/vidxanm.tex b/contrib/docs/latex/mmedia/vidxanm.tex
deleted file mode 100644
index bc8f280f6e..0000000000
--- a/contrib/docs/latex/mmedia/vidxanm.tex
+++ /dev/null
@@ -1,170 +0,0 @@
-%
-% automatically generated by HelpGen from
-% /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/vidxanm.h at 26/Feb/00 14:52:06
-%
-
-
-\section{\class{wxVideoXANIM}}\label{wxvideoxanim}
-
-
-
-Class definition
-
-\wxheading{Derived from}
-
-\helpref{wxVideoBaseDriver}{wxvideobasedriver}
-
-\wxheading{Data structures}
-
-{\small \begin{verbatim}
-typedef struct wxXANIMinternal {
-    Display *xanim\_dpy
-\end{verbatim}}
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxVideoXANIM::wxVideoXANIM}\label{wxvideoxanimwxvideoxanim}
-
-\func{}{wxVideoXANIM}{\void}
-
-
-\membersection{wxVideoXANIM::wxVideoXANIM}\label{wxvideoxanimwxvideoxanim}
-
-\func{}{wxVideoXANIM}{\param{wxInputStream\& }{str}}
-
-
-\membersection{wxVideoXANIM::wxVideoXANIM}\label{wxvideoxanimwxvideoxanim}
-
-\func{}{wxVideoXANIM}{\param{const wxString\& }{filename}}
-
-
-\membersection{wxVideoXANIM::\destruct{wxVideoXANIM}}\label{wxvideoxanimdtor}
-
-\func{}{\destruct{wxVideoXANIM}}{\void}
-
-
-\membersection{wxVideoXANIM::Play}\label{wxvideoxanimplay}
-
-\func{bool}{Play}{\void}
-
-
-\membersection{wxVideoXANIM::Pause}\label{wxvideoxanimpause}
-
-\func{bool}{Pause}{\void}
-
-
-\membersection{wxVideoXANIM::Resume}\label{wxvideoxanimresume}
-
-\func{bool}{Resume}{\void}
-
-
-\membersection{wxVideoXANIM::Stop}\label{wxvideoxanimstop}
-
-\func{bool}{Stop}{\void}
-
-
-\membersection{wxVideoXANIM::SetVolume}\label{wxvideoxanimsetvolume}
-
-\func{bool}{SetVolume}{\param{wxUint8 }{vol}}
-
-
-\membersection{wxVideoXANIM::SetSize}\label{wxvideoxanimsetsize}
-
-\func{bool}{SetSize}{\param{wxSize }{size}}
-
-
-\membersection{wxVideoXANIM::GetSize}\label{wxvideoxanimgetsize}
-
-\constfunc{bool}{GetSize}{\param{wxSize\& }{size}}
-
-
-\membersection{wxVideoXANIM::GetMovieCodec}\label{wxvideoxanimgetmoviecodec}
-
-\constfunc{wxString}{GetMovieCodec}{\void}
-
-Return the video codec name
-
-
-\membersection{wxVideoXANIM::GetAudioCodec}\label{wxvideoxanimgetaudiocodec}
-
-\constfunc{wxString}{GetAudioCodec}{\void}
-
-Return the audio codec name
-
-
-\membersection{wxVideoXANIM::GetSampleRate}\label{wxvideoxanimgetsamplerate}
-
-\constfunc{wxUint32}{GetSampleRate}{\void}
-
-Return misc info about audio
-
-
-\membersection{wxVideoXANIM::GetChannels}\label{wxvideoxanimgetchannels}
-
-\constfunc{wxUint8}{GetChannels}{\void}
-
-
-\membersection{wxVideoXANIM::GetBPS}\label{wxvideoxanimgetbps}
-
-\constfunc{wxUint8}{GetBPS}{\void}
-
-
-\membersection{wxVideoXANIM::GetFrameRate}\label{wxvideoxanimgetframerate}
-
-\constfunc{double}{GetFrameRate}{\void}
-
-Return frame rate
-
-
-\membersection{wxVideoXANIM::GetNbFrames}\label{wxvideoxanimgetnbframes}
-
-\constfunc{wxUint32}{GetNbFrames}{\void}
-
-Return number of frames in the movie
-
-
-\membersection{wxVideoXANIM::IsCapable}\label{wxvideoxanimiscapable}
-
-\constfunc{bool}{IsCapable}{\param{wxVideoType }{v\_type}}
-
-
-\membersection{wxVideoXANIM::AttachOutput}\label{wxvideoxanimattachoutput}
-
-\func{bool}{AttachOutput}{\param{wxWindow\& }{output}}
-
-
-\membersection{wxVideoXANIM::DetachOutput}\label{wxvideoxanimdetachoutput}
-
-\func{void}{DetachOutput}{\void}
-
-
-\membersection{wxVideoXANIM::IsPaused}\label{wxvideoxanimispaused}
-
-\constfunc{bool}{IsPaused}{\void}
-
-
-\membersection{wxVideoXANIM::IsStopped}\label{wxvideoxanimisstopped}
-
-\constfunc{bool}{IsStopped}{\void}
-
-
-\membersection{wxVideoXANIM::RestartXANIM}\label{wxvideoxanimrestartxanim}
-
-\func{bool}{RestartXANIM}{\void}
-
-Start the subprocess with the right parameters
-
-
-\membersection{wxVideoXANIM::SendCommand}\label{wxvideoxanimsendcommand}
-
-\func{bool}{SendCommand}{\param{const char* }{command}, \param{char** }{ret = NULL}, \param{wxUint32* }{size = NULL}}
-
-Send a command to the subprocess
-
-
-\membersection{wxVideoXANIM::CollectInfo}\label{wxvideoxanimcollectinfo}
-
-\func{bool}{CollectInfo}{\void}
-
-Collect informations from XAnim
-
diff --git a/contrib/docs/latex/ogl/back.gif b/contrib/docs/latex/ogl/back.gif
deleted file mode 100644
index 88a3740f91..0000000000
Binary files a/contrib/docs/latex/ogl/back.gif and /dev/null differ
diff --git a/contrib/docs/latex/ogl/bugs.tex b/contrib/docs/latex/ogl/bugs.tex
deleted file mode 100644
index d66f64e613..0000000000
--- a/contrib/docs/latex/ogl/bugs.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\chapter{Bugs}\label{bugs}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-These are the known bugs.
-
-\begin{itemize}\itemsep=0pt
-\item In the OGLEdit sample, .dia files are output double-spaced
-due to an unidentified bug in the way a stream is converted to a file.
-\end{itemize}
-
diff --git a/contrib/docs/latex/ogl/bullet.bmp b/contrib/docs/latex/ogl/bullet.bmp
deleted file mode 100644
index aad8fc793e..0000000000
Binary files a/contrib/docs/latex/ogl/bullet.bmp and /dev/null differ
diff --git a/contrib/docs/latex/ogl/changes.tex b/contrib/docs/latex/ogl/changes.tex
deleted file mode 100644
index 5590ce3fd9..0000000000
--- a/contrib/docs/latex/ogl/changes.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\chapter{Change log}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-Version 3.0, September 8th 1998
-
-\begin{itemize}\itemsep=0pt
-\item Version for wxWindows 2.0.
-\item Various enhancements especially to wxDrawnShape
-(multiple metafiles, for different orientations).
-\item More ability to override functions e.g. OnSizeDragLeft, so events can be
-intercepted for Do/Undo.
-\end{itemize}
-
-Version 2.0, June 1st 1996
-
-\begin{itemize}\itemsep=0pt
-\item First publicly released version.
-\end{itemize}
diff --git a/contrib/docs/latex/ogl/classes.tex b/contrib/docs/latex/ogl/classes.tex
deleted file mode 100644
index a72adb3887..0000000000
--- a/contrib/docs/latex/ogl/classes.tex
+++ /dev/null
@@ -1,2861 +0,0 @@
-\chapter{Class reference}\label{classref}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-These are the main \ogl\ classes.
-
-\section{\class{wxOGLConstraint}}\label{wxoglconstraint}
-
-\overview{wxCompositeShape overview}{compositeshapeoverview}
-
-An wxOGLConstraint object helps specify how child shapes are laid out with respect
-to siblings and parents.
-
-\wxheading{Derived from}
-
-wxObject
-
-\wxheading{See also}
-
-\helpref{wxCompositeShape}{wxcompositeshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxOGLConstraint::wxOGLConstraint}\label{wxoglconstraintconstr}
-
-\func{}{wxOGLConstraint}{\void}
-
-Default constructor.
-
-\func{}{wxOGLConstraint}{\param{int}{ type}, \param{wxShape *}{constraining}, \param{wxList\& }{constrained}}
-
-Constructor.
-
-\wxheading{Parameters}
-
-\docparam{constraining}{The shape which is used as the reference for positioning the {\it constrained} objects.}
-
-\docparam{constrained}{Contains a list of wxShapes which are to be constrained (with respect
-to {\it constraining}) using {\it type}.}
-
-\docparam{type}{Can be one of:
-
-\begin{itemize}\itemsep=0pt
-\item {\bf gyCONSTRAINT\_CENTRED\_VERTICALLY}: the Y co-ordinates of the centres of the
-bounding boxes of the constrained objects and the constraining object
-will be the same
-\item {\bf gyCONSTRAINT\_CENTRED\_HORIZONTALLY}: the X co-ordinates of the centres of the
-bounding boxes of the constrained objects and the constraining object
-will be the same
-\item {\bf gyCONSTRAINT\_CENTRED\_BOTH}: the co-ordinates of the centres of the bounding boxes
-of the constrained objects and the constraining object will be the same
-\item {\bf gyCONSTRAINT\_LEFT\_OF}: the X co-ordinates of the right hand vertical edges
-of the bounding boxes of the constrained objects will be less than
-the X co-ordinate of the left hand vertical edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_RIGHT\_OF}: the X co-ordinates of the left hand vertical edges
-of the bounding boxes of the constrained objects will be greater than
-the X co-ordinate of the right hand vertical edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_ABOVE}: the Y co-ordinates of the bottom horizontal edges of the
-bounding boxes of the constrained objects will be less than the
-Y co-ordinate of the top horizontal edge of the bounding box of the
-constraining object
-\item {\bf gyCONSTRAINT\_BELOW}: the Y co-ordinates of the top horizontal edges of the
-bounding boxes of the constrained objects will be greater than
-the X co-ordinate of the bottom horizontal edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_ALIGNED\_TOP}: the Y co-ordinates of the top horizontal edges of the
-bounding boxes of the constrained objects will be the same as the
-Y co-ordinate of the top horizontal edge of the bounding box of the
-constraining object
-\item {\bf gyCONSTRAINT\_ALIGNED\_BOTTOM}: the Y co-ordinates of the bottom horizontal edges
-of the bounding boxes of the constrained objects will be the same as
-the Y co-ordinate of the bottom horizontal edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_ALIGNED\_LEFT}: the X co-ordinates of the left hand vertical edges
-of the bounding boxes of the constrained objects will be the same as
-the X co-ordinate of the left hand vertical edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_ALIGNED\_RIGHT}: the X co-ordinates of the right hand vertical edges
-of the bounding boxes of the constrained objects will be the same as
-the X co-ordinate of the right hand vertical edge of the bounding box
-of the constraining object
-\item {\bf gyCONSTRAINT\_MIDALIGNED\_TOP}: the Y co-ordinates of the centres of
-the bounding boxes of the constrained objects will be the same
-as the Y co-ordinate of the top horizontal edge of
-the bounding box of the constraining object
-\item {\bf gyCONSTRAINT\_MIDALIGNED\_BOTTOM}: the Y co-ordinates of the centres of
-the bounding boxes of the constrained objects will be the same
-as the Y co-ordinate of the bottom horizontal edge of
-the bounding box of the constraining object
-\item {\bf gyCONSTRAINT\_MIDALIGNED\_LEFT}: the X co-ordinates of the centres of
-the bounding boxes of the constrained objects will be the same
-as the X co-ordinate of the left hand vertical edge of
-the bounding box of the constraining object
-\item {\bf gyCONSTRAINT\_MIDALIGNED\_RIGHT}: the X co-ordinates of the centres of
-the bounding boxes of the constrained objects will be the same as
-the X co-ordinate of the right hand vertical edge of
-the bounding box of the constraining object
-\end{itemize}
-}
-
-\membersection{wxOGLConstraint::\destruct{wxOGLConstraint}}
-
-\func{}{\destruct{wxOGLConstraint}}{\void}
-
-Destructor.
-
-\membersection{wxOGLConstraint::Equals}
-
-\func{bool}{Equals}{\param{double}{ x}, \param{double}{ y}}
-
-Returns TRUE if {\it x} and {\it y} are approximately equal (for the purposes
-of evaluating the constraint).
-
-\membersection{wxOGLConstraint::Evaluate}
-
-\func{bool}{Evaluate}{\void}
-
-Evaluates this constraint, returning TRUE if anything changed.
-
-\membersection{wxOGLConstraint::SetSpacing}\label{wxoglconstraintsetspacing}
-
-\func{void}{SetSpacing}{\param{double}{ x}, \param{double}{ y}}
-
-Sets the horizontal and vertical spacing for the constraint.
-
-\section{\class{wxBitmapShape}}\label{wxbitmapshape}
-
-Draws a bitmap (non-resizable).
-
-\wxheading{Derived from}
-
-\helpref{wxRectangleShape}{wxrectangleshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxBitmapShape::wxBitmapShape}
-
-\func{}{wxBitmapShape}{\void}
-
-Constructor.
-
-\membersection{wxBitmapShape::\destruct{wxBitmapShape}}
-
-\func{}{\destruct{wxBitmapShape}}{\void}
-
-Destructor.
-
-\membersection{wxBitmapShape::GetBitmap}
-
-\constfunc{wxBitmap\&}{GetBitmap}{\void}
-
-Returns a reference to the bitmap associated with this shape.
-
-\membersection{wxBitmapShape::GetFilename}
-
-\constfunc{wxString}{GetFilename}{\void}
-
-Returns the bitmap filename.
-
-\membersection{wxBitmapShape::SetBitmap}
-
-\func{void}{SetBitmap}{\param{const wxBitmap\&}{ bitmap}}
-
-Sets the bitmap associated with this shape. You can delete the bitmap
-from the calling application, since reference counting will take care of
-holding on to the internal bitmap data.
-
-\membersection{wxBitmapShape::SetFilename}
-
-\func{void}{SetFilename}{\param{const wxString\& }{filename}}
-
-Sets the bitmap filename.
-
-\section{\class{wxDiagram}}\label{wxdiagram}
-
-Encapsulates an entire diagram, with methods for reading/writing and drawing.
-A diagram has an associated wxShapeCanvas.
-
-\wxheading{Derived from}
-
-wxObject
-
-\wxheading{See also}
-
-\helpref{wxShapeCanvas}{wxshapecanvas}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDiagram::wxDiagram}
-
-\func{}{wxDiagram}{\void}
-
-Constructor.
-
-\membersection{wxDiagram::\destruct{wxDiagram}}
-
-\func{}{\destruct{wxDiagram}}{\void}
-
-Destructor.
-
-\membersection{wxDiagram::AddShape}
-
-\func{void}{AddShape}{\param{wxShape*}{shape}, \param{wxShape *}{addAfter = NULL}}
-
-Adds a shape to the diagram. If {\it addAfter} is non-NULL, the shape will be added after this
-one.
-
-\membersection{wxDiagram::Clear}
-
-\func{void}{Clear}{\param{wxDC\&}{ dc}}
-
-Clears the specified device context.
-
-\membersection{wxDiagram::DeleteAllShapes}
-
-\func{void}{DeletesAllShapes}{\void}
-
-Removes and deletes all shapes in the diagram.
-
-\membersection{wxDiagram::DrawOutline}
-
-\func{void}{DrawOutline}{\param{wxDC\&}{ dc}, \param{double}{ x1}, \param{double}{ y1}, \param{double}{ x2}, \param{double}{ y2}}
-
-Draws an outline rectangle on the current device context.
-
-\membersection{wxDiagram::FindShape}\label{wxdiagramfindshape}
-
-\constfunc{wxShape*}{FindShape}{\param{long}{ id}}
-
-Returns the shape for the given identifier.
-
-\membersection{wxDiagram::GetCanvas}
-
-\constfunc{wxShapeCanvas*}{GetCanvas}{\void}
-
-Returns the shape canvas associated with this diagram.
-
-\membersection{wxDiagram::GetCount}\label{wxdiagramgetcount}
-
-\constfunc{int}{GetCount}{\void}
-
-Returns the number of shapes in the diagram.
-
-\membersection{wxDiagram::GetGridSpacing}
-
-\constfunc{double}{GetGridSpacing}{\void}
-
-Returns the grid spacing.
-
-\membersection{wxDiagram::GetMouseTolerance}
-
-\func{int}{GetMouseTolerance}{\void}
-
-Returns the tolerance within which a mouse move is ignored.
-
-\membersection{wxDiagram::GetShapeList}
-
-\constfunc{wxList*}{GetShapeList}{\void}
-
-Returns a pointer to the internal shape list.
-
-\membersection{wxDiagram::GetQuickEditMode}
-
-\constfunc{bool}{GetQuickEditMode}{\void}
-
-Returns quick edit mode.
-
-\membersection{wxDiagram::GetSnapToGrid}
-
-\constfunc{bool}{GetSnapToGrid}{\void}
-
-Returns snap-to-grid mode.
-
-\membersection{wxDiagram::InsertShape}
-
-\func{void}{InsertShape}{\param{wxShape *}{shape}}
-
-Inserts a shape at the front of the shape list.
-
-\membersection{wxDiagram::LoadFile}
-
-\func{bool}{LoadFile}{\param{const wxString\& }{filename}}
-
-Loads the diagram from a file.
-
-\membersection{wxDiagram::OnDatabaseLoad}
-
-\func{void}{OnDatabaseLoad}{\param{wxExprDatabase\&}{ database}}
-
-Called just after the nodes and lines have been read from the wxExprDatabase. You may override this;
-the default member does nothing.
-
-\membersection{wxDiagram::OnDatabaseSave}
-
-\func{void}{OnDatabaseSave}{\param{wxExprDatabase\&}{ database}}
-
-Called just after the nodes and lines have been written to the wxExprDatabase. You may override this;
-the default member does nothing.
-
-\membersection{wxDiagram::OnHeaderLoad}
-
-\func{bool}{OnHeaderLoad}{\param{wxExprDatabase\&}{ database}, \param{wxExpr\&}{ expr}}
-
-Called to allow the `diagram' header object to be read. The default member reads no further information.
-You may wish to override this to read version information, author name, etc.
-
-\membersection{wxDiagram::OnHeaderSave}
-
-\func{bool}{OnHeaderSave}{\param{wxExprDatabase\&}{ database}, \param{wxExpr\&}{ expr}}
-
-Called to allow instantiation of the `diagram' header object. The default member writes no further information.
-You may wish to override this to include version information, author name, etc.
-
-\membersection{wxDiagram::OnShapeLoad}
-
-\func{bool}{OnShapeLoad}{\param{wxExprDatabase\&}{ database}, \param{wxShape\&}{ shape}, \param{wxExpr\&}{ expr}}
-
-Called to read the shape from the {\it expr}. You may override this, but call this function first.
-The default member calls ReadAttributes for the shape.
-
-\membersection{wxDiagram::OnShapeSave}
-
-\func{bool}{OnShapeSave}{\param{wxExprDatabase\&}{ database}, \param{wxShape\&}{ shape}, \param{wxExpr\&}{ expr}}
-
-Called to save the shape to the {\it expr} and {\it database}. You may override this, but call this function first.
-The default member calls WriteAttributes for the shape, appends the shape to the database, and of the shape
-is a composite, recursively calls OnShapeSave for its children.
-
-\membersection{wxDiagram::ReadContainerGeometry}
-
-\func{void}{ReadContainerGeometry}{\param{wxExprDatabase\&}{ database}}
-
-Reads container geometry from a wxExprDatabase, linking up nodes which
-are part of a composite. You probably won't need to redefine this.
-
-\membersection{wxDiagram::ReadLines}
-
-\func{void}{ReadLines}{\param{wxExprDatabase\&}{ database}}
-
-Reads lines from a wxExprDatabase. You probably won't need to redefine this.
-
-\membersection{wxDiagram::ReadNodes}
-
-\func{void}{ReadNodes}{\param{wxExprDatabase\&}{ database}}
-
-Reads nodes from a wxExprDatabase. You probably won't need to redefine this.
-
-\membersection{wxDiagram::RecentreAll}
-
-\func{void}{RecentreAll}{\param{wxDC\&}{ dc}}
-
-Make sure all text that should be centred, is centred.
-
-\membersection{wxDiagram::Redraw}
-
-\func{void}{Redraw}{\param{wxDC\&}{ dc}}
-
-Draws the shapes in the diagram on the specified device context.
-
-\membersection{wxDiagram::RemoveAllShapes}
-
-\func{void}{RemoveAllShapes}{\void}
-
-Removes all shapes from the diagram but does not delete the shapes.
-
-\membersection{wxDiagram::RemoveShape}
-
-\func{void}{RemoveShape}{\param{wxShape*}{ shape}}
-
-Removes the shape from the diagram (non-recursively) but does not delete it.
-
-\membersection{wxDiagram::SaveFile}
-
-\func{bool}{SaveFile}{\param{const wxString\& }{filename}}
-
-Saves the diagram in a file.
-
-\membersection{wxDiagram::SetCanvas}\label{wxdiagramsetcanvas}
-
-\func{void}{SetCanvas}{\param{wxShapeCanvas*}{ canvas}}
-
-Sets the canvas associated with this diagram.
-
-\membersection{wxDiagram::SetGridSpacing}
-
-\func{void}{SetGridSpacing}{\param{double}{ spacing}}
-
-Sets the grid spacing. The default is 5.
-
-\membersection{wxDiagram::SetMouseTolerance}
-
-\func{void}{SetMouseTolerance}{\param{int}{ tolerance}}
-
-Sets the tolerance within which a mouse move is ignored. The default is 3 pixels.
-
-\membersection{wxDiagram::SetQuickEditMode}
-
-\func{void}{SetQuickEditMode}{\param{bool}{ mode}}
-
-Sets quick-edit-mode on or off. In this mode, refreshes are minimized, but the
-diagram may need manual refreshing occasionally.
-
-\membersection{wxDiagram::SetSnapToGrid}
-
-\func{void}{SetSnapToGrid}{\param{bool}{ snap}}
-
-Sets snap-to-grid mode on or off. The default is on.
-
-\membersection{wxDiagram::ShowAll}
-
-\func{void}{ShowAll}{\param{bool}{ show}}
-
-Calls Show for each shape in the diagram.
-
-\membersection{wxDiagram::Snap}
-
-\func{void}{Snap}{\param{double *}{x}, \param{double *}{y}}
-
-`Snaps' the coordinate to the nearest grid position, if snap-to-grid is on.
-
-\section{\class{wxDrawnShape}}\label{wxdrawnshape}
-
-Draws a pseduo-metafile shape, which can be loaded from a simple Windows metafile.
-
-wxDrawnShape allows you to specify a different shape for each of four orientations (North, West,
-South and East). It also provides a set of drawing functions for programmatic drawing of a shape,
-so that during construction of the shape you can draw into it as if it were a device context.
-
-\wxheading{Derived from}
-
-\helpref{wxRectangleShape}{wxrectangleshape}
-
-See also \helpref{wxRectangleShape}{wxrectangleshape}.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDrawnShape::wxDrawnShape}
-
-\func{}{wxDrawnShape}{\void}
-
-Constructor.
-
-\membersection{wxDrawnShape::\destruct{wxDrawnShape}}
-
-\func{}{\destruct{wxDrawnShape}}{\void}
-
-Destructor.
-
-\membersection{wxDrawnShape::CalculateSize}
-
-\func{void}{CalculateSize}{\void}
-
-Calculates the wxDrawnShape size from the current metafile. Call this after you have drawn
-into the shape.
-
-\membersection{wxDrawnShape::DestroyClippingRect}\label{wxdrawnshapedestroyclippingrect}
-
-\func{void}{DestroyClippingRect}{\void}
-
-Destroys the clipping rectangle. See also \helpref{wxDrawnShape::SetClippingRect}{wxdrawnshapesetclippingrect}.
-
-\membersection{wxDrawnShape::DrawArc}\label{wxdrawnshapedrawarc}
-
-\func{void}{DrawArc}{\param{const wxPoint\&}{ centrePoint}, \param{const wxPoint\&}{ startPoint},
- \param{const wxPoint\&}{ endPoint}}
-
-Draws an arc (see wxWindows documentation for details).
-
-\membersection{wxDrawnShape::DrawAtAngle}\label{wxdrawnshapedrawatangle}
-
-\func{void}{DrawAtAngle}{\param{int}{ angle}}
-
-Sets the metafile for the given orientation, which can be one of:
-
-\begin{itemize}\itemsep=0pt
-\item oglDRAWN\_ANGLE\_0
-\item oglDRAWN\_ANGLE\_90
-\item oglDRAWN\_ANGLE\_180
-\item oglDRAWN\_ANGLE\_270
-\end{itemize}
-
-See also \helpref{wxDrawnShape::GetAngle}{wxdrawnshapegetangle}.
-
-\membersection{wxDrawnShape::DrawEllipticArc}\label{wxdrawnshapedrawellipticarc}
-
-\func{void}{DrawEllipticArc}{\param{const wxRect\&}{ rect}, \param{double}{ startAngle}, \param{double}{ endAngle}}
-
-Draws an elliptic arc (see wxWindows documentation for details).
-
-\membersection{wxDrawnShape::DrawLine}\label{wxdrawnshapedrawline}
-
-\func{void}{DrawLine}{\param{const wxPoint\&}{ point1}, \param{const wxPoint\&}{ point2}}
-
-Draws a line from {\it point1} to {\it point2}.
-
-\membersection{wxDrawnShape::DrawLines}\label{wxdrawnshapedrawlines}
-
-\func{void}{DrawLines}{\param{int}{ n}, \param{wxPoint\&}{ points[]}}
-
-Draws {\it n} lines.
-
-\membersection{wxDrawnShape::DrawPoint}\label{wxdrawnshapedrawpoint}
-
-\func{void}{DrawPoint}{\param{const wxPoint\&}{ point}}
-
-Draws a point.
-
-\membersection{wxDrawnShape::DrawPolygon}\label{wxdrawnshapedrawpolygon}
-
-\func{void}{DrawPolygon}{\param{int}{ n}, \param{wxPoint\&}{ points[]}, \param{int}{ flags = 0}}
-
-Draws a polygon. {\it flags} can be one or more of {\bf oglMETAFLAGS\_OUTLINE} (use this polygon for the drag outline)
-and {\bf oglMETAFLAGS\_ATTACHMENTS} (use the vertices of this polygon for attachments).
-
-\membersection{wxDrawnShape::DrawRectangle}\label{wxdrawnshapedrawrectangle}
-
-\func{void}{DrawRectangle}{\param{const wxRect\&}{ rect}}
-
-Draws a rectangle.
-
-\membersection{wxDrawnShape::DrawRoundedRectangle}\label{wxdrawnshapedrawroundedrectangle}
-
-\func{void}{DrawRoundedRectangle}{\param{const wxRect\&}{ rect}, \param{double}{ radius}}
-
-Draws a rounded rectangle. {\it radius} is the corner radius. If {\it radius} is negative,
-it expresses the radius as a proportion of the smallest dimension of the rectangle.
-
-\membersection{wxDrawnShape::DrawSpline}\label{wxdrawnshapedrawspline}
-
-\func{void}{DrawSpline}{\param{int}{ n}, \param{wxPoint\&}{ points[]}}
-
-Draws a spline curve.
-
-\membersection{wxDrawnShape::DrawText}\label{wxdrawnshapedrawtext}
-
-\func{void}{DrawText}{\param{const wxString\&}{ text}, \param{const wxPoint\&}{ point}}
-
-Draws text at the given point.
-
-\membersection{wxDrawnShape::GetAngle}\label{wxdrawnshapegetangle}
-
-\constfunc{int}{GetAngle}{\void}
-
-Returns the current orientation, which can be one of:
-
-\begin{itemize}\itemsep=0pt
-\item oglDRAWN\_ANGLE\_0
-\item oglDRAWN\_ANGLE\_90
-\item oglDRAWN\_ANGLE\_180
-\item oglDRAWN\_ANGLE\_270
-\end{itemize}
-
-See also \helpref{wxDrawnShape::DrawAtAngle}{wxdrawnshapedrawatangle}.
-
-\membersection{wxDrawnShape::GetMetaFile}
-
-\constfunc{wxPseudoMetaFile\& }{GetMetaFile}{\void}
-
-Returns a reference to the internal `pseudo-metafile'.
-
-\membersection{wxDrawnShape::GetRotation}\label{wxdrawnshapegetrotation}
-
-\constfunc{double}{GetRotation}{\void}
-
-Returns the current rotation of the shape in radians.
-
-\membersection{wxDrawnShape::LoadFromMetaFile}
-
-\func{bool}{LoadFromMetaFile}{\param{const wxString\& }{filename}}
-
-Loads a (very simple) Windows metafile, created for example by Top Draw, the Windows shareware graphics package.
-
-\membersection{wxDrawnShape::Rotate}
-
-\func{void}{Rotate}{\param{double }{x}, \param{double }{y}, \param{double }{theta}}
-
-Rotate about the given axis by the given amount in radians.
-
-\membersection{wxDrawnShape::SetClippingRect}\label{wxdrawnshapesetclippingrect}
-
-\func{void}{SetClippingRect}{\param{const wxRect\&}{ rect}}
-
-Sets the clipping rectangle. See also \helpref{wxDrawnShape::DestroyClippingRect}{wxdrawnshapedestroyclippingrect}.
-
-\membersection{wxDrawnShape::SetDrawnBackgroundColour}\label{wxdrawnshapesetdrawnbackgroundcolour}
-
-\func{void}{SetDrawnBackgroundColour}{\param{const wxColour\&}{ colour}}
-
-Sets the current background colour for the current metafile.
-
-\membersection{wxDrawnShape::SetDrawnBackgroundMode}\label{wxdrawnshapesetdrawnbackgroundmode}
-
-\func{void}{SetDrawnBackgroundMode}{\param{int}{ mode}}
-
-Sets the current background mode for the current metafile.
-
-\membersection{wxDrawnShape::SetDrawnBrush}\label{wxdrawnshapesetdrawnbrush}
-
-\func{void}{SetDrawnBrush}{\param{wxPen*}{ pen}, \param{bool}{ isOutline = FALSE}}
-
-Sets the pen for this metafile. If {\it isOutline} is TRUE, this pen is taken to indicate the outline
-(and if the outline pen is changed for the whole shape, the pen will be replaced with the outline pen).
-
-\membersection{wxDrawnShape::SetDrawnFont}\label{wxdrawnshapesetdrawnfont}
-
-\func{void}{SetDrawnFont}{\param{wxFont*}{ font}}
-
-Sets the current font for the current metafile.
-
-\membersection{wxDrawnShape::SetDrawnPen}\label{wxdrawnshapesetdrawnpen}
-
-\func{void}{SetDrawnPen}{\param{wxPen*}{ pen}, \param{bool}{ isOutline = FALSE}}
-
-Sets the pen for this metafile. If {\it isOutline} is TRUE, this pen is taken to indicate the outline
-(and if the outline pen is changed for the whole shape, the pen will be replaced with the outline pen).
-
-\membersection{wxDrawnShape::SetDrawnTextColour}\label{wxdrawnshapesetdrawntextcolour}
-
-\func{void}{SetDrawnTextColour}{\param{const wxColour\&}{ colour}}
-
-Sets the current text colour for the current metafile.
-
-\membersection{wxDrawnShape::Scale}
-
-\func{void}{Scale}{\param{double }{sx}, \param{double }{sy}}
-
-Scales the shape by the given amount.
-
-\membersection{wxDrawnShape::SetSaveToFile}
-
-\func{void}{SetSaveToFile}{\param{bool }{save}}
-
-If {\it save} is TRUE, the image will be saved along with the shape's other attributes. The reason
-why this might not be desirable is that if there are many shapes with the same image, it would be
-more efficient for the application to save one copy, and not duplicate the information for every
-shape. The default is TRUE.
-
-\membersection{wxDrawnShape::Translate}
-
-\func{void}{Translate}{\param{double }{x}, \param{double }{y}}
-
-Translates the shape by the given amount.
-
-\section{\class{wxCircleShape}}\label{wxcircleshape}
-
-An wxEllipseShape whose width and height are the same.
-
-\wxheading{Derived from}
-
-\helpref{wxEllipseShape}{wxellipseshape}.
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxCircleShape::wxCircleShape}
-
-\func{}{wxCircleShape}{\param{double}{ width = 0.0}}
-
-Constructor.
-
-\membersection{wxCircleShape::\destruct{wxCircleShape}}
-
-\func{}{\destruct{wxCircleShape}}{\void}
-
-Destructor.
-
-\section{\class{wxCompositeShape}}\label{wxcompositeshape}
-
-This is an object with a list of child objects, and a list of size
-and positioning constraints between the children.
-
-\wxheading{Derived from}
-
-\helpref{wxRectangleShape}{wxrectangleshape}
-
-\wxheading{See also}
-
-\helpref{wxCompositeShape overview}{compositeshapeoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxCompositeShape::wxCompositeShape}
-
-\func{}{wxCompositeShape}{\void}
-
-Constructor.
-
-\membersection{wxCompositeShape::\destruct{wxCompositeShape}}
-
-\func{}{\destruct{wxCompositeShape}}{\void}
-
-Destructor.
-
-\membersection{wxCompositeShape::AddChild}\label{wxcompositeshapeaddchild}
-
-\func{void}{AddChild}{\param{wxShape *}{child}, \param{wxShape *}{addAfter = NULL}}
-
-Adds a child shape to the composite. If {\it addAfter} is non-NULL, the shape will be added
-after this shape.
-
-\membersection{wxCompositeShape::AddConstraint}\label{wxcompositeshapeaddconstraint}
-
-\func{wxOGLConstraint *}{AddConstraint}{\param{wxOGLConstraint *}{constraint}}
-
-\func{wxOGLConstraint *}{AddConstraint}{\param{int}{ type}, \param{wxShape *}{constraining}, \param{wxList\&}{constrained}}
-
-\func{wxOGLConstraint *}{AddConstraint}{\param{int}{ type}, \param{wxShape *}{constraining}, \param{wxShape *}{constrained}}
-
-Adds a constraint to the composite.
-
-\membersection{wxCompositeShape::CalculateSize}
-
-\func{void}{CalculateSize}{\void}
-
-Calculates the size and position of the composite based on child sizes and positions.
-
-\membersection{wxCompositeShape::ContainsDivision}
-
-\func{bool}{FindContainerImage}{\param{wxDivisionShape *}{division}}
-
-Returns TRUE if {\it division} is a descendant of this container.
-
-\membersection{wxCompositeShape::DeleteConstraint}
-
-\func{void}{DeleteConstraint}{\param{wxOGLConstraint *}{constraint}}
-
-Deletes constraint from composite.
-
-\membersection{wxCompositeShape::DeleteConstraintsInvolvingChild}
-
-\func{void}{DeleteConstraintsInvolvingChild}{\param{wxShape *}{child}}
-
-This function deletes constraints which mention the given child. Used when
-deleting a child from the composite.
-
-\membersection{wxCompositeShape::FindConstraint}
-
-\func{wxOGLConstraint *}{FindConstraint}{\param{long}{ id}, \param{wxCompositeShape **}{actualComposite}}
-
-Finds the constraint with the given id, also returning the actual composite the constraint was in,
-in case that composite was a descendant of this composite.
-
-\membersection{wxCompositeShape::FindContainerImage}
-
-\func{wxShape *}{FindContainerImage}{\void}
-
-Finds the image used to visualize a container. This is any child
-of the composite that is not in the divisions list.
-
-\membersection{wxCompositeShape::GetConstraints}
-
-\constfunc{wxList\&}{GetConstraints}{\void}
-
-Returns a reference to the list of constraints.
-
-\membersection{wxCompositeShape::GetDivisions}
-
-\constfunc{wxList\&}{GetDivisions}{\void}
-
-Returns a reference to the list of divisions.
-
-\membersection{wxCompositeShape::MakeContainer}\label{wxcompositeshapemakecontainer}
-
-\func{void}{MakeContainer}{\void}
-
-Makes this composite into a container by creating one child wxDivisionShape.
-
-\membersection{wxCompositeShape::OnCreateDivision}
-
-\func{wxDivisionShape *}{OnCreateDivision}{\void}
-
-Called when a new division shape is required. Can be overriden to allow an application
-to use a different class of division.
-
-\membersection{wxCompositeShape::Recompute}\label{wxcompositeshaperecompute}
-
-\func{bool}{Recompute}{\void} 
-
-Recomputes any constraints associated with the object. If FALSE is returned,
-the constraints could not be satisfied (there was an inconsistency).
-
-\membersection{wxCompositeShape::RemoveChild}
-
-\func{void}{RemoveChild}{\param{wxShape *}{child}}
-
-Removes the child from the composite and any constraint relationships, but does not
-delete the child.
-
-\section{\class{wxDividedShape}}\label{wxdividedshape}
-
-A wxDividedShape is a rectangle with a number of vertical divisions. Each
-division may have its text formatted with independent characteristics, and
-the size of each division relative to the whole image may be specified.
-
-\wxheading{Derived from}
-
-\helpref{wxRectangleShape}{wxrectangleshape}
-
-\wxheading{See also}
-
-\helpref{wxDividedShape overview}{dividedshapeoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDividedShape::wxDividedShape}
-
-\func{}{wxDividedShape}{\param{double}{ width = 0.0}, \param{double}{ height = 0.0}}
-
-Constructor.
-
-\membersection{wxDividedShape::\destruct{wxDividedShape}}
-
-\func{}{\destruct{wxDividedShape}}{\void}
-
-Destructor.
-
-\membersection{wxDividedShape::EditRegions}
-
-\func{void}{EditRegions}{\void}
-
-Edit the region colours and styles.
-
-\membersection{wxDividedShape::SetRegionSizes}
-
-\func{void}{SetRegionSizes}{\void}
-
-Set all region sizes according to proportions and
-this object total size.
-
-\section{\class{wxDivisionShape}}\label{wxdivisionshape}
-
-A division shape is like a composite in that it can contain further objects, but is used exclusively to
-divide another shape into regions, or divisions. A wxDivisionShape is never free-standing.
-
-\wxheading{Derived from}
-
-\helpref{wxCompositeShape}{wxcompositeshape}
-
-\wxheading{See also}
-
-\helpref{wxCompositeShape overview}{compositeshapeoverview}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDivisionShape::wxDivisionShape}
-
-\func{}{wxDivisionShape}{\void}
-
-Constructor.
-
-\membersection{wxDivisionShape::\destruct{wxDivisionShape}}
-
-\func{}{\destruct{wxDivisionShape}}{\void}
-
-Destructor.
-
-\membersection{wxDivisionShape::AdjustBottom}
-
-\func{void}{AdjustBottom}{\param{double}{ bottom}, \param{bool}{ test}}
-
-Adjust a side, returning FALSE if it's not physically possible to adjust it to this point.
-
-\membersection{wxDivisionShape::AdjustLeft}
-
-\func{void}{AdjustLeft}{\param{double}{ left}, \param{bool}{ test}}
-
-Adjust a side, returning FALSE if it's not physically possible to adjust it to this point.
-
-\membersection{wxDivisionShape::AdjustRight}
-
-\func{void}{AdjustRight}{\param{double}{ right}, \param{bool}{ test}}
-
-Adjust a side, returning FALSE if it's not physically possible to adjust it to this point.
-
-\membersection{wxDivisionShape::AdjustTop}
-
-\func{void}{AdjustTop}{\param{double}{ top}, \param{bool}{ test}}
-
-Adjust a side, returning FALSE if it's not physically possible to adjust it to this point.
-
-\membersection{wxDivisionShape::Divide}\label{wxdivisionshapedivide}
-
-\func{void}{Divide}{\param{int}{ direction}}
-
-Divide this division into two further divisions, horizontally ({\it direction} is wxHORIZONTAL) or
-vertically ({\it direction} is wxVERTICAL).
-
-\membersection{wxDivisionShape::EditEdge}
-
-\func{void}{EditEdge}{\param{int}{ side}}
-
-Interactively edit style of left or top side.
-
-\membersection{wxDivisionShape::GetBottomSide}
-
-\func{wxDivisionShape *}{GetBottomSide}{\void}
-
-Returns a pointer to the division on the bottom side of this division.
-
-\membersection{wxDivisionShape::GetHandleSide}
-
-\func{int}{GetHandleSide}{\void}
-
-Returns the side which the handle appears on (DIVISION\_SIDE\_LEFT or DIVISION\_SIDE\_TOP).
-
-\membersection{wxDivisionShape::GetLeftSide}
-
-\func{wxDivisionShape *}{GetLeftSide}{\void}
-
-Returns a pointer to the division on the left side of this division.
-
-\membersection{wxDivisionShape::GetLeftSideColour}
-
-\func{wxString}{GetLeftSideColour}{\void}
-
-Returns a pointer to the colour used for drawing the left side of the division.
-
-\membersection{wxDivisionShape::GetLeftSidePen}
-
-\func{wxPen *}{GetLeftSidePen}{\void}
-
-Returns a pointer to the pen used for drawing the left side of the division.
-
-\membersection{wxDivisionShape::GetRightSide}
-
-\func{wxDivisionShape *}{GetRightSide}{\void}
-
-Returns a pointer to the division on the right side of this division.
-
-\membersection{wxDivisionShape::GetTopSide}
-
-\func{wxDivisionShape *}{GetTopSide}{\void}
-
-Returns a pointer to the division on the top side of this division.
-
-\membersection{wxDivisionShape::GetTopSideColour}
-
-\func{wxString}{GetTopSideColour}{\void}
-
-Returns a pointer to the colour used for drawing the top side of the division.
-
-\membersection{wxDivisionShape::GetTopSidePen}
-
-\func{wxPen *}{GetTopSidePen}{\void}
-
-Returns a pointer to the pen used for drawing the left side of the division.
-
-\membersection{wxDivisionShape::ResizeAdjoining}
-
-\func{void}{ResizeAdjoining}{\param{int}{ side}, \param{double}{ newPos}, \param{bool}{ test}}
-
-Resize adjoining divisions at the given side. If {\it test} is TRUE,
-just see whether it's possible for each adjoining region,
-returning FALSE if it's not.
-
-{\it side} can be one of:
-
-\begin{itemize}\itemsep=0pt
-\item DIVISION\_SIDE\_NONE
-\item DIVISION\_SIDE\_LEFT
-\item DIVISION\_SIDE\_TOP
-\item DIVISION\_SIDE\_RIGHT
-\item DIVISION\_SIDE\_BOTTOM
-\end{itemize}
-
-\membersection{wxDivisionShape::PopupMenu}
-
-\func{void}{PopupMenu}{\param{double}{ x}, \param{double}{ y}}
-
-Popup the division menu.
-
-\membersection{wxDivisionShape::SetBottomSide}
-
-\func{void}{SetBottomSide}{\param{wxDivisionShape *}{shape}}
-
-Set the pointer to the division on the bottom side of this division.
-
-\membersection{wxDivisionShape::SetHandleSide}
-
-\func{int}{SetHandleSide}{\void}
-
-Sets the side which the handle appears on (DIVISION\_SIDE\_LEFT or DIVISION\_SIDE\_TOP).
-
-\membersection{wxDivisionShape::SetLeftSide}
-
-\func{void}{SetLeftSide}{\param{wxDivisionShape *}{shape}}
-
-Set the pointer to the division on the left side of this division.
-
-\membersection{wxDivisionShape::SetLeftSideColour}
-
-\func{void}{SetLeftSideColour}{\param{const wxString\& }{colour}}
-
-Sets the colour for drawing the left side of the division.
-
-\membersection{wxDivisionShape::SetLeftSidePen}
-
-\func{void}{SetLeftSidePen}{\param{wxPen *}{pen}}
-
-Sets the pen for drawing the left side of the division.
-
-\membersection{wxDivisionShape::SetRightSide}
-
-\func{void}{SetRightSide}{\param{wxDivisionShape *}{shape}}
-
-Set the pointer to the division on the right side of this division.
-
-\membersection{wxDivisionShape::SetTopSide}
-
-\func{void}{SetTopSide}{\param{wxDivisionShape *}{shape}}
-
-Set the pointer to the division on the top side of this division.
-
-\membersection{wxDivisionShape::SetTopSideColour}
-
-\func{void}{SetTopSideColour}{\param{const wxString\& }{colour}}
-
-Sets the colour for drawing the top side of the division.
-
-\membersection{wxDivisionShape::SetTopSidePen}
-
-\func{void}{SetTopSidePen}{\param{wxPen *}{pen}}
-
-Sets the pen for drawing the top side of the division.
-
-\section{\class{wxEllipseShape}}\label{wxellipseshape}
-
-The wxEllipseShape behaves similarly to the wxRectangleShape but is
-elliptical.
-
-\wxheading{Derived from}
-
-\helpref{wxShape}{wxshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxEllipseShape::wxEllipseShape}
-
-\func{}{wxEllipseShape}{\param{double}{ width = 0.0}, \param{double}{ height = 0.0}}
-
-Constructor.
-
-\membersection{wxEllipseShape::\destruct{wxEllipseShape}}
-
-\func{}{\destruct{wxEllipseShape}}{\void}
-
-Destructor.
-
-\section{\class{wxLineShape}}\label{wxlineshape}
-
-A wxLineShape may be attached to two nodes; it may be segmented, in which
-case a control point is drawn for each joint.
-
-A wxLineShape may have arrows at the beginning, end and centre.
-
-\wxheading{Derived from}
-
-\helpref{wxShape}{wxshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxLineShape::wxLineShape}
-
-\func{}{wxLineShape}{\void}
-
-Constructor.
-
-Usually you will call \helpref{wxLineShape::MakeLineControlPoints}{wxlineshapemakelinecontrolpoints} to
-specify the number of segments in the line.
-
-\membersection{wxLineShape::\destruct{wxLineShape}}
-
-\func{}{\destruct{wxLineShape}}{\void}
-
-Destructor.
-
-\membersection{wxLineShape::AddArrow}\label{wxlineshapeaddarrow}
-
-\func{void}{AddArrow}{\param{WXTYPE}{ type}, \param{bool}{ end = ARROW\_POSITION\_END}, \param{double}{ arrowSize = 10.0},
- \param{double}{ xOffset = 0.0}, \param{const wxString\& }{name = ""}, \param{wxPseudoMetaFile *}{mf = NULL}, \param{long}{ arrowId = -1}}
-
-Adds an arrow (or annotation) to the line.
-
-{\it type} may currently be one of:
-
-\begin{description}\itemsep=0pt
-\item[ARROW\_HOLLOW\_CIRCLE] Hollow circle.
-\item[ARROW\_FILLED\_CIRCLE] Filled circle.
-\item[ARROW\_ARROW] Conventional arrowhead.
-\item[ARROW\_SINGLE\_OBLIQUE] Single oblique stroke.
-\item[ARROW\_DOUBLE\_OBLIQUE] Double oblique stroke.
-\item[ARROW\_DOUBLE\_METAFILE] Custom arrowhead.
-\end{description}
-
-{\it end} may currently be one of:
-
-\begin{description}\itemsep=0pt
-\item[ARROW\_POSITION\_END] Arrow appears at the end.
-\item[ARROW\_POSITION\_START] Arrow appears at the start.
-\end{description}
-
-{\it arrowSize} specifies the length of the arrow.
-
-{\it xOffset} specifies the offset from the end of the line.
-
-{\it name} specifies a name for the arrow.
-
-{\it mf} can be a wxPseduoMetaFile, perhaps loaded from a simple Windows metafile.
-
-{\it arrowId} is the id for the arrow.
-
-\membersection{wxLineShape::AddArrowOrdered}
-
-\func{void}{AddArrowOrdered}{\param{wxArrowHead *}{arrow}, \param{wxList\&}{ referenceList}, \param{int}{ end}}
-
-Add an arrowhead in the position indicated by the reference
-list of arrowheads, which contains all legal arrowheads for this
-line, in the correct order.
-E.g.
-
-\begin{verbatim}
-  Reference list:      a b c d e
-  Current line list:   a d
-\end{verbatim}
-
-Add c, then line list is: a c d.
-
-If no legal arrowhead position, return FALSE.  Assume reference list is
-for one end only, since it potentially defines the ordering for any one
-of the 3 positions. So we don't check the reference list for arrowhead
-position.
-
-\membersection{wxLineShape::ClearArrow}
-
-\func{bool}{ClearArrow}{\param{const wxString\& }{name}}
-
-Delete the arrow with the given name.
-
-\membersection{wxLineShape::ClearArrowsAtPosition}
-
-\func{void}{ClearArrowsAtPosition}{\param{int}{ position = -1}}
-
-Delete the arrows at the specified position, or at any position if {\it position} is -1.
-
-\membersection{wxLineShape::DrawArrow}
-
-\func{void}{DrawArrow}{\param{ArrowHead *}{arrow}, \param{double}{ xOffset}, \param{bool}{ proportionalOffset}}
-
-Draws the given arrowhead (or annotation).
-
-\membersection{wxLineShape::DeleteArrowHead}
-
-\func{bool}{DeleteArrowHead}{\param{long}{ arrowId}}
-
-\func{bool}{DeleteArrowHead}{\param{int}{ position}, \param{const wxString\& }{name}}
-
-Delete arrowhead by id or position and name.
-
-\membersection{wxLineShape::DeleteLineControlPoint}
-
-\func{bool}{DeleteLineControlPoint}{\void}
-
-Deletes an arbitary point on the line.
-
-\membersection{wxLineShape::DrawArrows}
-
-\func{void}{DrawArrows}{\param{wxDC\&}{ dc}}
-
-Draws all arrows.
-
-\membersection{wxLineShape::DrawRegion}
-
-\func{void}{DrawRegion}{\param{wxDC\&}{ dc}, \param{wxShapeRegion *}{region}, \param{double}{ x}, \param{double}{ y}}
-
-Format one region at this position.
-
-\membersection{wxLineShape::EraseRegion}
-
-\func{void}{EraseRegion}{\param{wxDC\&}{ dc}, \param{wxShapeRegion *}{region}, \param{double}{ x}, \param{double}{ y}}
-
-Format one region at this position.
-
-\membersection{wxLineShape::FindArrowHead}
-
-\func{wxArrowHead *}{FindArrowHead}{\param{long}{ arrowId}}
-
-\func{wxArrowHead *}{FindArrowHead}{\param{int}{ position}, \param{const wxString\& }{name}}
-
-Find arrowhead by id or position and name.
-
-\membersection{wxLineShape::FindLineEndPoints}
-
-\func{void}{FindLineEndPoints}{\param{double *}{fromX}, \param{double *}{fromY}, \param{double *}{toX}, \param{double *}{toY}}
-
-Finds the x, y points at the two ends of the line. This function can be
-used by e.g. line-routing routines to get the actual points on the two
-node images where the lines will be drawn to/from.
-
-\membersection{wxLineShape::FindLinePosition}
-
-\func{int}{FindLinePosition}{\param{double }{x}, \param{double }{y}}
-
-Find which position we're talking about at this x, y.
-Returns ARROW\_POSITION\_START, ARROW\_POSITION\_MIDDLE, ARROW\_POSITION\_END.
-
-\membersection{wxLineShape::FindMinimumWidth}
-
-\func{double}{FindMinimumWidth}{\void}
-
-Finds the horizontal width for drawing a line with arrows in minimum
-space. Assume arrows at end only.
-
-\membersection{wxLineShape::FindNth}
-
-\func{void}{FindNth}{\param{wxShape *}{image}, \param{int *}{nth}, \param{int *}{noArcs}, \param{bool}{ incoming}}
-
-Finds the position of the line on the given object. Specify whether incoming or outgoing lines are
-being considered with {\it incoming}.
-
-\membersection{wxLineShape::GetAttachmentFrom}
-
-\constfunc{int}{GetAttachmentFrom}{\void}
-
-Returns the attachment point on the `from' node.
-
-\membersection{wxLineShape::GetAttachmentTo}
-
-\constfunc{int}{GetAttachmentTo}{\void}
-
-Returns the attachment point on the `to' node.
-
-\membersection{wxLineShape::GetEnds}
-
-\func{void}{GetEnds}{\param{double *}{x1}, \param{double *}{y1}, \param{double *}{x2}, \param{double *}{y2}}
-
-Gets the visible endpoints of the lines for drawing between two objects.
-
-\membersection{wxLineShape::GetFrom}
-
-\constfunc{wxShape *}{GetFrom}{\void}
-
-Gets the `from' object.
-
-\membersection{wxLineShape::GetLabelPosition}
-
-\func{void}{GetLabelPosition}{\param{int}{ position}, \param{double *}{x}, \param{double *}{y}}
-
-Get the reference point for a label. Region x and y are offsets from this.
-position is 0 (middle), 1 (start), 2 (end).
-
-\membersection{wxLineShape::GetNextControlPoint}
-
-\func{wxPoint *}{GetNextControlPoint}{\param{wxShape *}{shape}}
-
-Find the next control point in the line after the start/end point,
-depending on whether the shape is at the start or end.
-
-\membersection{wxLineShape::GetTo}
-
-\func{wxShape *}{GetTo}{\void}
-
-Gets the `to' object.
-
-\membersection{wxLineShape::Initialise}
-
-\func{void}{Initialise}{\void}
-
-Initialises the line object.
-
-\membersection{wxLineShape::InsertLineControlPoint}
-
-\func{void}{InsertLineControlPoint}{\void}
-
-Inserts a control point at an arbitrary position.
-
-\membersection{wxLineShape::IsEnd}
-
-\func{bool}{IsEnd}{\param{wxShape *}{shape}}
-
-Returns TRUE if {\it shape} is at the end of the line.
-
-\membersection{wxLineShape::IsSpline}
-
-\func{bool}{IsSpline}{\void}
-
-Returns TRUE if a spline is drawn through the control points, and FALSE otherwise.
-
-\membersection{wxLineShape::MakeLineControlPoints}\label{wxlineshapemakelinecontrolpoints}
-
-\func{void}{MakeLineControlPoints}{\param{int}{ n}}
-
-Make a given number of control points (minimum of two).
-
-\membersection{wxLineShape::OnMoveLink}
-
-\func{void}{OnMoveLink}{\param{wxDC\&}{ dc}, \param{bool}{ moveControlPoints = TRUE}}
-
-Called when a connected object has moved, to move the link to
-correct position.
-
-\membersection{wxLineShape::SetAttachmentFrom}
-
-\func{void}{SetAttachmentTo}{\param{int}{ fromAttach}}
-
-Sets the `from' shape attachment.
-
-\membersection{wxLineShape::SetAttachments}
-
-\func{void}{SetAttachments}{\param{int}{ fromAttach}, \param{int}{ toAttach}}
-
-Specifies which object attachment points should be used at each end of the line.
-
-\membersection{wxLineShape::SetAttachmentTo}
-
-\func{void}{SetAttachmentTo}{\param{int}{ toAttach}}
-
-Sets the `to' shape attachment.
-
-\membersection{wxLineShape::SetEnds}
-
-\func{void}{SetEnds}{\param{double}{ x1}, \param{double}{ y1}, \param{double}{ x2}, \param{double}{ y2}}
-
-Sets the end positions of the line.
-
-\membersection{wxLineShape::SetFrom}
-
-\func{void}{SetFrom}{\param{wxShape *}{object}}
-
-Sets the `from' object for the line.
-
-\membersection{wxLineShape::SetIgnoreOffsets}
-
-\func{void}{SetIgnoreOffsets}{\param{bool}{ ignore}}
-
-Tells the shape whether to ignore offsets from the end of the line when drawing.
-
-\membersection{wxLineShape::SetSpline}
-
-\func{void}{SetSpline}{\param{bool}{ spline}}
-
-Specifies whether a spline is to be drawn through the control points (TRUE), or a line (FALSE).
-
-\membersection{wxLineShape::SetTo}
-
-\func{void}{SetTo}{\param{wxShape *}{object}}
-
-Sets the `to' object for the line.
-
-\membersection{wxLineShape::Straighten}
-
-\func{void}{Straighten}{\param{wxDC*}{ dc = NULL}}
-
-Straighten verticals and horizontals. {\it dc} is optional.
-
-\membersection{wxLineShape::Unlink}
-
-\func{void}{Unlink}{\void}
-
-Unlinks the line from the nodes at either end.
-
-\section{\class{wxPolygonShape}}\label{wxpolygonshape}
-
-A wxPolygonShape's shape is defined by a number of points passed to the object's
-constructor. It can be used to create new shapes such as diamonds and triangles.
-
-\wxheading{Derived from}
-
-\helpref{wxShape}{wxshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxPolygonShape::wxPolygonShape}
-
-\func{}{wxPolygonShape}{void}
-
-Constructor. Call \helpref{wxPolygonShape::Create}{wxpolygonshapecreate} to specify the polygon's vertices.
-
-\membersection{wxPolygonShape::\destruct{wxPolygonShape}}
-
-\func{}{\destruct{wxPolygonShape}}{\void}
-
-Destructor.
-
-\membersection{wxPolygonShape::Create}\label{wxpolygonshapecreate}
-
-\func{void}{Create}{\param{wxList*}{ points}}
-
-Takes a list of wxRealPoints; each point is an {\it offset} from the centre.
-The polygon's destructor will delete these points, so do not delete them yourself.
-
-\membersection{wxPolygonShape::AddPolygonPoint}
-
-\func{void}{AddPolygonPoint}{\param{int}{ pos = 0}}
-
-Add a control point after the given point.
-
-\membersection{wxPolygonShape::CalculatePolygonCentre}
-
-\func{void}{CalculatePolygonCentre}{\void}
-
-Recalculates the centre of the polygon.
-
-\membersection{wxPolygonShape::DeletePolygonPoint}
-
-\func{void}{DeletePolygonPoint}{\param{int}{ pos = 0}}
-
-Deletes a control point.
-
-\membersection{wxPolygonShape::GetPoints}
-
-\func{wxList *}{GetPoints}{\void}
-
-Returns a pointer to the internal list of polygon vertices (wxRealPoints).
-
-\membersection{wxPolygonShape::UpdateOriginalPoints}
-
-\func{void}{UpdateOriginalPoints}{\void}
-
-If we've changed the shape, must make the original
-points match the working points with this function.
-
-\section{\class{wxRectangleShape}}\label{wxrectangleshape}
-
-The wxRectangleShape has rounded or square corners.
-
-\wxheading{Derived from}
-
-\helpref{wxShape}{wxshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxRectangleShape::wxRectangleShape}
-
-\func{}{wxRectangleShape}{\param{double}{ width = 0.0}, \param{double}{ height = 0.0}}
-
-Constructor.
-
-\membersection{wxRectangleShape::\destruct{wxRectangleShape}}
-
-\func{}{\destruct{wxRectangleShape}}{\void}
-
-Destructor.
-
-\membersection{wxRectangleShape::SetCornerRadius}
-
-\func{void}{SetCornerRadius}{\param{double}{ radius}}
-
-Sets the radius of the rectangle's rounded corners. If the radius is zero, a non-rounded
-rectangle will be drawn. If the radius is negative, the value is the proportion of the
-smaller dimension of the rectangle.
-
-\section{\class{wxPseudoMetaFile}}\label{wxpseudometafile}
-
-A simple metafile-like class which can load data from a Windows metafile on all platforms.
-
-\wxheading{Derived from}
-
-wxObject
-
-\section{\class{wxShape}}\label{wxshape}
-
-The wxShape is the top-level, abstract object that all other
-objects are derived from. All common functionality is represented by
-wxShape's members, and overriden members that appear in derived
-classes and have behaviour as documented for wxShape, are not
-documented separately.
-
-\wxheading{Derived from}
-
-\helpref{wxShapeEvtHandler}{wxshapeevthandler}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxShape::wxShape}
-
-\func{}{wxShape}{\param{wxShapeCanvas*}{ canvas = NULL}}
-
-Constructs a new wxShape.
-
-\membersection{wxShape::\destruct{wxShape}}
-
-\func{}{\destruct{wxShape}}{\void}
-
-Destructor.
-
-\membersection{wxShape::AddLine}
-
-\func{void}{AddLine}{\param{wxLineShape*}{ line}, \param{wxShape*}{ other}, \param{int}{ attachFrom = 0}, \param{int}{ attachTo = 0},
- \param{int}{ positionFrom = -1}, \param{int}{ positionTo = -1}}
-
-Adds a line between the specified canvas shapes, at the specified attachment points.
-
-The position in the list of lines at each end can also be specified, so that the line will be drawn
-at a particular point on its attachment point.
-
-\membersection{wxShape::AddRegion}
-
-\func{void}{AddRegion}{\param{wxShapeRegion*}{ region}}
-
-Adds a region to the shape.
-
-\membersection{wxShape::AddText}
-
-\func{void}{AddText}{\param{const wxString\& }{string}}
-
-Adds a line of text to the shape's default text region.
-
-\membersection{wxShape::AddToCanvas}
-
-\func{void}{AddToCanvas}{\param{wxShapeCanvas*}{ theCanvas}, \param{wxShape*}{ addAfter=NULL}}
-
-Adds the shape to the canvas's shape list. If {\it addAfter} is
-non-NULL, will add the shape after this one.
-
-\membersection{wxShape::AncestorSelected}
-
-\constfunc{bool}{AncestorSelected}{\void}
-
-TRUE if the shape's ancestor is currently selected.
-
-\membersection{wxShape::ApplyAttachmentOrdering}\label{wxshapeapplyattachmentordering}
-
-\func{void}{ApplyAttachmentOrdering}{\param{wxList\&}{ linesToSort}}
-
-Applies the line ordering in {\it linesToSort} to the shape, to reorder the way lines are attached.
-
-\membersection{wxShape::AssignNewIds}
-
-\func{void}{AssignNewIds}{\void}
-
-Assigns new ids to this image and its children.
-
-\membersection{wxShape::Attach}\label{wxshapeattach}
-
-\func{void}{Attach}{\param{wxShapeCanvas*}{ can}}
-
-Sets the shape's internal canvas pointer to point to the given canvas.
-
-\membersection{wxShape::AttachmentIsValid}\label{wxshapeattachmentisvalid}
-
-\constfunc{bool}{AttachmentIsValid}{\param{int}{ attachment}}
-
-Returns TRUE if {\it attachment} is a valid attachment point.
-
-\membersection{wxShape::AttachmentSortTest}\label{wxshapeattachmentsorttest}
-
-\constfunc{bool}{AttachmentSortTest}{\param{int}{ attachment}, \param{const wxRealPoint\&}{ pt1},
- \param{const wxRealPoint\&}{ pt2}}
-
-Returns TRUE if {\it pt1} is less than or equal to {\it pt2}, in the sense
-that one point comes before another on an edge of the shape. {\it attachment} is
-the attachment point (side) in question.
-
-This function is used in \helpref{wxShape::MoveLineToNewAttachment}{wxshapemovelinetonewattachment} to
-determine the new line ordering.
-
-\membersection{wxShape::CalcSimpleAttachment}\label{wxshapecalcsimpleattachment}
-
-\func{wxRealPoint}{CalcSimpleAttachment}{\param{const wxRealPoint\&}{ pt1},
- \param{const wxRealPoint\&}{ pt2}, \param{int}{ nth}, \param{int}{ noArcs}, \param{wxLineShape*}{ line}}
-
-Assuming the attachment lies along a vertical or horizontal line,
-calculates the position on that point.
-
-\wxheading{Parameters}
-
-\docparam{pt1}{The first point of the line repesenting the edge of the shape.}
-
-\docparam{pt2}{The second point of the line representing the edge of the shape.}
-
-\docparam{nth}{The position on the edge (for example there may be 6 lines at this attachment point,
-and this may be the 2nd line.}
-
-\docparam{noArcs}{The number of lines at this edge.}
-
-\docparam{line}{The line shape.}
-
-\wxheading{Remarks}
-
-This function expects the line to be either vertical or horizontal, and determines which.
-
-\membersection{wxShape::CalculateSize}
-
-\func{void}{CalculateSize}{\void}
-
-Called to calculate the shape's size if dependent on children sizes.
-
-\membersection{wxShape::ClearAttachments}
-
-\func{void}{ClearAttachments}{\void}
-
-Clears internal custom attachment point shapes (of class wxAttachmentPoint).
-
-\membersection{wxShape::ClearRegions}
-
-\func{void}{ClearRegions}{\void}
-
-Clears the wxShapeRegions from the shape.
-
-\membersection{wxShape::ClearText}
-
-\func{void}{ClearText}{\param{int}{ regionId = 0}}
-
-Clears the text from the specified text region.
-
-\membersection{wxShape::Constrain}
-
-\func{bool}{Constrain}{\void}
-
-Calculates the shape's constraints (if any). Applicable
-only to wxCompositeShape, does nothing if the shape is of
-a different class.
-
-\membersection{wxShape::Copy}\label{wxshapecopy}
-
-\func{void}{Copy}{\param{wxShape\&}{ copy}}
-
-Copy this shape into {\it copy}. Every derived class must have one of these, and each Copy implementation
-must call the derived class's implementation to ensure everything is copied. See also \helpref{wxShape::CreateNewCopy}{wxshapecreatenewcopy}.
-
-\membersection{wxShape::CreateNewCopy}\label{wxshapecreatenewcopy}
-
-\func{wxShape* }{CreateNewCopy}{\param{bool}{ resetMapping = TRUE}, \param{bool}{ recompute = TRUE}}
-
-Creates and returns a new copy of this shape (calling \helpref{wxShape::Copy}{wxshapecopy}). Do not override this function.
-
-This function should always be used to create a new copy, since it must do special processing
-for copying constraints associated with constraints.
-
-If {\it resetMapping} is TRUE, a mapping table used for complex shapes is reset; this may not be desirable
-if the shape being copied is a child of a composite (and so the mapping table is in use).
-
-If {\it recompute} is TRUE, \helpref{wxShape::Recompute}{wxshaperecompute} is called for the new shape.
-
-\wxheading{Remarks}
-
-This function uses the wxWindows dynamic object creation system to create a new shape of the same
-type as `this', before calling Copy.
-
-If the event handler for this shape is not the same as the shape itself, the event handler is also copied
-using \helpref{wxShapeEvtHandler::CreateNewCopy}{wxshapeevthandlercreatenewcopy}.
-
-\membersection{wxShape::DeleteControlPoints}
-
-\func{void}{DeleteControlPoints}{\void}
-
-Deletes the control points (or handles) for the shape. Does not redraw
-the shape.
-
-\membersection{wxShape::Detach}
-
-\func{void}{Detach}{\void}
-
-Disassociates the shape from its canvas by setting the internal shape
-canvas pointer to NULL.
-
-\membersection{wxShape::Draggable}
-
-\func{bool}{Draggable}{\void} 
-
-TRUE if the shape may be dragged by the user.
-
-\membersection{wxShape::Draw}
-
-\func{void}{Draw}{\param{wxDC\&}{ dc}}
-
-Draws the whole shape and any lines attached to it.
-
-Do not override this function: override OnDraw, which is called
-by this function.
-
-\membersection{wxShape::DrawContents}
-
-\func{void}{DrawContents}{\param{wxDC\&}{ dc}}
-
-Draws the internal graphic of the shape (such as
-text).
-
-Do not override this function: override OnDrawContents, which is called
-by this function.
-
-\membersection{wxShape::DrawLinks}
-
-\func{void}{DrawLinks}{\param{wxDC\&}{ dc}, \param{int}{ attachment = -1}}
-
-Draws any lines linked to this shape.
-
-\membersection{wxShape::Erase}
-
-\func{void}{Erase}{\param{wxDC\&}{ dc}}
-
-Erases the shape, but does not repair damage caused to other
-shapes.
-
-\membersection{wxShape::EraseContents}
-
-\func{void}{EraseContents}{\param{wxDC\&}{ dc}}
-
-Erases the shape contents, that is, the area within the shape's
-minimum bounding box.
-
-\membersection{wxShape::EraseLinks}
-
-\func{void}{EraseLinks}{\param{wxDC\&}{ dc}, \param{int}{ attachment = -1}}
-
-Erases links attached to this shape, but does not repair
-damage caused to other shapes.
-
-\membersection{wxShape::FindRegion}
-
-\func{wxShape *}{FindRegion}{\param{const wxString\& }{regionName}, \param{int *}{regionId}}
-
-Finds the actual image (`this' if non-composite) and region id for the given
-region name.
-
-\membersection{wxShape::FindRegionNames}
-
-\func{void}{FindRegionNames}{\param{wxStringList\&}{ list}}
-
-Finds all region names for this image (composite or simple).
-Supply an empty string list.
-
-\membersection{wxShape::Flash}
-
-\func{void}{Flash}{\void}
-
-Flashes the shape.
-
-\membersection{wxShape::FormatText}
-
-\func{void}{FormatText}{\param{const wxString\& }{s}, \param{int}{ i = 0}}
-
-Reformats the given text region; defaults to formatting the default region.
-
-\membersection{wxShape::GetAttachmentMode}
-
-\constfunc{bool}{GetAttachmentMode}{\void}
-
-Returns the attachment mode, which is TRUE if attachments are used, FALSE otherwise (in which case
-lines will be drawn as if to the centre of the shape). See \helpref{wxShape::SetAttachmentMode}{wxshapesetattachmentmode}.
-
-\membersection{wxShape::GetAttachmentPosition}\label{wxshapegetattachmentposition}
-
-\func{bool}{GetAttachmentPosition}{\param{int}{ attachment}, \param{double*}{ x}, \param{double*}{ y},
- \param{int}{ nth = 0}, \param{int}{ noArcs = 1}, \param{wxLineShape*}{ line = NULL}}
-
-Gets the position at which the given attachment point should be drawn.
-
-If {\it attachment} isn't found among the attachment points of the shape, returns FALSE.
-
-\membersection{wxShape::GetBoundingBoxMax}
-
-\func{void}{GetBoundingBoxMax}{\param{double *}{width}, \param{double *}{height}}
-
-Gets the maximum bounding box for the shape, taking into
-account external features such as shadows.
-
-\membersection{wxShape::GetBoundingBoxMin}
-
-\func{void}{GetBoundingBoxMin}{\param{double *}{width}, \param{double *}{height}}
-
-Gets the minimum bounding box for the shape, that defines
-the area available for drawing the contents (such as text).
-
-\membersection{wxShape::GetBrush}
-
-\constfunc{wxBrush*}{GetBrush}{\void}
-
-Returns the brush used for filling the shape.
-
-\membersection{wxShape::GetCanvas}
-
-\constfunc{wxShapeCanvas*}{GetCanvas}{\void}
-
-Gets the internal canvas pointer.
-
-\membersection{wxShape::GetCentreResize}
-
-\constfunc{bool}{GetCentreResize}{\void}
-
-Returns TRUE if the shape is to be resized from the centre (the centre
-stands still), or FALSE if from the corner or side being dragged (the
-other corner or side stands still).
-
-\membersection{wxShape::GetChildren}
-
-\constfunc{wxList\&}{GetChildren}{\void}
-
-Returns a reference to the list of children for this shape.
-
-\membersection{wxShape::GetClientData}
-
-\func{wxObject*}{GetClientData}{\void}
-
-Gets the client data associated with the shape (NULL if there is
-none).
-
-\membersection{wxShape::GetDisableLabel}
-
-\constfunc{bool}{GetDisableLabel}{\void}
-
-Returns TRUE if the default region will not be shown, FALSE otherwise.
-
-\membersection{wxShape::GetEventHandler}
-
-\constfunc{wxShapeEvtHandler*}{GetEventHandler}{\void}
-
-Returns the event handler for this shape.
-
-\membersection{wxShape::GetFixedHeight}
-
-\constfunc{bool}{GetFixedHeight}{\void}
-
-Returns TRUE if the shape cannot be resized in the vertical plane.
-
-\membersection{wxShape::GetFixedSize}
-
-\func{void}{GetFixedSize}{\param{bool *}{ x}, \param{bool *}{ y}}
-
-Returns flags indicating whether the shape is of fixed size in either direction.
-
-\membersection{wxShape::GetFixedWidth}
-
-\constfunc{bool}{GetFixedWidth}{\void}
-
-Returns TRUE if the shape cannot be resized in the horizontal plane.
-
-\membersection{wxShape::GetFont}
-
-\constfunc{wxFont*}{GetFont}{\param{int}{ regionId = 0}}
-
-Gets the font for the specified text region.
-
-\membersection{wxShape::GetFunctor}
-
-\constfunc{wxString}{GetFunctor}{\void}
-
-Gets a string representing the type of the shape, to be used when
-writing out shape descriptions to a file. This is overridden by
-each derived shape class to provide an appropriate type string. By default,
-"node\_image" is used for non-line shapes, and "arc\_image" for lines.
-
-\membersection{wxShape::GetId}
-
-\constfunc{long}{GetId}{\void}
-
-Returns the integer identifier for this shape.
-
-\membersection{wxShape::GetLinePosition}\label{wxshapegetlineposition}
-
-\func{int}{GetLinePosition}{\param{wxLineShape*}{ line}}
-
-Gets the zero-based position of {\it line} in the list of lines for this shape.
-
-\membersection{wxShape::GetLines}
-
-\constfunc{wxList\&}{GetLines}{\void}
-
-Returns a reference to the list of lines connected to this shape.
-
-\membersection{wxShape::GetMaintainAspectRatio}\label{wxshapegetmaintainaspectratio}
-
-\constfunc{bool}{GetMaintainAspectRatio}{\void}
-
-If returns TRUE, resizing the shape will not change the aspect ratio
-(width and height will be in the original proportion).
-
-\membersection{wxShape::GetNumberOfAttachments}\label{wxshapegetnumberofattachments}
-
-\constfunc{int}{GetNumberOfAttachments}{\void}
-
-Gets the number of attachment points for this shape.
-
-\membersection{wxShape::GetNumberOfTextRegions}
-
-\constfunc{int}{GetNumberOfTextRegions}{\void}
-
-Gets the number of text regions for this shape.
-
-\membersection{wxShape::GetParent}
-
-\constfunc{wxShape *}{GetParent}{\void}
-
-Returns the parent of this shape, if it is part of a composite.
-
-\membersection{wxShape::GetPen}
-
-\constfunc{wxPen*}{GetPen}{\void}
-
-Returns the pen used for drawing the shape's outline.
-
-\membersection{wxShape::GetPerimeterPoint}
-
-\func{bool}{GetPerimeterPoint}{\param{double}{ x1}, \param{double}{ y1}, \param{double}{ x2}, \param{double}{ y2}, \param{double *}{x3}, \param{double *}{y3}}
-
-Gets the point at which the line from (x1, y1) to (x2, y2) hits the shape. Returns TRUE if the
-line hits the perimeter.
-
-\membersection{wxShape::GetRegionId}\label{getregionid}
-
-\func{int}{GetRegionId}{\param{const wxString\& }{name}}
-
-Gets the region's identifier by name. This is {\it not} unique for within an entire composite, but
-is unique for the image.
-
-\membersection{wxShape::GetRegionName}\label{getregionname}
-
-\func{wxString}{GetRegionName}{\param{int}{ regionId = 0}}
-
-Gets the region's name. A region's name can be used to uniquely determine a region within
-an entire composite image hierarchy. See also \helpref{wxShape::SetRegionName}{wxshapesetregionname}.
-
-\membersection{wxShape::GetRegions}\label{getregions}
-
-\func{wxList\&}{GetRegions}{\void}
-
-Returns the list of wxShapeRegions.
-
-\membersection{wxShape::GetRotation}
-
-\constfunc{double}{GetRotatation}{\void}
-
-Returns the angle of rotation in radians.
-
-\membersection{wxShape::GetSensitivityFilter}
-
-\constfunc{void}{GetSensitivityFilter}{\void}
-
-Returns the sensitivity filter, a bitlist of values. See \helpref{wxShape::SetSensitivityFilter}{wxshapesetsensitivityfilter}.
-
-\membersection{wxShape::GetShadowMode}
-
-\constfunc{int}{SetShadowMode}{\void}
-
-Returns the shadow mode. See \helpref{wxShape::SetShadowMode}{wxshapesetshadowmode}.
-
-\membersection{wxShape::GetSpaceAttachments}
-
-\constfunc{bool}{GetSpaceAttachments}{\void}
-
-Indicates whether lines should be spaced out evenly at the point they touch the node (TRUE), or whether they
-should join at a single point (FALSE).
-
-\membersection{wxShape::GetTextColour}
-
-\constfunc{wxString}{GetTextColour}{\param{int}{ regionId = 0}}
-
-Gets the colour for the specified text region.
-
-\membersection{wxShape::GetTopAncestor}
-
-\constfunc{wxShape *}{GetTopAncestor}{\void}
-
-Returns the top-most ancestor of this shape (the root of the composite).
-
-\membersection{wxShape::GetX}
-
-\constfunc{double}{GetX}{\void}
-
-Gets the x position of the centre of the shape.
-
-\membersection{wxShape::GetY}
-
-\constfunc{double}{GetY}{\void}
-
-Gets the y position of the centre of the shape.
-
-\membersection{wxShape::HitTest}
-
-\func{bool}{HitTest}{\param{double}{ x}, \param{double}{ y}, \param{int*}{ attachment}, \param{double*}{ distance}}
-
-Given a point on a canvas, returns TRUE if the point was on the shape, and returns
-the nearest attachment point and distance from the given point and target.
-
-\membersection{wxShape::Insert}
-
-\func{void}{InsertInCanvas}{\param{wxShapeCanvas*}{ canvas}}
-
-Inserts the shape at the front of the shape list of {\it canvas}.
-
-\membersection{wxShape::IsHighlighted}
-
-\constfunc{bool}{IsHighlighted}{\void}
-
-Returns TRUE if the shape is highlighted. Shape highlighting is unimplemented.
-
-\membersection{wxShape::IsShown}
-
-\constfunc{bool}{IsShown}{\void}
-
-Returns TRUE if the shape is in a visible state, FALSE otherwise. Note
-that this has nothing to do with whether the window is hidden or the
-shape has scrolled off the canvas; it refers to the internal
-visibility flag.
-
-\membersection{wxShape::MakeControlPoints}
-
-\func{void}{MakeControlPoints}{\void}
-
-Make a list of control points (draggable handles) appropriate to the shape.
-
-\membersection{wxShape::MakeMandatoryControlPoints}
-
-\func{void}{MakeMandatoryControlPoints}{\void}
-
-Make the mandatory control points. For example, the control point on a dividing line should
-appear even if the divided rectangle shape's handles should not appear (because it is the child of
-a composite, and children are not resizable).
-
-\membersection{wxShape::Move}\label{wxshapemove}
-
-\func{void}{Move}{\param{wxDC\&}{ dc}, \param{double}{ x1}, \param{double}{ y1}, \param{bool}{ display = TRUE}}
-
-Move the shape to the given position, redrawing if {\it display} is TRUE.
-
-\membersection{wxShape::MoveLineToNewAttachment}\label{wxshapemovelinetonewattachment}
-
-\func{void}{MoveLineToNewAttachment}{\param{wxDC\&}{ dc}, \param{wxLineShape*}{ toMove}, \param{double}{ x}, \param{double}{ y}}
-
-Move the given line (which must already be attached to the shape) to 
-a different attachment point on the shape, or a different order on the same attachment.
-
-Cals \helpref{wxShape::AttachmentSortTest}{wxshapeattachmentsorttest} and then \helpref{wxShapeEvtHandler::OnChangeAttachment}{wxshapeevthandleronchangeattachment}.
-
-\membersection{wxShape::MoveLinks}
-
-\func{void}{MoveLinks}{\param{wxDC\&}{ dc}}
-
-Redraw all the lines attached to the shape.
-
-\membersection{wxShape::NameRegions}
-
-\func{void}{NameRegions}{\param{const wxString\& }{parentName = ``"}}
-
-Make unique names for all the regions in a shape or composite shape.
-
-\membersection{wxShape::Rotate}
-
-\func{void}{Rotate}{\param{double }{x}, \param{double }{y}, \param{double }{theta}}
-
-Rotate about the given axis by the given amount in radians (does nothing
-for most shapes). But even non-rotating shapes should record their
-notional rotation in case it's important (e.g. in dog-leg code).
-
-\membersection{wxShape::ReadConstraints}
-
-\func{void}{ReadConstraints}{\param{wxExpr *}{clause}, \param{wxExprDatabase *}{database}}
-
-If the shape is a composite, it may have constraints that need to be read in in a separate pass.
-
-\membersection{wxShape::ReadAttributes}
-
-\func{void}{ReadAttributes}{\param{wxExpr*}{ clause}}
-
-Reads the attributes (data member values) from the given expression.
-
-\membersection{wxShape::ReadRegions}
-
-\func{void}{ReadRegions}{\param{wxExpr *}{clause}}
-
-Reads in the regions.
-
-\membersection{wxShape::Recentre}
-
-\func{void}{Recentre}{\void}
-
-Does recentring (or other formatting) for all the text regions for this shape.
-
-\membersection{wxShape::RemoveFromCanvas}
-
-\func{void}{RemoveFromCanvas}{\param{wxShapeCanvas*}{ canvas}}
-
-Removes the shape from the canvas.
-
-\membersection{wxShape::ResetControlPoints}
-
-\func{void}{ResetControlPoints}{\void}
-
-Resets the positions of the control points (for instance when the
-shape's shape has changed).
-
-\membersection{wxShape::ResetMandatoryControlPoints}
-
-\func{void}{ResetMandatoryControlPoints}{\void}
-
-Reset the mandatory control points. For example, the control point on a dividing line should
-appear even if the divided rectangle shape's handles should not appear (because it is the child of
-a composite, and children are not resizable).
-
-\membersection{wxShape::Recompute}\label{wxshaperecompute}
-
-\func{bool}{Recompute}{\void} 
-
-Recomputes any constraints associated with the shape (normally
-applicable to wxCompositeShapes only, but harmless for other
-classes of shape).
-
-\membersection{wxShape::RemoveLine}
-
-\func{void}{RemoveLine}{\param{wxLineShape*}{ line}}
-
-Removes the given line from the shape's list of attached lines.
-
-\membersection{wxShape::Select}\label{wxshapeselect}
-
-\func{void}{Select}{\param{bool}{ select = TRUE}}
-
-Selects or deselects the given shape, drawing or erasing control points
-(handles) as necessary.
-
-\membersection{wxShape::Selected}\label{wxshapeselected}
-
-\constfunc{bool}{Selected}{\void}
-
-TRUE if the shape is currently selected.
-
-\membersection{wxShape::SetAttachmentMode}\label{wxshapesetattachmentmode}
-
-\func{void}{SetAttachmentMode}{\param{bool}{ flag}}
-
-Sets the attachment mode to TRUE or FALSE. If TRUE, attachment points
-will be significant when drawing lines to and from this shape.
-If FALSE, lines will be drawn as if to the centre of the shape.
-
-\membersection{wxShape::SetBrush}
-
-\func{void}{SetBrush}{\param{wxBrush *}{brush}}
-
-Sets the brush for filling the shape's shape.
-
-\membersection{wxShape::SetCanvas}\label{wxshapesetcanvas}
-
-\func{void}{SetCanvas}{\param{wxShapeCanvas*}{ theCanvas}}
-
-Identical to \helpref{wxShape::Attach}{wxshapesetcanvas}.
-
-\membersection{wxShape::SetCentreResize}
-
-\func{void}{SetCentreResize}{\param{bool}{ cr}}
-
-Specify whether the shape is to be resized from the centre (the centre stands still) or from the corner or side
-being dragged (the other corner or side stands still).
-
-\membersection{wxShape::SetClientData}
-
-\func{void}{SetClientData}{\param{wxObject *}{clientData}}
-
-Sets the client data.
-
-\membersection{wxShape::SetDefaultRegionSize}\label{setdefaultregionsize}
-
-\func{void}{SetDefaultRegionSize}{\void}
-
-Set the default region to be consistent with the shape size.
-
-\membersection{wxShape::SetDisableLabel}
-
-\func{void}{SetDisableLabel}{\param{bool}{ flag}}
-
-Set {\it flag} to TRUE to stop the default region being shown, FALSE otherwise.
-
-\membersection{wxShape::SetDraggable}
-
-\func{void}{SetDraggable}{\param{bool}{ drag}, \param{bool}{ recursive = FALSE}}
-
-Sets the shape to be draggable or not draggable.
-
-\membersection{wxShape::SetDrawHandles}
-
-\func{void}{SetDrawHandles}{\param{bool}{ drawH}}
-
-Sets the {\it drawHandles} flag for this shape and all descendants. If {\it drawH} is TRUE (the default),
-any handles (control points) will be drawn. Otherwise, the handles will not be drawn.
-
-\membersection{wxShape::SetEventHandler}
-
-\func{void}{GetEventHandler}{\param{wxShapeEvtHandler *}{handler}}
-
-Sets the event handler for this shape.
-
-\membersection{wxShape::SetFixedSize}
-
-\func{void}{SetFixedSize}{\param{bool}{ x}, \param{bool}{ y}} 
-
-Sets the shape to be of the given, fixed size.
-
-\membersection{wxShape::SetFont}
-
-\func{void}{SetFont}{\param{wxFont *}{font}, \param{int}{ regionId = 0}}
-
-Sets the font for the specified text region.
-
-\membersection{wxShape::SetFormatMode}\label{setformatmode}
-
-\func{void}{SetFormatMode}{\param{int}{ mode}, \param{int}{ regionId = 0}} 
-
-Sets the format mode of the default text region. The argument can be a bit list
-of the following:
-
-\begin{description}\itemsep=0pt
-\item[FORMAT\_NONE] No formatting.
-\item[FORMAT\_CENTRE\_HORIZ] Horizontal centring.
-\item[FORMAT\_CENTRE\_VERT] Vertical centring.
-\end{description}
-
-\membersection{wxShape::SetHighlight}
-
-\func{void}{SetHighlight}{\param{bool}{ hi}, \param{bool}{ recurse = FALSE}}
-
-Sets the highlight for a shape. Shape highlighting is unimplemented.
-
-\membersection{wxShape::SetId}
-
-\func{void}{SetId}{\param{long}{ id}}
-
-Set the integer identifier for this shape.
-
-\membersection{wxShape::SetMaintainAspectRatio}\label{wxshapesetmaintainaspectratio}
-
-\func{void}{SetMaintainAspectRatio}{\param{bool}{ flag}}
-
-If the argument is TRUE, tells the shape that resizes should not change the aspect ratio
-(width and height should be in the original proportion).
-
-\membersection{wxShape::SetPen}
-
-\func{void}{SetPen}{\param{wxPen *}{pen}}
-
-Sets the pen for drawing the shape's outline.
-
-\membersection{wxShape::SetRegionName}\label{wxshapesetregionname}
-
-\func{void}{SetRegionName}{\param{const wxString\& }{name}, \param{int}{ regionId = 0}}
-
-Sets the name for this region. The name for a region is unique within the scope of the whole
-composite, whereas a region id is unique only for a single image.
-
-\membersection{wxShape::SetSensitivityFilter}\label{wxshapesetsensitivityfilter}
-
-\func{void}{SetSensitivityFilter}{\param{int}{ sens=OP\_ALL}, \param{bool}{ recursive = FALSE}}
-
-Sets the shape to be sensitive or insensitive to specific mouse operations.
-
-{\it sens} is a bitlist of the following:
-
-\begin{itemize}\itemsep=0pt
-\item OP\_CLICK\_LEFT
-\item OP\_CLICK\_RIGHT
-\item OP\_DRAG\_LEFT
-\item OP\_DRAG\_RIGHT
-\item OP\_ALL (equivalent to a combination of all the above).
-\end{itemize}
-
-\membersection{wxShape::SetShadowMode}\label{wxshapesetshadowmode}
-
-\func{void}{SetShadowMode}{\param{int}{ mode}, \param{bool}{ redraw = FALSE}}
-
-Sets the shadow mode (whether a shadow is drawn or not). {\it mode} can be one of
-the following:
-
-\begin{description}\itemsep=0pt
-\item[SHADOW\_NONE] No shadow (the default).
-\item[SHADOW\_LEFT] Shadow on the left side.
-\item[SHADOW\_RIGHT] Shadow on the right side.
-\end{description}
-
-\membersection{wxShape::SetSize}
-
-\func{void}{SetSize}{\param{double}{ x}, \param{double}{ y}, \param{bool}{ recursive = TRUE}}
-
-Sets the shape's size.
-
-\membersection{wxShape::SetSpaceAttachments}
-
-\func{void}{SetSpaceAttachments}{\param{bool}{ sp}}
-
-Indicate whether lines should be spaced out evenly at the point they touch the node (TRUE), or whether they
-should join at a single point (FALSE).
-
-\membersection{wxShape::SetTextColour}
-
-\func{void}{SetTextColour}{\param{const wxString\& }{colour}, \param{int}{ regionId = 0}}
-
-Sets the colour for the specified text region.
-
-\membersection{wxShape::SetX}
-
-\func{void}{SetX}{\param{double}{ x}}
-
-Sets the {\it x} position of the shape.
-
-\membersection{wxShape::SetX}
-
-\func{void}{SetY}{\param{double}{ y}}
-
-Sets the {\it y} position of the shape.
-
-\membersection{wxShape::SpaceAttachments}
-
-\func{void}{SpaceAttachments}{\param{bool}{ sp}} 
-
-Sets the spacing mode: if TRUE, lines at the same attachment point will be
-spaced evenly across that side of the shape. If false, all lines at the
-same attachment point will emanate from the same point.
-
-\membersection{wxShape::Show}
-
-\func{void}{Show}{\param{bool}{ show}}
-
-Sets a flag indicating whether the shape should be drawn.
-
-\membersection{wxShape::Unlink}
-
-\func{void}{Unlink}{\void}
-
-If the shape is a line, unlinks the nodes attached to the shape, removing itself from the list of
-lines for each of the `to' and `from' nodes.
-
-\membersection{wxShape::WriteAttributes}
-
-\func{void}{WriteAttributes}{\param{wxExpr *}{clause}}
-
-Writes the shape's attributes (data member values) into the given expression.
-
-\membersection{wxShape::WriteRegions}
-
-\func{void}{WriteRegions}{\param{wxExpr *}{clause}}
-
-Writes the regions.
-
-\section{\class{wxShapeCanvas}}\label{wxshapecanvas}
-
-A canvas for drawing diagrams on.
-
-\wxheading{Derived from}
-
-wxScrolledWindow
-
-\wxheading{See also}
-
-\helpref{wxDiagram}{wxdiagram}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxShapeCanvas::wxShapeCanvas}
-
-\func{}{wxShapeCanvas}{\param{wxWindow*}{ parent = NULL}, \param{wxWindowID}{ id = -1},
- \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ size = wxDefaultSize},
- \param{long}{ style = wxBORDER}}
-
-Constructor.
-
-\membersection{wxShapeCanvas::\destruct{wxShapeCanvas}}
-
-\func{}{\destruct{wxShapeCanvas}}{\void}
-
-Destructor.
-
-\membersection{wxShapeCanvas::AddShape}
-
-\func{void}{AddShape}{\param{wxShape *}{shape}, \param{wxShape *}{addAfter = NULL}}
-
-Adds a shape to the diagram. If {\it addAfter} is non-NULL, the shape will be added after this
-one.
-
-\membersection{wxShapeCanvas::FindShape}
-
-\func{wxShape *}{FindShape}{\param{double}{ x1}, \param{double}{ y}, \param{int *}{attachment}, \param{wxClassInfo *}{info = NULL},
- \param{wxShape *}{notImage = NULL}}
-
-Find a shape under this mouse click. Returns the shape (or NULL), and the nearest attachment point.
-
-If {\it info} is non-NULL, a shape whose class which is a descendant of the desired class is found.
-
-If {\it notImage} is non-NULL, shapes which are descendants of {\it notImage} are ignored.
-
-\membersection{wxShapeCanvas::FindFirstSensitiveShape}
-
-\func{wxShape *}{FindFirstSensitiveShape}{\param{double}{ x1}, \param{double}{ y}, \param{int *}{attachment}, \param{int}{ op}}
-
-Finds the first sensitive shape whose sensitivity filter matches {\it op}, working up the hierarchy of composites until
-one (or none) is found.
-
-\membersection{wxShapeCanvas::GetDiagram}
-
-\constfunc{wxDiagram*}{GetDiagram}{\void}
-
-Returns the canvas associated with this diagram.
-
-\membersection{wxShapeCanvas::GetGridSpacing}
-
-\constfunc{double}{GetGridSpacing}{\void}
-
-Returns the grid spacing.
-
-\membersection{wxShapeCanvas::GetMouseTolerance}
-
-\constfunc{int}{GetMouseTolerance}{\void}
-
-Returns the tolerance within which a mouse move is ignored.
-
-\membersection{wxShapeCanvas::GetShapeList}
-
-\constfunc{wxList*}{GetShapeList}{\void}
-
-Returns a pointer to the internal shape list.
-
-\membersection{wxShapeCanvas::GetQuickEditMode}
-
-\constfunc{bool}{GetQuickEditMode}{\void}
-
-Returns quick edit mode for the associated diagram.
-
-\membersection{wxShapeCanvas::InsertShape}
-
-\func{void}{InsertShape}{\param{wxShape*}{ shape}}
-
-Inserts a shape at the front of the shape list.
-
-\membersection{wxShapeCanvas::OnBeginDragLeft}\label{wxshapecanvasonbegindragleft}
-
-\func{void}{OnBeginDragLeft}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when the start of a left-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnDragLeft}{wxshapecanvasondragleft}, \helpref{wxShapeCanvas::OnEndDragLeft}{wxshapecanvasonenddragleft}.
-
-\membersection{wxShapeCanvas::OnBeginDragRight}\label{wxshapecanvasonbegindragright}
-
-\func{void}{OnBeginDragRight}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when the start of a right-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnDragRight}{wxshapecanvasondragright}, \helpref{wxShapeCanvas::OnEndDragRight}{wxshapecanvasonenddragright}.
-
-\membersection{wxShapeCanvas::OnEndDragLeft}\label{wxshapecanvasonenddragleft}
-
-\func{void}{OnEndDragLeft}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when the end of a left-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnDragLeft}{wxshapecanvasondragleft}, \helpref{wxShapeCanvas::OnBeginDragLeft}{wxshapecanvasonbegindragleft}.
-
-\membersection{wxShapeCanvas::OnEndDragRight}\label{wxshapecanvasonenddragright}
-
-\func{void}{OnEndDragRight}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when the end of a right-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnDragRight}{wxshapecanvasondragright}, \helpref{wxShapeCanvas::OnBeginDragRight}{wxshapecanvasonbegindragright}.
-
-\membersection{wxShapeCanvas::OnDragLeft}\label{wxshapecanvasondragleft}
-
-\func{void}{OnDragLeft}{\param{bool}{ draw}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when a left-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it draw} is alternately TRUE and FALSE, to assist drawing and erasing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnBeginDragLeft}{wxshapecanvasonbegindragleft}, \helpref{wxShapeCanvas::OnEndDragLeft}{wxshapecanvasonenddragleft}.
-
-\membersection{wxShapeCanvas::OnDragRight}\label{wxshapecanvasondragright}
-
-\func{void}{OnDragRight}{\param{bool}{ draw}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when a right-button drag event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it draw} is alternately TRUE and FALSE, to assist drawing and erasing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-See also \helpref{wxShapeCanvas::OnBeginDragRight}{wxshapecanvasonbegindragright}, \helpref{wxShapeCanvas::OnEndDragRight}{wxshapecanvasonenddragright}.
-
-\membersection{wxShapeCanvas::OnLeftClick}\label{wxshapecanvasonleftclick}
-
-\func{void}{OnLeftClick}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when a left click event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-\membersection{wxShapeCanvas::OnRightClick}\label{wxshapecanvasonrightclick}
-
-\func{void}{OnRightClick}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}}
-
-Called when a right click event on the canvas background is detected by OnEvent. You may override this member;
-by default it does nothing.
-
-{\it keys} is a bit list of the following:
-
-\begin{itemize}\itemsep=0pt
-\item KEY\_SHIFT
-\item KEY\_CTRL
-\end{itemize}
-
-\membersection{wxShapeCanvas::Redraw}
-
-\func{void}{Redraw}{\void}
-
-Calls wxDiagram::Redraw.
-
-\membersection{wxShapeCanvas::RemoveShape}
-
-\func{void}{RemoveShape}{\param{wxShape *}{shape}}
-
-Calls wxDiagram::RemoveShape.
-
-\membersection{wxShapeCanvas::SetDiagram}
-
-\func{void}{SetDiagram}{\param{wxDiagram *}{diagram}}
-
-Sets the diagram associated with this diagram.
-
-\membersection{wxShapeCanvas::Snap}
-
-\func{void}{Snap}{\param{double *}{x}, \param{double *}{y}}
-
-Calls wxDiagram::Snap.
-
-
-
-\section{\class{wxShapeEvtHandler}}\label{wxshapeevthandler}
-
-wxShapeEvtHandler is a class from which wxShape (and therefore all shape classes) are derived.
-A wxShape also contains a pointer to its current wxShapeEvtHandler. Event handlers
-can be swapped in and out, altering the behaviour of a shape. This allows, for example,
-a range of behaviours to be redefined in one class, rather than requiring
-each shape class to be subclassed.
-
-\wxheading{Derived from}
-
-wxObject
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxShapeEvtHandler::m\_handlerShape}
-
-\member{wxShape*}{m\_handlerShape}
-
-Pointer to the shape associated with this handler.
-
-\membersection{wxShapeEvtHandler::m\_previousHandler}
-
-\member{wxShapeEvtHandler*}{m\_previousHandler}
-
-Pointer to the previous handler.
-
-\membersection{wxShapeEvtHandler::wxShapeEvtHandler}
-
-\func{void}{wxShapeEvtHandler}{\param{wxShapeEvtHandler *}{previous = NULL}, \param{wxShape *}{shape = NULL}}
-
-Constructs a new event handler.
-
-\membersection{wxShapeEvtHandler::\destruct{wxShapeEvtHandler}}
-
-\func{void}{\destruct{wxShapeEvtHandler}}{\void}
-
-Destructor.
-
-\membersection{wxShapeEvtHandler::CopyData}\label{wxshapeevthandlercopydata}
-
-\func{void}{CopyData}{\param{wxShapeEvtHandler\&}{ handler}}
-
-A virtual function to copy the data from this object to {\it handler}. Override if you
-derive from wxShapeEvtHandler and have data to copy.
-
-\membersection{wxShapeEvtHandler::CreateNewCopy}\label{wxshapeevthandlercreatenewcopy}
-
-\func{wxShapeEvtHandler*}{CreateNewCopy}{\void}
-
-Creates a new event handler object of the same class as this object, and then
-calls \helpref{wxShapeEvtHandler::CopyData}{wxshapeevthandlercopydata}.
-
-\membersection{wxShapeEvtHandler::GetPreviousHandler}\label{wxshapeevthandlergetprevioushandler}
-
-\constfunc{wxShapeEvtHandler*}{GetPreviousHandler}{\void}
-
-Returns the previous handler.
-
-\membersection{wxShapeEvtHandler::GetShape}\label{wxshapeevthandlergetshape}
-
-\constfunc{wxShape*}{GetShape}{\void}
-
-Returns the shape associated with this handler.
-
-\membersection{wxShapeEvtHandler::OnBeginDragLeft}
-
-\func{void}{OnBeginDragLeft}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when the user is beginning to drag using the left mouse button.
-
-\membersection{wxShapeEvtHandler::OnBeginDragRight}
-
-\func{void}{OnBeginDragRight}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when the user is beginning to drag using the right mouse button.
-
-\membersection{wxShapeEvtHandler::OnBeginSize}
-
-\func{void}{OnBeginSize}{\param{double}{ width}, \param{double}{ height}}
-
-Called when a shape starts to be resized.
-
-\membersection{wxShapeEvtHandler::OnChangeAttachment}\label{wxshapeevthandleronchangeattachment}
-
-\func{void}{OnChangeAttachment}{\param{int}{ attachment}, \param{wxLineShape*}{ line}, \param{wxList\&}{ ordering}}
-
-Override this to prevent or intercept line reordering. wxShape's implementation of this function
-calls \helpref{wxShape::ApplyAttachmentOrdering}{wxshapeapplyattachmentordering} to apply
-the new ordering.
-
-\membersection{wxShapeEvtHandler::OnDragLeft}
-
-\func{void}{OnDragLeft}{\param{bool}{ draw}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called twice when the shape is being dragged, once to allow erasing the old
-image, and again to allow drawing at the new position.
-
-\membersection{wxShapeEvtHandler::OnDragRight}
-
-\func{void}{OnDragRight}{\param{bool}{ draw}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called twice when the shape is being dragged, once to allow erasing the old
-image, and again to allow drawing at the new position.
-
-\membersection{wxShapeEvtHandler::OnDraw}
-
-\func{void}{OnDraw}{\param{wxDC\&}{ dc}}
-
-Defined for each class to draw the main graphic, but
-not the contents.
-
-\membersection{wxShapeEvtHandler::OnDrawContents}
-
-\func{void}{OnDrawContents}{\param{wxDC\&}{ dc}}
-
-Defined for each class to draw the contents of the
-shape, such as text.
-
-\membersection{wxShapeEvtHandler::OnDrawControlPoints}
-
-\func{void}{OnDrawControlPoints}{\param{wxDC\&}{ dc}}
-
-Called when the shape's control points (handles) should
-be drawn.
-
-\membersection{wxShapeEvtHandler::OnDrawOutline}
-
-\func{void}{OnDrawOutline}{\param{wxDC\&}{ dc}}
-
-Called when the outline of the shape should be drawn.
-
-\membersection{wxShapeEvtHandler::OnEndDragLeft}
-
-\func{void}{OnEndDragLeft}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when the user is stopping dragging using the left mouse button.
-
-\membersection{wxShapeEvtHandler::OnEndDragRight}
-
-\func{void}{OnEndDragRight}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when the user is stopping dragging using the right mouse button.
-
-\membersection{wxShapeEvtHandler::OnEndSize}
-
-\func{void}{OnEndSize}{\param{double}{ width}, \param{double}{ height}}
-
-Called after a shape is resized.
-
-\membersection{wxShapeEvtHandler::OnErase}
-
-\func{void}{OnErase}{\param{wxDC\&}{ dc}}
-
-Called when the whole shape should be erased.
-
-\membersection{wxShapeEvtHandler::OnEraseContents}
-
-\func{void}{OnEraseContents}{\param{wxDC\&}{ dc}}
-
-Called when the contents should be erased.
-
-\membersection{wxShapeEvtHandler::OnEraseControlPoints}
-
-\func{void}{OnEraseControlPoints}{\param{wxDC\&}{ dc}}
-
-Called when the shape's control points (handles) should
-be erased.
-
-\membersection{wxShapeEvtHandler::OnHighlight}
-
-\func{void}{OnHighlight}{\param{wxDC\&}{ dc}}
-
-Called when the shape should be highlighted.
-
-\membersection{wxShapeEvtHandler::OnLeftClick}
-
-\func{void}{OnLeftClick}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys =0}, \param{int}{ attachment = 0}}
-
-Called when the shape receives a left mouse click event.
-
-\membersection{wxShapeEvtHandler::OnMoveLink}
-
-\func{void}{OnMoveLink}{\param{wxDC\&}{ dc}, \param{bool}{ moveControlPoints=TRUE}}
-
-Called when the line attached to an shape need to be repositioned,
-because the shape has moved.
-
-\membersection{wxShapeEvtHandler::OnMoveLinks}
-
-\func{void}{OnMoveLinks}{\param{wxDC\&}{ dc}}
-
-Called when the lines attached to an shape need to be repositioned,
-because the shape has moved.
-
-\membersection{wxShapeEvtHandler::OnMovePost}
-
-\func{bool}{OnMovePost}{\param{wxDC\&}{ dc}, \param{double}{ x}, \param{double}{ y}, \param{double}{ oldX}, \param{double}{ oldY}, \param{bool}{ display = TRUE}}
-
-Called just after the shape receives a move request.
-
-\membersection{wxShapeEvtHandler::OnMovePre}
-
-\func{bool}{OnMovePre}{\param{wxDC\&}{ dc}, \param{double}{ x}, \param{double}{ y}, \param{double}{ oldX}, \param{double}{ oldY}, \param{bool}{ display = TRUE}}
-
-Called just before the shape receives a move request. Returning TRUE
-allows the move to be processed; returning FALSE vetoes the move.
-
-\membersection{wxShapeEvtHandler::OnRightClick}
-
-\func{void}{OnRightClick}{\param{double}{ x}, \param{double}{ y}, \param{int}{ keys = 0}, \param{int}{ attachment = 0}}
-
-Called when the shape receives a mouse mouse click event.
-
-\membersection{wxShapeEvtHandler::OnSize}
-
-\func{void}{OnSize}{\param{double}{ x}, \param{double}{ y}}
-
-Called when the shape receives a resize request.
-
-\membersection{wxShapeEvtHandler::OnSizingBeginDragLeft}
-
-\func{void}{OnSizingBeginDragLeft}{\param{wxControlPoint*}{ pt}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when a sizing drag is beginning.
-
-\membersection{wxShapeEvtHandler::OnSizingDragLeft}
-
-\func{void}{OnSizingDragLeft}{\param{wxControlPoint*}{ pt}, \param{bool}{ draw}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when a sizing drag is occurring.
-
-\membersection{wxShapeEvtHandler::OnSizingEndDragLeft}
-
-\func{void}{OnSizingEndDragLeft}{\param{wxControlPoint*}{ pt}, \param{double}{ x}, \param{double}{ y}, \param{int}{ keys=0}, \param{int}{ attachment = 0}}
-
-Called when a sizing drag is ending.
-
-\membersection{wxShapeEvtHandler::SetPreviousHandler}\label{wxshapeevthandlersetprevioushandler}
-
-\func{void}{SetPreviousHandler}{\param{wxShapeEvtHandler*}{ handler}}
-
-Sets the previous handler.
-
-\membersection{wxShapeEvtHandler::SetShape}\label{wxshapeevthandlersetshape}
-
-\func{void}{SetShape}{\param{wxShape*}{ shape}}
-
-Sets the shape for this handler.
-
-\section{\class{wxTextShape}}\label{wxtextshape}
-
-As wxRectangleShape, but only the text is displayed.
-
-\wxheading{Derived from}
-
-\helpref{wxRectangleShape}{wxrectangleshape}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxTextShape::wxTextShape}
-
-\func{void}{wxTextShape}{\param{double}{ width = 0.0}, \param{double}{ height = 0.0}}
-
-Constructor.
-
-\membersection{wxTextShape::\destruct{wxTextShape}}
-
-\func{void}{\destruct{wxTextShape}}{\void}
-
-Destructor.
-
-\section{Functions}\label{functions}
-
-These are the OGL functions.
-
-\membersection{::wxOGLInitialize}
-
-\func{void}{wxOGLInitialize}{\void}
- 
-Initializes OGL.
-
-\membersection{::wxOGLCleanUp}
-
-\func{void}{wxOGLCleanUp}{\void}
- 
-Cleans up OGL.
-
diff --git a/contrib/docs/latex/ogl/contents.gif b/contrib/docs/latex/ogl/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/docs/latex/ogl/contents.gif and /dev/null differ
diff --git a/contrib/docs/latex/ogl/forward.gif b/contrib/docs/latex/ogl/forward.gif
deleted file mode 100644
index d8862174ed..0000000000
Binary files a/contrib/docs/latex/ogl/forward.gif and /dev/null differ
diff --git a/contrib/docs/latex/ogl/intro.tex b/contrib/docs/latex/ogl/intro.tex
deleted file mode 100644
index 6d208fff9b..0000000000
--- a/contrib/docs/latex/ogl/intro.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-\chapter{Introduction}
-\pagenumbering{arabic}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-Object Graphics Library (\ogl) is a C++ library supporting the creation and
-manipulation of simple and complex graphic images on a canvas.
-
-It can be found in the directory {\tt utils/ogl/src} in the
-wxWindows distribution. The file {\tt ogl.h} must be included to make use
-of the library.
-
-Please see \helpref{OGL overview}{ogloverview} for a general description how the object library works. For details,
-please see the \helpref{class reference}{classref}.
-
-\section{File structure}
-
-These are the files that comprise the \ogl\ library.
-
-\begin{description}\itemsep=0pt
-\item[basic.h] Header for basic objects such as wxShape and wxRectangleShape.
-\item[basic.cpp] Basic objects implementation (1).
-\item[basic2.cpp] Basic objects implementation (2).
-\item[bmpshape.h] wxBitmapShape class header.
-\item[bmpshape.cpp] wxBitmapShape implementation.
-\item[canvas.h] wxShapeCanvas class header.
-\item[canvas.cpp] wxShapeCanvas class implementation.
-\item[composit.h] Composite object class header.
-\item[composit.cpp] Composite object class implementation.
-\item[constrnt.h] Constraint classes header.
-\item[constrnt.cpp] Constraint classes implementation.
-\item[divided.h] Divided object class header.
-\item[divided.cpp] Divided object class implementation.
-\item[drawn.h] Drawn (metafile) object class header.
-\item[drawn.cpp] Drawn (metafile) object class implementation.
-\item[graphics.h] Main include file.
-\item[lines.h] wxLineShape class header.
-\item[lines.cpp] wxLineShape class implementation.
-\item[misc.h] Miscellaneous graphics functions header.
-\item[misc.cpp] Miscellaneous graphics functions implementation.
-\item[ogldiag.h] wxDiagram class header.
-\item[ogldiag.cpp] wxDiagram implementation.
-\item[mfutils.h] Metafile utilities header.
-\item[mfutils.cpp] Metafile utilities implementation.
-\end{description}
-
-
diff --git a/contrib/docs/latex/ogl/ogl.hpj b/contrib/docs/latex/ogl/ogl.hpj
deleted file mode 100644
index e1575a145b..0000000000
--- a/contrib/docs/latex/ogl/ogl.hpj
+++ /dev/null
@@ -1,17 +0,0 @@
-[OPTIONS]
-BMROOT=c:\wx2dev\wxwind~1\contrib\docs\latex\ogl
-TITLE=OGL Manual
-CONTENTS=Contents
-COMPRESS=HIGH
-
-[FILES]
-ogl.rtf
-
-[CONFIG]
-CreateButton("Up", "&Up", "JumpId(`ogl.hlp', `Contents')")
-BrowseButtons()
-
-[MAP]
-
-[BITMAPS]
-
diff --git a/contrib/docs/latex/ogl/ogl.tex b/contrib/docs/latex/ogl/ogl.tex
deleted file mode 100644
index c9c9c215f3..0000000000
--- a/contrib/docs/latex/ogl/ogl.tex
+++ /dev/null
@@ -1,46 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}
-\newcommand{\ogl}[0]{{OGL}}%
-\definecolour{black}{0}{0}{0}%
-\definecolour{cyan}{0}{255}{255}%
-\definecolour{green}{0}{255}{0}%
-\definecolour{magenta}{255}{0}{255}%
-\definecolour{red}{255}{0}{0}%
-\definecolour{blue}{0}{0}{200}%
-\definecolour{yellow}{255}{255}{0}%
-\definecolour{white}{255}{255}{255}%
-\input psbox.tex
-\parindent 0pt
-\parskip 11pt
-\title{Object Graphics Library 3.0}
-\author{Julian Smart}
-\date{September 1998}
-
-\makeindex
-\begin{document}
-\maketitle
-
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\pagenumbering{roman}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\tableofcontents%
-
-\input{intro.tex}
-%
-\input{sample.tex}
-%
-\input{classes.tex}
-%
-\input{topics.tex}
-%
-\input{bugs.tex}
-%
-\input{changes.tex}
-
-%
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\printindex
-\end{document}
diff --git a/contrib/docs/latex/ogl/ogledit.bmp b/contrib/docs/latex/ogl/ogledit.bmp
deleted file mode 100644
index e7cf417cf5..0000000000
Binary files a/contrib/docs/latex/ogl/ogledit.bmp and /dev/null differ
diff --git a/contrib/docs/latex/ogl/ogledit.gif b/contrib/docs/latex/ogl/ogledit.gif
deleted file mode 100644
index 9784681b2d..0000000000
Binary files a/contrib/docs/latex/ogl/ogledit.gif and /dev/null differ
diff --git a/contrib/docs/latex/ogl/sample.tex b/contrib/docs/latex/ogl/sample.tex
deleted file mode 100644
index e65837ef35..0000000000
--- a/contrib/docs/latex/ogl/sample.tex
+++ /dev/null
@@ -1,84 +0,0 @@
-\chapter{OGLEdit: a sample OGL application}\label{ogledit}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-OGLEdit is a sample OGL application that allows the user to draw, edit,
-save and load a few shapes. It should clarify aspects of OGL usage, and
-can act as a template for similar applications. OGLEdit can be found in\rtfsp
-{\tt samples/ogledit} in the OGL distribution.
-
-$$\image{10cm;0cm}{ogledit.eps}$$\par
-
-The wxWindows document/view model has been used in OGL, to reduce the amount of
-housekeeping logic required to get it up and running. OGLEdit also provides
-a demonstration of the Undo/Redo capability supported by the document/view classes,
-and how a typical application might implement this feature.
-
-\section{OGLEdit files}
-
-OGLEdit comprises the following source files.
-
-\begin{itemize}\itemsep=0pt
-\item doc.h, doc.cpp: MyDiagram, DiagramDocument, DiagramCommand, MyEvtHandler
-classes related to diagram functionality and documents.
-\item view.h, view.cpp: MyCanvas, DiagramView classes related to visualisation of
-the diagram.
-\item ogledit.h, ogledit.cpp: MyFrame, MyApp classes related to the overall application.
-\item palette.h, palette.cpp: EditorToolPalette implementing the shape palette.
-\end{itemize}
-
-\section{How OGLEdit works}
-
-OGLEdit defines a DiagramDocument class, each of instance of which holds a MyDiagram
-member which itself contains the shapes.
-
-In order to implement specific mouse behaviour for shapes, a class MyEvtHandler is
-defined which is `plugged into' each shape when it is created, instead of overriding each shape class
-individually. This event handler class also holds a label string.
-
-The DiagramCommand class is the key to implementing Undo/Redo. Each instance of DiagramCommand
-stores enough information about an operation (create, delete, change colour etc.) to allow
-it to carry out (or undo) its command.
-
-Apart from menu commands, another way commands are initiated is by the user left-clicking on
-the canvas or right-dragging on a node. MyCanvas::OnLeftClick in view.cpp shows how
-the appropriate wxClassInfo is passed to a DiagramCommand, to allow DiagramCommand::Do
-to create a new shape given the wxClassInfo.
-
-The MyEvtHandler right-drag methods in doc.cpp implement drawing a line between
-two shapes, detecting where the right mouse button was released and looking for a second
-shape. Again, a new DiagramCommand instance is created and passed to the command
-processor to carry out the command.
-
-DiagramCommand::Do and DiagramCommand::Undo embody much of the
-interesting interaction with the OGL library. A complication of note
-when implementing undo is the problem of deleting a node shape which has
-one or more arcs attached to it. If you delete the node, the arc(s)
-should be deleted too. But multiple arc deletion represents more information
-that can be incorporated in the existing DiagramCommand scheme. OGLEdit
-copes with this by treating each arc deletion as a separate command, and
-sending Cut commands recursively, providing an undo path. Undoing such a
-Cut will only undo one command at a time - not a one to one
-correspondence with the original command - but it's a reasonable
-compromise and preserves Do/Undo while keeping our DiagramCommand class
-simple.
-
-\section{Possible enhancements}
-
-OGLEdit is very simplistic and does not employ the more advanced features
-of OGL, such as:
-
-\begin{itemize}\itemsep=0pt
-\item attachment points (arcs are drawn to particular points on a shape)
-\item metafile and bitmaps shapes
-\item divided rectangles
-\item composite shapes, and constraints
-\item creating labels in shape regions
-\item arc labels (OGL has support for three movable labels per arc)
-\item spline and multiple-segment line arcs
-\item adding annotations to node and arc shapes
-\item line-straightening (supported by OGL) and alignment (not supported directly by OGL)
-\end{itemize}
-
-These could be added to OGLEdit, at the risk of making it a less
-useful example for beginners.
diff --git a/contrib/docs/latex/ogl/tex2rtf.ini b/contrib/docs/latex/ogl/tex2rtf.ini
deleted file mode 100644
index c5e9c500c3..0000000000
--- a/contrib/docs/latex/ogl/tex2rtf.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-contentsDepth = 2
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-listItemIndent=40
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-winHelpContents = yes
-winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "OGL Manual"
-truncateFilenames = no
-combineSubSections = yes
-; A new option to allow references to wxWindows classes to be displayed as if
-; without the \helpref command.
-ignoreBadRefs = yes
-; Finally, a way to specify face names
-htmlFaceName = "Arial, Lucida, Helvetica"
-;;
-;; These two are for generating MS HTML Help project, contents and index files.
-;;
-htmlWorkshopFiles = true
-htmlIndex = true
-
-\overview [2] {\helpref{#1}{#2}}
-\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
-%\wxheading [1]{{\bf \fcol{blue}{#1}}}
-\wxheading [1]{{\bf #1}}
-\const [0] {{\bf const}}
-\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\windowstyle [1] {{\bf #1}\index{#1}}
-\bftt [1] {\bf{\tt{#1}}}
-\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
-%\pythonnote [1] {}
-\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1}
-
diff --git a/contrib/docs/latex/ogl/texhelp.sty b/contrib/docs/latex/ogl/texhelp.sty
deleted file mode 100644
index af91bd531d..0000000000
--- a/contrib/docs/latex/ogl/texhelp.sty
+++ /dev/null
@@ -1,298 +0,0 @@
-% LaTeX style file
-% Name:   texhelp.sty
-% Author: Julian Smart
-%
-% Purpose
-% -------
-% Style file to enable the simultaneous preparation of printed LaTeX and on-line
-% hypertext manuals.
-% Use in conjunction with Tex2RTF (see Tex2RTF documentation).
-%
-% Note that if a non-ASCII character starts a newline and there should be a space
-% between the last word on the previous line and the first word on this line,
-% you need to use \rtfsp to generate a space in Windows Help. \rtfsp is ignored
-% in all other formats.
-%
-% Julian Smart
-% Artificial Intelligence Applications Institute
-%
-%
-% ============== C++/CLIPS Documentation Facilities ==============
-%
-% Each class definition should be typeset with e.g.
-%
-% \section{\class{Name}: Parent}
-%
-% followed by a description of the class.
-% Each member should follow:
-%
-% \membersection{wxName::Member}
-%
-% with a description of what this member does.
-% Then, one (or more if overloaded) member (function) in detail:
-%
-% \func{return type}{name}{args}
-% or
-% \member{type}{name}
-%
-% where args is a list of \param{type}{name}, ...
-
-% Function, e.g.
-% e.g. to typeset
-%
-% void DoIt(char *string);
-%
-% write:
-%
-% \func{void}{DoIt}{\param{char *}{string}}
-%
-
-\newcommand{\func}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} {\bf #2}\index{#2}}(#3)}
-
-% For function/type definition where the name is a pointer,
-% e.g. to typeset
-%
-% typedef void (*wxFunction)(wxObject&)
-%
-% write:
-%
-% \pfunc{typedef void}{wxFunction}{param{wxObject&}}
-
-\newcommand{\pfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\it #1} ({\bf *#2})\index{#2}}(#3)}
-
-% Use an ordinary \section command for class name definitions.
-
-% This is used for a member, such as wxBitmap: GetDepth
-\newcommand{\membersection}[1]{\subsection*{#1}\index{#1}}
-
-% CLIPS function
-\newcommand{\clipsfunc}[3]{\hangafter=1\noindent\hangindent=10mm
-{{\bf #1} ({\bf #2}\index{#2}}#3)}
-
-\newcommand{\clipssection}[1]{\chapter{#1}}
-
-% This is used for a CLIPS function name
-\newcommand{\functionsection}[1]{\subsection*{#1}}
-
-% Member: a type and a name
-\newcommand{\member}[2]{{\bf #1 \it #2}}
-
-% C++ Parameter: a type and a name (no intervening space)
-\newcommand{\param}[2]{{\it #1}{\bf #2}}
-
-% CLIPS Parameter: a type and a name (one intervening space)
-\newcommand{\cparam}[2]{{\bf #1} {\it #2}}
-
-% Class: puts in index
-\newcommand{\class}[1]{#1\index{#1}}
-
-%\newcommand{\docparam}[2]{\parskip=0pt {\it #1}\par\parskip=10pt\begin{indented}{1cm}{#2}\end{indented}}
-
-% Void type
-\newcommand{\void}{{\it void}}
-
-% Typeset destructor
-\newcommand{\destruct}[1]{{$\sim$}#1}
-
-% Typeset insert/extract operators
-\newcommand{\cinsert}{$<<$}
-\newcommand{\cextract}{$>>$}
-
-
-% =================== Hypertext facilities ===================
-%
-% To insert hyperlinks (or references, in Latex), \label the sections
-% or membersections \label{ref-label} immediately after the section, on the same line,
-% and use \helpref{text-to-show}{ref-label} to make a reference.
-%
-
-% Type text with section reference
-\newcommand{\helpref}[2]{{\it #1} (p.\ \pageref{#2}) }
-
-% Type text with URL in verbatim mode
-\newcommand{\urlref}[2]{#1 (\verb$#2$)}
-
-% Don't typeset section number in LaTeX
-\newcommand{\helprefn}[2]{{\it #1}}
-
-% Like helpref, but popup text in WinHelp instead of hyperlinked
-\newcommand{\popref}[2]{{\it #1}}
-
-% Like footnote, but popup text.
-\newcommand{\footnotepopup}[2]{{\it #1}\footnote{#2}}
-
-% =================== On-line help specific macros ===================
-%
-
-% Global document font size/family, help only.
-\newcommand{\helpfontsize}[1]{}
-\newcommand{\helpfontfamily}[1]{}
-
-% Ignore in all on-line help
-\newcommand{\helpignore}[1]{#1}
-% Only print in all on-line help
-\newcommand{\helponly}[1]{}
-
-% Ignore in LaTeX
-\newcommand{\latexignore}[1]{}
-% Only print in LaTeX
-\newcommand{\latexonly}[1]{#1}
-
-% Ignore in linear RTF
-\newcommand{\rtfignore}[1]{#1}
-% Only print in linear RTF
-\newcommand{\rtfonly}[1]{}
-
-% Ignore in WinHelp RTF
-\newcommand{\winhelpignore}[1]{#1}
-% Only print in WinHelp RTF
-\newcommand{\winhelponly}[1]{}
-
-% Ignore in wxHelp
-\newcommand{\xlpignore}[1]{#1}
-% Only print in wxHelp
-\newcommand{\xlponly}[1]{}
-
-% Ignore in HTML
-\newcommand{\htmlignore}[1]{#1}
-% Only print in HTML
-\newcommand{\htmlonly}[1]{}
-
-% Input a file only for help system (binder thickness is not a limitation
-% in help systems!)
-\newcommand{\helpinput}[1]{}
-
-\newcommand{\rtfsp}{ } % Force a space in RTF, ignore in Latex
-
-% =================== Miscellaneous macros ===================
-%
-% Headings consistent with generated ones
-\newcommand{\myheading}[1]{\vspace*{25pt}
-\begin{flushleft}
-{\LARGE \bf #1}
-\end{flushleft}
-\vskip 20pt
-}
-
-% Heading with entry in contents page.
-\newcommand{\chapterheading}[1]{\myheading{#1}
-\addcontentsline{toc}{chapter}{#1}}
-
-\newcommand{\sectionheading}[1]{\myheading{#1}
-\addcontentsline{toc}{section}{#1}}
-
-% Glossary environment
-\newenvironment{helpglossary}{\newpage\chapterheading{Glossary}\begin{description}}{\end{description}}
-
-% Glossary entry
-\newcommand{\gloss}[1]{\item[#1]\index{#1}}
-
-% Image: EPS in Latex, BMP or MF (whatever's available) in RTF. Requires psbox.
-\newcommand{\image}[2]{\psboxto(#1){#2}}
-
-% Image, left aligned (HTML)
-\newcommand{\imager}[2]{\psboxto(#1){#2}}
-
-% Image, right aligned (HTML)
-\newcommand{\imagel}[2]{\psboxto(#1){#2}}
-
-% Imagemap: principally for HTML only. In Latex,
-% acts like \image.
-\newcommand{\imagemap}[3]{\psboxto(#1){#2}}
-
-% Headers and footers
-% \setheader{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setheader}[6]{
-\lhead[\fancyplain{}{#1}]{\fancyplain{}{#4}}
-\chead[\fancyplain{}{#2}]{\fancyplain{}{#5}}
-\rhead[\fancyplain{}{#3}]{\fancyplain{}{#6}}
-}
-
-% \setfooter{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
-% {OddPageLeft}{OddPageCentre}{OddPageRight}
-\newcommand{\setfooter}[6]{
-\lfoot[\fancyplain{#1}{#1}]{\fancyplain{#4}{#4}}
-\cfoot[\fancyplain{#2}{#2}]{\fancyplain{#5}{#5}}
-\rfoot[\fancyplain{#3}{#3}]{\fancyplain{#6}{#6}}
-}
-
-% Needed for telling RTF where margin paragraph should go
-% in mirrored margins mode.
-\newcommand{\marginpareven}[1]{\hspace*{0pt}\marginpar{#1}}
-\newcommand{\marginparodd}[1]{\hspace*{0pt}\marginpar{#1}}
-
-% Environment for two-column table popular in WinHelp and manuals.
-\newcommand{\twocolwidtha}[1]{\def\twocolwidthaval{#1}}
-\newcommand{\twocolwidthb}[1]{\def\twocolwidthbval{#1}}
-\newcommand{\twocolspacing}[1]{\def\twocolspacingval{#1}}
-
-\twocolwidtha{3cm}
-\twocolwidthb{8.5cm}
-\twocolspacing{2}
-
-\newcommand{\twocolitem}[2]{#1 & #2\\}
-\newcommand{\twocolitemruled}[2]{#1 & #2\\\hline}
-
-\newenvironment{twocollist}{\renewcommand{\arraystretch}{\twocolspacingval}\begin{tabular}{lp{\twocolwidthbval}}}%
-{\end{tabular}\renewcommand{\arraystretch}{1}}
-
-% Specifying table rows for RTF compatibility
-\newcommand{\row}[1]{#1\\}
-
-% Use for the last ruled row for correct RTF generation.
-\newcommand{\ruledrow}[1]{#1\\\hline}
-
-% Indentation environment. Arg1 is left margin size
-\newenvironment{indented}[1]{\begin{list}{}{\leftmargin=#1}\item[]}%
-{\end{list}}
-
-% Framed box of text, normal formatting.
-\newcommand{\normalbox}[1]{\fbox{\vbox{#1}}}
-% Double-framed box of text.
-\newcommand{\normalboxd}[1]{\fbox{\fbox{\vbox{#1}}}}
-
-% WITHDRAWN -- can't do in RTF, easily.
-% Framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredbox}[2]{\begin{center}\fbox{\parbox{#1}{\raggedright#2}}\end{center}}
-% Double-framed box of text, horizontally centred. Ragged right within box.
-% \newcommand{\centeredboxd}[2]{\begin{center}\fbox{\fbox{\parbox{#1}{\raggedright#2}}}\end{center}}
-
-% toocomplex environment: simply prints the argument in LaTeX,
-% comes out verbatim in all generated formats.
-\newenvironment{toocomplex}{}{}
-
-% Colour: dummy commands since LaTeX doesn't support colour.
-% \definecolour{name}{red}{blue}{green}
-% \fcol{name}{text} ; Foreground
-% \bcol{name}{text} ; Background
-\newcommand{\definecolour}[4]{}
-\newcommand{\definecolor}[4]{}
-\newcommand{\fcol}[2]{#2}
-\newcommand{\bcol}[2]{#2}
-\newcommand{\sethotspotcolour}[1]{}
-\newcommand{\sethotspotunderline}[1]{}
-\newcommand{\settransparency}[1]{}
-\newcommand{\backslashraw}[0]{}
-\newcommand{\lbraceraw}[0]{}
-\newcommand{\rbraceraw}[0]{}
-\newcommand{\registered}[0]{(r)}
-\newcommand{\background}[1]{}
-\newcommand{\textcolour}[1]{}
-\newcommand{\overview}[2]{See \helpref{#1}{#2}.}
-\newcommand{\docparam}[2]{{\it #1}\begin{list}{}{\leftmargin=1cm}\item[]
-#2%
-\end{list}}
-\newcommand{\wxheading}[1]{{\bf #1}}
-\newcommand{\const}[0]{{\bf const}}
-\newcommand{\constfunc}[3]{{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
-\newcommand{\windowstyle}[1]{{\bf #1}\index{#1}}
-
-\addtolength{\textwidth}{1in}
-\addtolength{\oddsidemargin}{-0.5in}
-\addtolength{\topmargin}{-0.5in}
-\addtolength{\textheight}{1in}
-\sloppy
-
diff --git a/contrib/docs/latex/ogl/topics.tex b/contrib/docs/latex/ogl/topics.tex
deleted file mode 100644
index ece8016fce..0000000000
--- a/contrib/docs/latex/ogl/topics.tex
+++ /dev/null
@@ -1,161 +0,0 @@
-\chapter{Topic overviews}
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-
-The following sections describe particular topics.
-
-\section{OGL overview}\label{ogloverview}
-
-\helpref{wxShapeCanvas}{wxshapecanvas}, derived from {\bf wxCanvas}, is the drawing area
-for a number of \helpref{wxShape}{wxshape} instances. Everything drawn on a
-wxShapeCanvas is derived from wxShape, which provides virtual
-member functions for redrawing, creating and destroying
-resize/selection `handles', movement and erasing behaviour, mouse
-click behaviour, calculating the bounding box of the shape, linking
-nodes with arcs, and so on.
-
-The way a client application copes with `damage' to the canvas is to
-erase (white out) anything should no longer be displayed, redraw the shape,
-and then redraw everything on the canvas to repair any damage. If quick edit
-mode is on for the canvas, the complete should be omitted by OGL and the
-application.
-
-Selection handles (called control points in the code) are implemented as
-wxRectangleShapes.
-
-Events are passed to shapes by the canvas in a high-level form, for example {\bf OnLeftClick},
-{\bf OnBeginDragLeft}, {\bf OnDragLeft}, {\bf OnEndDragLeft}. The canvas decides
-what is a click and what is a drag, whether it is on a shape or the canvas itself,
-and (by interrogating the shape) which attachment point the click is associated with.
-
-In order to provide event-handling flexibility, each shapes has an `event handler' associated with it,
-which by default is the shape itself (all shapes derive from wxShapeEvtHandler).
-An application can modify the event-handling behaviour simply by plugging a new
-event handler into the shape. This can avoid the need for multiple inheritance when
-new properties and behaviour are required for a number of different shape classes: instead
-of overriding each class, one new event handler class can be defined and used for all
-existing shape classes.
-
-A range of shapes have been predefined in the library, including rectangles, ellipses,
-polygons. A client application can derive from these shapes and/or derive entirely
-new shapes from wxShape.
-
-Instances of a class called \helpref{wxDiagram}{wxdiagram} organise collections of
-shapes, providing default file input and output behaviour.
-
-\section{wxDividedShape overview}\label{dividedshapeoverview}
-
-Classes: \helpref{wxDividedShape}{wxdividedshape}
-
-A wxDividedShape is a rectangle with a number of vertical divisions. Each
-division may have its text formatted with independent characteristics, and
-the size of each division relative to the whole image may be specified.
-
-Once a wxDividedShape has been created, the user may move the divisions with the
-mouse. By pressing Ctrl while right-clicking, the region attributes can be edited.
-
-Here are examples of creating wxDividedShape objects:
-
-{\small
-\begin{verbatim}
-  /*
-   * Divided rectangle with 3 regions
-   *
-   */
-
-  wxDividedShape *dividedRect = new wxDividedShape(50, 60);
-
-  wxShapeRegion *region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.25);
-  dividedRect->AddRegion(region);
-
-  region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.5);
-  dividedRect->AddRegion(region);
-
-  region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.25);
-  dividedRect->AddRegion(region);
-  
-  dividedRect->SetSize(50, 60); // Allow it to calculate region sizes
-  dividedRect->SetPen(wxBLACK_PEN);
-  dividedRect->SetBrush(wxWHITE_BRUSH);
-  dividedRect->Show(TRUE);
-  dividedRect->NameRegions();
-
-  /*
-   * Divided rectangle with 3 regions, rounded
-   *
-   */
-
-  wxDividedShape *dividedRect3 = new wxDividedShape(50, 60);
-  dividedRect3->SetCornerRadius(-0.4);
-
-  region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.25);
-  dividedRect3->AddRegion(region);
-
-  region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.5);
-  dividedRect3->AddRegion(region);
-
-  region = new wxShapeRegion;
-  region->SetProportions(0.0, 0.25);
-  dividedRect3->AddRegion(region);
-  
-  dividedRect3->SetSize(50, 60); // Allow it to calculate region sizes
-  dividedRect3->SetPen(wxBLACK_PEN);
-  dividedRect3->SetBrush(wxWHITE_BRUSH);
-  dividedRect3->Show(TRUE);
-  dividedRect3->NameRegions();
-\end{verbatim}
-}
-
-\section{wxCompositeShape overview}\label{compositeshapeoverview}
-
-Classes: \helpref{wxCompositeShape}{wxcompositeshape}, \helpref{wxOGLConstraint}{wxoglconstraint}
-
-The wxCompositeShape allows fairly complex shapes to be created, and maintains
-a set of constraints which specify the layout and proportions of child shapes.
-
-Add child shapes to a wxCompositeShape using \helpref{AddChild}{wxcompositeshapeaddchild}, and
-add constraints using \helpref{AddConstraint}{wxcompositeshapeaddconstraint}.
-
-After children and shapes have been added, call \helpref{Recompute}{wxcompositeshaperecompute} which
-will return TRUE is the constraints could be satisfied, FALSE otherwise. If
-constraints have been correctly and consistently specified, this call will succeed.
-
-If there is more than one child, constraints must be specified: OGL cannot calculate
-the size and position of children otherwise. Don't assume that children will simply
-move relative to the parent without the use of constraints.
-
-To specify a constraint, you need three things:
-
-\begin{enumerate}\itemsep=0pt
-\item a constraint type, such as gyCONSTRAINT\_CENTRED\_VERTICALLY;
-\item a reference shape, with respect to which other shapes are going to be positioned - the\rtfsp
-{\it constraining} shape;
-\item a list of one or more shapes to be constrained: the {\it constrained} shapes.
-\end{enumerate}
-
-The constraining shape can be either the parent of the constrained shapes, or a sibling. The
-constrained shapes must all be siblings of each other.
-
-For an exhaustive list and description of the available constraint types, see the \helpref{wxOGLConstraint constructor}{wxoglconstraintconstr}.
-Note that most constraints operate in one dimension only (vertically or horizontally), so you will
-usually need to specify constraints in pairs.
-
-You can set the spacing between constraining and constrained shapes by
-calling \helpref{wxOGLConstraint::SetSpacing}{wxoglconstraintsetspacing}.
-
-Finally, a wxCompositeShape can have {\it divisions}, which are special child shapes of class
-wxDivisionShape (not to be confused with wxDividedShape). The purpose of this is to allow
-the composite to be divided into user-adjustable regions (divisions) into which other shapes
-can be dropped dynamically, given suitable application code. Divisons allow the child
-shapes to have an identity of their own - they can be manipulated independently of their container -
-but to behave as if they are contained with the division, moving with the parent shape.
-Divisions boundaries can themselves be moved using the mouse.
-
-To create an initial division, call \helpref{wxCompositeShape::MakeContainer}{wxcompositeshapemakecontainer}.
-Make further divisions by calling \helpref{wxDivisionShape::Divide}{wxdivisionshapedivide}.
-
diff --git a/contrib/docs/latex/ogl/up.gif b/contrib/docs/latex/ogl/up.gif
deleted file mode 100644
index 870c89e80a..0000000000
Binary files a/contrib/docs/latex/ogl/up.gif and /dev/null differ
diff --git a/contrib/include/wx/applet/applet.h b/contrib/include/wx/applet/applet.h
deleted file mode 100644
index 42c8e18dde..0000000000
--- a/contrib/include/wx/applet/applet.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxApplet class
-*
-****************************************************************************/
-
-#ifndef __WX_APPLET_H
-#define __WX_APPLET_H
-
-#include "wx/panel.h"
-#include "wx/html/htmlwin.h"
-
-// Forward declaration
-class wxHtmlAppletWindow;
-class wxAppletEvent;
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the abstract base class for wxApplet objects.
-****************************************************************************/
-class wxApplet : public wxPanel {
-private:
-    DECLARE_ABSTRACT_CLASS(wxApplet);
-    DECLARE_EVENT_TABLE()
-
-protected:
-    //wxHtmlAppletWindow  *m_parent;
-
-            // Special handler for background erase messages
-            void OnEraseBackground(wxEraseEvent&);
-
-public:
-            // Constructor (called during dynamic creation)
-            wxApplet() { m_parent = NULL; };
-
-            // Psuedo virtual constructor
-    virtual bool Create(
-                wxHtmlAppletWindow *parent,
-                const wxHtmlTag& params,
-                const wxSize& size,
-                long style = wxTAB_TRAVERSAL | wxNO_BORDER);
-
-            // Virtual destructor
-    virtual ~wxApplet();
-
-            // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0;
-
-            // Handle HTML navigation forward command in applet
-    virtual void OnHistoryForward() = 0;
-
-            // Handle HTML navigation back command in applet
-    virtual void OnHistoryBack() = 0;
-
-            // Handle messages from the wxAppletManager and other applets
-    virtual void OnMessage(wxAppletEvent& msg) = 0;
-    };
-
-
-
-#endif // __WX_APPLET_H
-
diff --git a/contrib/include/wx/applet/echovar.h b/contrib/include/wx/applet/echovar.h
deleted file mode 100644
index 33b91e244e..0000000000
--- a/contrib/include/wx/applet/echovar.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for wxEchoVariable Class, Dynamically constructed
-* objects representing variables in SSI #echo directive
-*
-****************************************************************************/
-
-#ifndef __WX_ECHOVAR_H
-#define __WX_ECHOVAR_H
-
-#include "wx/object.h"
-#include "wx/hash.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-RETURNS:
-The string value of the variable
-
-PARAMETERS:
-parms   - Optional parameter string passed from parm= field in HTML
-
-REMARKS:
-To create new variables for the #echo HTML preprocessing directives
-you need to derive classes from wxEchoVariable and override the
-pure virtual GetValue function. However this should not be done directly
-but by using the BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros
-
-SEE ALSO:
-wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-****************************************************************************/
-typedef wxString (*wxEchoVariableGetValueFn)(const char *parms);
-
-/****************************************************************************
-REMARKS:
-wxEchoVariable class Definition
-****************************************************************************/
-class wxEchoVariable : public wxObject {
-protected:
-    const wxChar                *m_varName;
-    wxEchoVariableGetValueFn    m_getValueFn;
-    static wxEchoVariable       *sm_first;
-    wxEchoVariable              *m_next;
-    static wxHashTable          *sm_varTable;
-
-    static inline wxEchoVariable *wxEchoVariable::FindVariable(const wxChar *varName);
-
-public:
-    // Constructor to create the echo variable and register the class
-    wxEchoVariable(
-        const char *varName,
-        wxEchoVariableGetValueFn getValueFn);
-
-    // Member variable access functions
-    const wxChar *GetClassName() const          { return m_varName; }
-    wxEchoVariableGetValueFn GetValueFn() const { return m_getValueFn; }
-    static const wxEchoVariable* GetFirst()     { return sm_first; }
-    const wxEchoVariable* GetNext() const       { return m_next; }
-	
-    // Static functions to retrieve any variable avaliable
-    static wxString GetValue(const wxChar *varName,const wxChar *parms = NULL);
-    static bool Exists(const wxChar *varName);
-
-    // Initializes parent pointers and hash table for fast searching.
-    static void Initialize();
-
-    // Cleans up hash table used for fast searching.
-    static void CleanUp();
-    };
-	
-/****************************************************************************
-PARAMETERS:
-class   - Name of class for echo variable to find
-
-RETURNS:
-Pointer to the echo variable class
-
-REMARKS:
-Inline helper function to find the echo variable from it's class name.
-****************************************************************************/
-inline wxEchoVariable *wxEchoVariable::FindVariable(
-    const wxChar *varName)
-{
-    if (sm_varTable)
-        return (wxEchoVariable*)sm_varTable->Get(varName);
-    else {
-        wxEchoVariable *info = sm_first;
-        while (info) {
-            if (info->m_varName && wxStrcmp(info->m_varName, varName) == 0)
-                return info;
-            info = info->m_next;
-            }
-        return NULL;
-        }
-}
-
-/*--------------------------------- MACROS --------------------------------*/
-
-#define BEGIN_ECHO_VARIABLE(name)                                           \
-wxString wxEchoVariableFn##name(const char *parms);                         \
-wxEchoVariable wxEchoVariable##name(#name,wxEchoVariableFn##name);          \
-wxString wxEchoVariableFn##name(const char *parms) {                        \
-    wxString _BEV_parm = wxString(parms);
-
-#define END_ECHO_VARIABLE(returnval)                                        \
-    return returnval;                                                       \
-    }
-
-#define STRING_ECHO_VARIABLE(name, string)                                  \
-    BEGIN_ECHO_VARIABLE(##name##);                                          \
-    END_ECHO_VARIABLE(wxString(##string##))
-	
-#endif // __WX_ECHOVAR_H
-
diff --git a/contrib/include/wx/applet/ifelsevar.h b/contrib/include/wx/applet/ifelsevar.h
deleted file mode 100644
index b857b2bfc6..0000000000
--- a/contrib/include/wx/applet/ifelsevar.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for wxIfElseVariable Class, Dynamically constructed
-* objects representing variables in SSI #if, #else and #endif directives
-*
-****************************************************************************/
-
-#ifndef __WX_IFELSEVAR_H
-#define __WX_IFELSEVAR_H
-
-#include "wx/object.h"
-#include "wx/hash.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-RETURNS:
-The boolean value of the variable
-
-REMARKS:
-To create new variables for the #if, #else and #endif HTML preprocessing
-blocks you need to derive classes from wxIfElseVariable and override the
-pure virtual GetValue function. However this should not be done directly
-but by using the BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros
-
-SEE ALSO:
-wxIfElsePrep, BEGIN_IFELSE_VARIABLE, END_IFELSE_VARIABLE
-****************************************************************************/
-typedef bool (*wxIfElseVariableGetValueFn)();
-
-/****************************************************************************
-REMARKS:
-wxIfElseVariable class Definition
-****************************************************************************/
-class wxIfElseVariable : public wxObject {
-protected:
-    const wxChar                *m_varName;
-    wxIfElseVariableGetValueFn  m_getValueFn;
-    static wxIfElseVariable     *sm_first;
-    wxIfElseVariable            *m_next;
-    static wxHashTable          *sm_varTable;
-    bool                        forced;
-    bool                        forceVal;
-
-    static inline wxIfElseVariable *wxIfElseVariable::FindVariable(const wxChar *varName);
-
-public:
-    // Constructor to create the echo variable and register the class
-    wxIfElseVariable(
-        const char *varName,
-        wxIfElseVariableGetValueFn getValueFn);
-
-    // Member variable access functions
-    const wxChar *GetClassName() const            { return m_varName; }
-    wxIfElseVariableGetValueFn GetValueFn() const { return m_getValueFn; }
-    static const wxIfElseVariable* GetFirst()     { return sm_first; }
-    const wxIfElseVariable* GetNext() const       { return m_next; }
-	
-    // Static functions to retrieve any variable avaliable
-    static bool GetValue(const wxChar *varName);
-    static bool Exists(const wxChar *varName);
-    static void Force(const wxChar *varName, bool val);
-
-    // Initializes parent pointers and hash table for fast searching.
-    static void Initialize();
-
-    // Cleans up hash table used for fast searching.
-    static void CleanUp();
-    };
-	
-/****************************************************************************
-PARAMETERS:
-class   - Name of class for echo variable to find
-
-RETURNS:
-Pointer to the echo variable class
-
-REMARKS:
-Inline helper function to find the echo variable from it's class name.
-****************************************************************************/
-inline wxIfElseVariable *wxIfElseVariable::FindVariable(
-    const wxChar *varName)
-{
-    if (sm_varTable)
-        return (wxIfElseVariable*)sm_varTable->Get(varName);
-    else {
-        wxIfElseVariable *info = sm_first;
-        while (info) {
-            if (info->m_varName && wxStrcmp(info->m_varName, varName) == 0)
-                return info;
-            info = info->m_next;
-            }
-        return NULL;
-        }
-}
-
-/*--------------------------------- MACROS --------------------------------*/
-
-#define BEGIN_IFELSE_VARIABLE(name)                                         \
-bool wxIfElseVariableFn##name();                                            \
-wxIfElseVariable wxIfElseVariable##name(#name,wxIfElseVariableFn##name);    \
-bool wxIfElseVariableFn##name() {                                           \
-
-#define END_IFELSE_VARIABLE(returnval)                                      \
-    return returnval;                                                       \
-    }
-
-#define IFELSE_VARIABLE(name, state)                                        \
-    BEGIN_IFELSE_VARIABLE(##name##);                                        \
-    END_IFELSE_VARIABLE(bool (state))
-
-#endif // __WX_IFELSEVAR_H
-
diff --git a/contrib/include/wx/applet/loadpage.h b/contrib/include/wx/applet/loadpage.h
deleted file mode 100644
index 4c504a810d..0000000000
--- a/contrib/include/wx/applet/loadpage.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxLoadPage Event class
-*
-****************************************************************************/
-
-#ifndef __WX_LOAD_PAGE_H
-#define __WX_LOAD_PAGE_H
-
-#include "wx/html/htmlwin.h"
-
-// Forward declaration
-class wxHtmlAppletWindow;
-
-// If we are compiling this code into a library that links against
-// the DLL, we need to remove all the __declspec(dllimports) that
-// would declare our classes below incorrectly.
-
-#ifndef WXMAKINGDLL
-#undef  WXDLLEXPORT
-#define WXDLLEXPORT
-#endif
-// Declare our local load page event type
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_LOAD_PAGE,   wxEVT_USER_FIRST+1)
-    DECLARE_EVENT_TYPE(wxEVT_PAGE_LOADED, wxEVT_USER_FIRST+2)
-END_DECLARE_EVENT_TYPES()
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the class for load page events.
-****************************************************************************/
-class wxLoadPageEvent : public wxEvent {
-    DECLARE_DYNAMIC_CLASS(wxLoadPageEvent);
-
-protected:
-    wxString            m_hRef;
-    wxHtmlAppletWindow  *m_htmlWindow;
-
-public:
-            // Constructor
-            wxLoadPageEvent(const wxString &hRef = "",wxHtmlAppletWindow *htmlWindow = NULL);
-
-            // Destructor
-            virtual ~wxLoadPageEvent() {}
-
-            // Clone Virtual
-            virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); }
-
-            // Return the hmtl window for the load page operation
-            wxHtmlAppletWindow  *GetHtmlWindow() { return m_htmlWindow; };
-
-            // Get the hRef string for the load page operation
-            const wxString & GetHRef() { return m_hRef; };
-
-    };
-
-
-// Define the macro to create our event type
-typedef void (wxEvtHandler::*wxLoadPageEventFunction)(wxLoadPageEvent&);
-#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxLoadPageEventFunction, & fn ), (wxObject *) NULL ),
-
-/****************************************************************************
-REMARKS:
-Defines the class for pageloaded events.
-****************************************************************************/
-class wxPageLoadedEvent : public wxEvent {
-    DECLARE_DYNAMIC_CLASS(wxPageLoadedEvent);
-
-public:
-            // Constructor
-            wxPageLoadedEvent();
-
-            // Destructor
-            virtual ~wxPageLoadedEvent() {}
-
-            // Clone Virtual
-            virtual wxEvent *Clone() const {
-                return new wxPageLoadedEvent(); }
-
-    };
-
-// Define the macro to create our event type
-typedef void (wxEvtHandler::*wxPageLoadedEventFunction)(wxPageLoadedEvent&);
-#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxPageLoadedEventFunction, & fn ), (wxObject *) NULL ),
-
-
-#endif // __WX_LOAD_PAGE_H
diff --git a/contrib/include/wx/applet/plugin.h b/contrib/include/wx/applet/plugin.h
deleted file mode 100644
index dbbecb0e71..0000000000
--- a/contrib/include/wx/applet/plugin.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxQlet class
-*
-****************************************************************************/
-
-#ifndef __WX_PLUGIN_H
-#define __WX_PLUGIN_H
-
-// Forward declaration
-class wxHtmlAppletWindow;
-
-#include "wx/event.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines the abstract base class for wxPlugIn objects.
-****************************************************************************/
-class wxPlugIn : public wxEvtHandler {
-private:
-    wxHtmlAppletWindow *m_parent;
-    DECLARE_ABSTRACT_CLASS(wxPlugIn);
-
-public:
-            // Constructor (called during dynamic creation)
-            wxPlugIn() { m_parent = NULL; };
-
-            // Psuedo virtual constructor
-    virtual bool Create(wxHtmlAppletWindow *parent);
-
-            // Function that actually executes the main plugin code
-    virtual void Run(const wxString& cmdLine);
-
-            // Virtual destructor
-    virtual ~wxPlugIn();
-    };
-
-#endif // __WX_PLUGIN_H
-
diff --git a/contrib/include/wx/applet/prepecho.h b/contrib/include/wx/applet/prepecho.h
deleted file mode 100644
index e0eb9baa2c..0000000000
--- a/contrib/include/wx/applet/prepecho.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #echo directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPECHO_H
-#define __WX_PREPECHO_H
-
-#include "wx/object.h"
-#include "wx/html/htmlproc.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Echo Preprocessor class Definition
-****************************************************************************/
-class wxEchoPrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxEchoPrep);
-
-public:
-    wxEchoPrep() : wxHtmlProcessor() {}
-    virtual ~wxEchoPrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM-2; }
-	};
-	
-	
-#endif // __WX_PREPECHO_H
-
diff --git a/contrib/include/wx/applet/prepifelse.h b/contrib/include/wx/applet/prepifelse.h
deleted file mode 100644
index 14c54a1f59..0000000000
--- a/contrib/include/wx/applet/prepifelse.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #if SSI directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPIFELSE_H
-#define __WX_PREPIFELSE_H
-
-#include "wx/object.h"
-#include "wx/html/htmlproc.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-If Else Preprocessor class Definition
-****************************************************************************/
-class wxIfElsePrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxIfElsePrep);
-
-public:
-    wxIfElsePrep() : wxHtmlProcessor() {}
-    virtual ~wxIfElsePrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM-2; }
-	};
-	
-	
-#endif // __WX_PREPECHO_H
-
diff --git a/contrib/include/wx/applet/prepinclude.h b/contrib/include/wx/applet/prepinclude.h
deleted file mode 100644
index 2a0b816b51..0000000000
--- a/contrib/include/wx/applet/prepinclude.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Header file for the Preprocessor of the #include directive
-* in wxHTML.
-*
-****************************************************************************/
-
-#ifndef __WX_PREPINCLUDE_H
-#define __WX_PREPINCLUDE_H
-
-#include "wx/object.h"
-#include "wx/html/htmlproc.h"
-
-/*------------------------------- Prototypes ------------------------------*/
-
-class wxFileSystem;
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-wxIncludePrep class Definition
-****************************************************************************/
-class wxIncludePrep : public wxHtmlProcessor {
-private:
-    //DECLARE_DYNAMIC_CLASS(wxIncludePrep);
-    wxFileSystem *m_FS;
-public:
-    wxIncludePrep() : wxHtmlProcessor() {}
-    virtual ~wxIncludePrep() {}
-	
-	// Process input text and return processed result
-    wxString Process(const wxString& text) const;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    int GetPriority() const { return wxHTML_PRIORITY_SYSTEM; }
-	
-    void ChangeDirectory(wxFileSystem *);
-    };
-	
-	
-#endif // __WX_PREPINCLUDE_H
-
diff --git a/contrib/include/wx/applet/window.h b/contrib/include/wx/applet/window.h
deleted file mode 100644
index bea958fd6f..0000000000
--- a/contrib/include/wx/applet/window.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the wxHtmlAppletWindow class
-*
-****************************************************************************/
-
-#ifndef __WX_APPLET_WINDOW_H
-#define __WX_APPLET_WINDOW_H
-
-#include "wx/html/htmlwin.h"
-#include "wx/hash.h"
-#include "wx/process.h"
-#include "wx/toolbar.h"
-
-// Forward declare
-class wxApplet;
-class wxQlet;
-class wxLoadPageEvent;
-class wxPageLoadedEvent;
-class wxIncludePrep;
-class wxToolBarBase;
-
-// Declare a linked list of wxApplet pointers
-WX_DECLARE_LIST(wxApplet, wxAppletList);
-
-/*--------------------------- Class Definitions ---------------------------*/
-class wxAppletEvent {
-protected:
-    int               m_id;
-    wxObject         *m_eventObject;
-public:
-    wxAppletEvent(int id) { m_eventObject=NULL; m_id = id; }
-
-    int GetId() const { return m_id; }
-    void SetId(int Id) { m_id = Id; }
-
-    wxObject *GetEventObject() const { return m_eventObject; }
-    void SetEventObject(wxObject *obj) { m_eventObject = obj; }
-
-};
-
-
-/****************************************************************************
-REMARKS:
-Defines the class for virtual-link data types
-****************************************************************************/
-class VirtualData : public wxObject {
-private:
-    DECLARE_DYNAMIC_CLASS(VirtualData);
-	
-protected:
-    wxString m_name;
-    wxString m_group;
-    wxString m_href;
-    wxString m_plugIn;
-
-public:
-            // Ctors
-            VirtualData(
-                wxString& name,
-                wxString& group,
-                wxString& href,
-                wxString& plugin );
-
-            VirtualData();
-
-            // Gets
-            wxString GetName(){ return m_name;};
-            wxString GetGroup(){ return m_group;};
-            wxString GetHref(){ return m_href;};
-            wxString GetPlugIn(){ return m_plugIn;};
-
-            // Sets
-            void SetName (wxString& s){ m_name = s; };
-            void SetGroup(wxString& s){ m_group = s; };
-            void SetHref (wxString& s){ m_href = s; };
-            void SetPlugIn (wxString& s){ m_plugIn = s;};
-            void EmptyPlugIn () { m_plugIn = "";};
-    };
-
-/****************************************************************************
-REMARKS:
-Defines the class for wxAppletWindow. This class is derived from the
-wxHtmlWindow class and extends it with functionality to handle embedded
-wxApplet's on the HTML pages.
-****************************************************************************/
-class wxHtmlAppletWindow : public wxHtmlWindow {
-private:
-    DECLARE_CLASS(wxHtmlAppletWindow);
-    DECLARE_EVENT_TABLE();
-
-    bool                m_mutexLock;
-    wxIncludePrep       *incPreprocessor;  // deleted by list it is added too in constructor
-
-protected:
-	wxAppletList		m_AppletList;		
-	static wxHashTable	m_Cookies;
-    bool                m_NavBarEnabled;
-    wxToolBarBase       *m_NavBar;
-    int                 m_NavBackId;
-    int                 m_NavForwardId;
-    wxString            m_openedlast;
-    	
-            // Override this so we can do proper palette management!!
-    virtual void OnDraw(wxDC& dc);
-
-public:
-            // Constructor
-            wxHtmlAppletWindow(
-                wxWindow *parent,
-                wxWindowID id = -1,
-                wxToolBarBase *navBar = NULL,
-                int navBackId = -1,
-                int navForwardId = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHW_SCROLLBAR_AUTO,
-                const wxString& name = "htmlAppletWindow");
-
-            // Destructor
-            virtual ~wxHtmlAppletWindow();
-
-            // Create an instance of an applet based on it's class name
-            wxApplet *CreateApplet(
-                const wxString& classId,
-                const wxString& iName,
-                const wxHtmlTag &params,
-                const wxSize& size);
-
-            // Create an instance of an Qlet based on it's class name
-            bool CreatePlugIn(const wxString& classId,const wxString& cmdLine = "");
-
-            // Find an instance of an applet based on it's class name
-            wxApplet *FindApplet(const wxString& className);
-
-            // Remove an applet from the window. Called during applet destruction
-            bool RemoveApplet(const wxApplet *applet);
-
-            // Load a new URL page
-    virtual bool LoadPage(const wxString& location);
-
-            // Called when users clicked on hypertext link.
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-
-            // Handles forward navigation within the HTML stack
-            bool HistoryForward();
-
-            // Handles backwards navigation within the HTML stack
-            bool HistoryBack();
-
-            // Disables Nav bars
-            void DisableNavBar();
-
-            // Enables Nav bars
-            void EnableNavBar();
-
-            void SetNavBar(wxToolBarBase *navBar);
-
-            // Broadcast a message to all applets on the page
-            void SendAppletMessage(wxAppletEvent& msg);
-
-            // Register a cookie of data in the applet manager
-            static bool RegisterCookie(const wxString& name,wxObject *cookie);
-
-            // UnRegister a cookie of data in the applet manager
-            static bool UnRegisterCookie(const wxString& name);
-
-            // Find a cookie of data given it's public name
-            static wxObject *FindCookie(const wxString& name);
-			
-            // Event handlers to load a new page	
-			void OnLoadPage(wxLoadPageEvent &event);
-
-            // Event handlers to load a new page	
-    		void OnPageLoaded(wxPageLoadedEvent &event);
-
-            // LoadPage mutex locks
-            void Lock(){ m_mutexLock = true;};
-            void UnLock(){ m_mutexLock = false;};
-
-            // Returns TRUE if the mutex is locked, FALSE otherwise.
-            bool IsLocked(){ return m_mutexLock;};
-
-            // Tries to lock the mutex. If it can't, returns immediately with false.
-            bool TryLock();
-
-            wxString GetLastOpened() { return m_openedlast; }
-    };
-
-/****************************************************************************
-REMARKS:
-Defines the class for wxHtmlAppletCell
-***************************************************************************/
-class wxHtmlAppletCell : public wxHtmlCell
-{
-public:
-    wxHtmlAppletCell(wxWindow *wnd, int w = 0);
-    virtual ~wxHtmlAppletCell();
-    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-    virtual void DrawInvisible(wxDC& dc, int x, int y);
-    virtual void Layout(int w);
-
-protected:
-    wxWindow* m_Wnd;
-            // width float is used in adjustWidth (it is in percents)
-};
-
-#endif // __WX_APPLET_WINDOW_H
-
diff --git a/contrib/include/wx/deprecated/expr.h b/contrib/include/wx/deprecated/expr.h
deleted file mode 100644
index 92239242d1..0000000000
--- a/contrib/include/wx/deprecated/expr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* //////////////////////////////////////////////////////////////////////////
-// Name:        expr.h
-// Purpose:     C helper defines and functions for wxExpr class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-////////////////////////////////////////////////////////////////////////// */
-
-#ifndef _WX_EXPRH__
-#define _WX_EXPRH__
-
-#include <math.h>
-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-#  undef __BSEXCPT__
-#endif
-#include <stdlib.h>
-
-#ifdef ____HPUX__
-#define alloca malloc
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-char *proio_cons(char *, char *);
-char * wxmake_integer(char *);
-char * wxmake_word(char *);
-char * wxmake_string(char *);
-char * wxmake_real(char *, char *);
-char * wxmake_exp(char *, char *);
-char * wxmake_exp2(char *, char *, char*);
-void add_expr(char *);
-void process_command(char *);
-void syntax_error(char *);
-}
-#else
-#if defined(__BORLANDC__) || defined(__VISAGECPP__)
-char *proio_cons(char *, char *);
-char * wxmake_integer(char *);
-char * wxmake_word(char *);
-char * wxmake_string(char *);
-char * wxmake_real(char *, char *);
-char * wxmake_exp(char *, char *);
-char * wxmake_exp2(char *, char *, char*);
-void add_expr(char *);
-void process_command(char *);
-void syntax_error(char *);
-int  lex_input(void);
-#else
-char *proio_cons();
-char * wxmake_integer();
-char * wxmake_word();
-char * wxmake_string();
-char * wxmake_real();
-char * wxmake_exp();
-char * wxmake_exp2();
-
-void add_expr();
-void process_command();
-void syntax_error();
-#endif
-#endif
-
-#endif
-    /* _WX_EXPRH__ */
diff --git a/contrib/include/wx/deprecated/prop.h b/contrib/include/wx/deprecated/prop.h
deleted file mode 100644
index 10154f5493..0000000000
--- a/contrib/include/wx/deprecated/prop.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        prop.h
-// Purpose:     Property sheet classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROP_H_
-#define _WX_PROP_H_
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/hash.h"
-#include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/button.h"
-#include "wx/listbox.h"
-#include "wx/textctrl.h"
-#include "wx/gdicmn.h"
-#include "wx/layout.h"
-#include "wx/sizer.h"
-
-class wxWindow;
-class wxProperty;
-class wxPropertyValue;
-class wxPropertySheet;
-class wxPropertyView;
-class wxPropertyValidator;
-class wxPropertyValidatorRegistry;
-
-#define wxPROPERTY_VERSION 2.0
-
-// A storable sheet of values
-class WXDLLIMPEXP_DEPRECATED wxPropertySheet: public wxObject
-{
-public:
-    wxPropertySheet(const wxString& name = wxT(""));
-    ~wxPropertySheet();
-
-    // Set the name of the sheet
-    inline virtual void SetName(const wxString& name) { m_name=name; }
-    inline virtual wxString GetName() const { return m_name; }
-
-    // Does this sheet contain a property with this name
-    virtual bool HasProperty(const wxString& name) const;
-
-    // Set property name to value
-    virtual bool SetProperty(const wxString& name, const wxPropertyValue& value);
-
-    // Remove property from sheet by name, deleting it
-    virtual void RemoveProperty(const wxString& name);
-
-    // Get the name of the sheet
-    // Add a property
-    virtual void AddProperty(wxProperty *property);
-
-    // Get property by name
-    virtual wxProperty *GetProperty(const wxString& name) const;
-
-    // Clear all properties
-    virtual void Clear();
-
-    virtual void UpdateAllViews(wxPropertyView *thisView = NULL);
-    inline virtual wxList& GetProperties() const { return (wxList&) m_properties; }
-
-    // Sets/clears the modified flag for each property value
-    virtual void SetAllModified(bool flag = true);
-
-protected:
-    wxObject*         m_viewedObject;
-    wxList            m_properties;
-    wxPropertyView*   m_propertyView;
-    wxString          m_name;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertySheet)
-};
-
-
-// Base class for property sheet views. There are currently two directly derived
-// classes: wxPropertyListView, and wxPropertyFormView.
-class WXDLLIMPEXP_DEPRECATED wxPropertyView: public wxEvtHandler
-{
-public:
-    wxPropertyView(long flags = 0);
-    ~wxPropertyView();
-
-    // Associates and shows the view
-    virtual void ShowView(wxPropertySheet *WXUNUSED(propertySheet), wxWindow *WXUNUSED(panel)) {}
-
-    // Update this view of the viewed object, called e.g. by
-    // the object itself.
-    virtual bool OnUpdateView() {return false;};
-
-    // Override this to do something as soon as the property changed,
-    // if the view and validators support it.
-    virtual void OnPropertyChanged(wxProperty *WXUNUSED(property)) {}
-
-    virtual void AddRegistry(wxPropertyValidatorRegistry *registry);
-    inline virtual wxList& GetRegistryList() const
-        { return (wxList&) m_validatorRegistryList; }
-
-    virtual wxPropertyValidator *FindPropertyValidator(wxProperty *property);
-    inline virtual void SetPropertySheet(wxPropertySheet *sheet) { m_propertySheet = sheet; }
-    inline virtual wxPropertySheet *GetPropertySheet() const { return m_propertySheet; }
-
-    inline virtual bool OnClose() { return false; }
-    inline long GetFlags(void) { return m_buttonFlags; }
-
-protected:
-    long                  m_buttonFlags;
-    wxPropertySheet*      m_propertySheet;
-    wxProperty*           m_currentProperty;
-    wxList                m_validatorRegistryList;
-    wxPropertyValidator*  m_currentValidator;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertyView)
-};
-
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyValidator: public wxEvtHandler
-{
-public:
-    wxPropertyValidator(long flags = 0);
-    ~wxPropertyValidator();
-
-    inline long GetFlags() const { return m_validatorFlags; }
-    inline void SetValidatorProperty(wxProperty *prop) { m_validatorProperty = prop; }
-    inline wxProperty *GetValidatorProperty(void) const { return m_validatorProperty; }
-
-    virtual bool StringToFloat (wxChar *s, float *number);
-    virtual bool StringToDouble (wxChar *s, double *number);
-    virtual bool StringToInt (wxChar *s, int *number);
-    virtual bool StringToLong (wxChar *s, long *number);
-    virtual wxChar *FloatToString (float number);
-    virtual wxChar *DoubleToString (double number);
-    virtual wxChar *IntToString (int number);
-    virtual wxChar *LongToString (long number);
-
-protected:
-    long          m_validatorFlags;
-    wxProperty*   m_validatorProperty;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertyValidator)
-};
-
-
-// extern wxPropertyValidator *wxDefaultPropertyValidator;
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyValidatorRegistry: public wxHashTable
-{
-public:
-    wxPropertyValidatorRegistry();
-    ~wxPropertyValidatorRegistry();
-
-    virtual void RegisterValidator(const wxString& roleName, wxPropertyValidator *validator);
-    virtual wxPropertyValidator *GetValidator(const wxString& roleName);
-    void ClearRegistry();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertyValidatorRegistry)
-};
-
-/*
- * Property value class
- */
-
-typedef enum {
-    wxPropertyValueNull,
-    wxPropertyValueInteger,
-    wxPropertyValueReal,
-    wxPropertyValuebool,
-    wxPropertyValueString,
-    wxPropertyValueList,
-    wxPropertyValueIntegerPtr,
-    wxPropertyValueRealPtr,
-    wxPropertyValueboolPtr,
-    wxPropertyValueStringPtr
-} wxPropertyValueType;
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyValue: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxPropertyValue)
-
-  wxPropertyValue(void);                       // Unknown type
-  wxPropertyValue(const wxPropertyValue& copyFrom);  // Copy constructor
-  wxPropertyValue(const wxChar *val);
-  wxPropertyValue(const wxString& val);
-  wxPropertyValue(long val);
-  wxPropertyValue(bool val);
-  wxPropertyValue(float val);
-  wxPropertyValue(double the_real);
-  wxPropertyValue(wxList *val);
-  wxPropertyValue(wxStringList *val);
-  // Pointer versions
-  wxPropertyValue(wxChar **val);
-  wxPropertyValue(long *val);
-  wxPropertyValue(bool *val);
-  wxPropertyValue(float *val);
-
-  ~wxPropertyValue(void);
-
-  virtual inline wxPropertyValueType Type(void) const { return m_type; }
-  virtual inline void SetType(wxPropertyValueType typ) { m_type = typ; }
-  virtual long IntegerValue(void) const;
-  virtual float RealValue(void) const;
-  virtual bool BoolValue(void) const;
-  virtual wxChar *StringValue(void) const;
-  virtual long *IntegerValuePtr(void) const;
-  virtual float *RealValuePtr(void) const;
-  virtual bool *BoolValuePtr(void) const;
-  virtual wxChar **StringValuePtr(void) const;
-
-  // Get nth arg of clause (starting from 1)
-  virtual wxPropertyValue *Arg(wxPropertyValueType type, int arg) const;
-
-  // Return nth argument of a list expression (starting from zero)
-  virtual wxPropertyValue *Nth(int arg) const;
-  // Returns the number of elements in a list expression
-  virtual int Number(void) const;
-
-  virtual wxPropertyValue *NewCopy(void) const;
-  virtual void Copy(wxPropertyValue& copyFrom);
-
-  virtual void WritePropertyClause(wxString &stream);  // Write this expression as a top-level clause
-  virtual void WritePropertyType(wxString &stream);    // Write as any other subexpression
-
-  // Append an expression to a list
-  virtual void Append(wxPropertyValue *expr);
-  // Insert at beginning of list
-  virtual void Insert(wxPropertyValue *expr);
-
-  // Get first expr in list
-  virtual inline wxPropertyValue *GetFirst(void) const
-    { return ((m_type == wxPropertyValueList) ? m_value.first : (wxPropertyValue*)NULL); }
-
-  // Get next expr if this is a node in a list
-  virtual inline wxPropertyValue *GetNext(void) const
-    { return m_next; }
-
-  // Get last expr in list
-  virtual inline wxPropertyValue *GetLast(void) const
-    { return ((m_type == wxPropertyValueList) ? m_last : (wxPropertyValue*)NULL); }
-
-  // Delete this node from the list
-  virtual void Delete(wxPropertyValue *node);
-
-  // Clear list
-  virtual void ClearList(void);
-
-  virtual inline void SetClientData(wxObject *data) { m_clientData = data; }
-  virtual inline wxObject *GetClientData(void) { return m_clientData; }
-
-  virtual wxString GetStringRepresentation(void);
-
-  inline void SetModified(bool flag = true) { m_modifiedFlag = flag; }
-  inline bool GetModified(void) { return m_modifiedFlag; }
-
-  // Operators
-  void operator=(const wxPropertyValue& val);
-//  void operator=(const char *val);
-  void operator=(const wxString& val);
-  void operator=(const long val);
-  void operator=(const bool val);
-  void operator=(const float val);
-  void operator=(const wxChar **val);
-  void operator=(const long *val);
-  void operator=(const bool *val);
-  void operator=(const float *val);
-
- public:
-  wxObject*             m_clientData;
-  wxPropertyValueType   m_type;
-  bool                  m_modifiedFlag;
-
-  union {
-    long integer; // Also doubles as bool
-    wxChar *string;
-    float real;
-    long *integerPtr;
-    bool *boolPtr;
-    wxChar **stringPtr;
-    float *realPtr;
-    wxPropertyValue *first;  // If is a list expr, points to the first node
-    } m_value;
-
-  wxPropertyValue*      m_next;     // If this is a node in a list, points to the next node
-  wxPropertyValue*      m_last;     // If is a list expr, points to the last node
-
-};
-
-/*
- * Property class: contains a name and a value.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxProperty: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxProperty)
- protected:
-  bool                  m_enabled;
- public:
-  wxPropertyValue       m_value;
-  wxString              m_name;
-  wxString              m_propertyRole;
-  wxPropertyValidator*  m_propertyValidator;
-  wxWindow*             m_propertyWindow; // Usually a panel item, if anything
-
-  wxProperty(void);
-  wxProperty(wxProperty& copyFrom);
-  wxProperty(wxString name, wxString role, wxPropertyValidator *ed = NULL);
-  wxProperty(wxString name, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed = NULL);
-  ~wxProperty(void);
-
-  virtual wxPropertyValue& GetValue(void) const;
-  virtual wxPropertyValidator *GetValidator(void) const;
-  virtual wxString& GetName(void) const;
-  virtual wxString& GetRole(void) const;
-  virtual void SetValue(const wxPropertyValue& val);
-  virtual void SetValidator(wxPropertyValidator *v);
-  virtual void SetName(wxString& nm);
-  virtual void SetRole(wxString& role);
-  void operator=(const wxPropertyValue& val);
-  virtual inline void SetWindow(wxWindow *win) { m_propertyWindow = win; }
-  virtual inline wxWindow *GetWindow(void) const { return m_propertyWindow; }
-
-  inline void Enable(bool en) { m_enabled = en; }
-  inline bool IsEnabled(void) const { return m_enabled; }
-};
-
-#endif
-  // wxUSE_PROPSHEET
-
-#endif
-  // _WX_PROP_H_
diff --git a/contrib/include/wx/deprecated/propform.h b/contrib/include/wx/deprecated/propform.h
deleted file mode 100644
index 21a06030d7..0000000000
--- a/contrib/include/wx/deprecated/propform.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        propform.h
-// Purpose:     Property form classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPFORM_H_
-#define _WX_PROPFORM_H_
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#include "wx/deprecated/prop.h"
-#include "wx/panel.h"
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormView;
-
-////
-//// Property form classes: for using an existing dialog or panel
-////
-
-#define wxID_PROP_REVERT        3100
-#define wxID_PROP_UPDATE        3101
-
-// Mediates between a physical panel and the property sheet
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormView: public wxPropertyView
-{
- DECLARE_DYNAMIC_CLASS(wxPropertyFormView)
- public:
-  wxPropertyFormView(wxWindow *propPanel = NULL, long flags = 0);
-  ~wxPropertyFormView(void);
-
-  // Associates and shows the view
-  virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *panel);
-
-  // Update this view of the viewed object, called e.g. by
-  // the object itself.
-  virtual bool OnUpdateView(void);
-
-  // Transfer values from property sheet to dialog
-  virtual bool TransferToDialog(void);
-
-  // Transfer values from dialog to property sheet
-  virtual bool TransferToPropertySheet(void);
-
-  // Check that all the values are valid
-  virtual bool Check(void);
-
-  // Give each property in the sheet a panel item, by matching
-  // the name of the property to the name of the panel item.
-  // The user doesn't always want to call this; sometimes, it
-  // will have been done explicitly (e.g., no matching names).
-  virtual bool AssociateNames(void);
-
-  void OnOk(wxCommandEvent& event);
-  void OnCancel(wxCommandEvent& event);
-  void OnHelp(wxCommandEvent& event);
-  void OnUpdate(wxCommandEvent& event);
-  void OnRevert(wxCommandEvent& event);
-
-  virtual bool OnClose();
-  virtual void OnDoubleClick(wxControl *item);
-
-  // TODO: does OnCommand still get called...??? No,
-  // make ProcessEvent do it.
-  virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
-
-  // Extend event processing to process OnCommand
-  virtual bool ProcessEvent(wxEvent& event);
-
-  inline virtual void AssociatePanel(wxWindow *win) { m_propertyWindow = win; }
-  inline virtual wxWindow *GetPanel(void) const { return m_propertyWindow; }
-
-  inline virtual void SetManagedWindow(wxWindow *win) { m_managedWindow = win; }
-  inline virtual wxWindow *GetManagedWindow(void) const { return m_managedWindow; }
-
-  inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
-  inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
-  inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
-
-public:
-  static bool sm_dialogCancelled;
-
- protected:
-  bool              m_detailedEditing;     // E.g. using listbox for choices
-
-  wxWindow*         m_propertyWindow; // Panel that the controls will appear on
-  wxWindow*         m_managedWindow; // Frame or dialog
-
-  wxButton*         m_windowCloseButton; // Or OK
-  wxButton*         m_windowCancelButton;
-  wxButton*         m_windowHelpButton;
-
-DECLARE_EVENT_TABLE()
-
-};
-
-/*
- * The type of validator used for forms (wxForm style but using an existing panel
- * or dialog box).
- * Classes derived from this know how to map from whatever widget they
- * find themselves paired with, to the wxProperty and vice versa.
- * Should the widget pointer be stored with the validator, or
- * the wxProperty? If with the property, we don't have to supply
- * a validator for every property. Otherwise, there ALWAYS needs
- * to be a validator. On the other hand, not storing a wxWindow pointer
- * in the wxProperty is more elegant. Perhaps.
- * I think on balance, should put wxWindow pointer into wxProperty.
- * After all, wxProperty will often be used to represent the data
- * assocated with a window. It's that kinda thing.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
-{
-  DECLARE_DYNAMIC_CLASS(wxPropertyFormValidator)
- protected:
- public:
-  wxPropertyFormValidator(long flags = 0): wxPropertyValidator(flags) { }
-  ~wxPropertyFormValidator(void) {}
-
-   // Called to check value is OK (e.g. when OK is pressed)
-   // Return false if value didn't check out; signal to restore old value.
-   virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { return true; }
-
-   // Does the transferance from the property editing area to the property itself.
-   // Called by the view, e.g. when closing the window.
-   virtual bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
-
-   // Called by the view to transfer the property to the window.
-   virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
-
-  virtual void OnDoubleClick( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { }
-  virtual void OnSetFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { }
-  virtual void OnKillFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow) ) { }
-  virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
-     wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}
-private:
-};
-
-/*
- * Some default validators
- */
-
-class WXDLLIMPEXP_DEPRECATED wxRealFormValidator: public wxPropertyFormValidator
-{
-  DECLARE_DYNAMIC_CLASS(wxRealFormValidator)
- public:
-   // 0.0, 0.0 means no range
-   wxRealFormValidator(float min = 0.0, float max = 0.0, long flags = 0):wxPropertyFormValidator(flags)
-   {
-     m_realMin = min; m_realMax = max;
-   }
-   ~wxRealFormValidator(void) {}
-
-   bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   // Called by the view to transfer the property to the window.
-   bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-
- protected:
-  float         m_realMin;
-  float         m_realMax;
-};
-
-class WXDLLIMPEXP_DEPRECATED wxIntegerFormValidator: public wxPropertyFormValidator
-{
-  DECLARE_DYNAMIC_CLASS(wxIntegerFormValidator)
- public:
-   // 0, 0 means no range
-   wxIntegerFormValidator(long min = 0, long max = 0, long flags = 0):wxPropertyFormValidator(flags)
-   {
-     m_integerMin = min; m_integerMax = max;
-   }
-   ~wxIntegerFormValidator(void) {}
-
-   bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-
- protected:
-  long          m_integerMin;
-  long          m_integerMax;
-};
-
-class WXDLLIMPEXP_DEPRECATED wxBoolFormValidator: public wxPropertyFormValidator
-{
-  DECLARE_DYNAMIC_CLASS(wxBoolFormValidator)
- protected:
- public:
-   wxBoolFormValidator(long flags = 0):wxPropertyFormValidator(flags)
-   {
-   }
-   ~wxBoolFormValidator(void) {}
-
-   bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-};
-
-class WXDLLIMPEXP_DEPRECATED wxStringFormValidator: public wxPropertyFormValidator
-{
-  DECLARE_DYNAMIC_CLASS(wxStringFormValidator)
- public:
-   wxStringFormValidator(wxStringList *list = NULL, long flags = 0);
-
-   ~wxStringFormValidator(void)
-   {
-     if (m_strings)
-       delete m_strings;
-   }
-
-   bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-   bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
-
- protected:
-  wxStringList*     m_strings;
-};
-
-/*
- * A default dialog box class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormDialog: public wxDialog
-{
-public:
-    wxPropertyFormDialog(wxPropertyFormView *v = NULL,
-                         wxWindow *parent = NULL,
-                         const wxString& title = wxEmptyString,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = wxDEFAULT_DIALOG_STYLE,
-                         const wxString& name = _T("dialogBox"));
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnDefaultAction(wxControl *item);
-    void OnCommand(wxWindow& win, wxCommandEvent& event);
-
-    // Extend event processing to search the view's event table
-    virtual bool ProcessEvent(wxEvent& event);
-
-private:
-    wxPropertyFormView*       m_view;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyFormDialog)
-};
-
-/*
- * A default panel class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormPanel: public wxPanel
-{
-public:
-    wxPropertyFormPanel(wxPropertyFormView *v = NULL,
-                        wxWindow *parent = NULL,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = 0,
-                        const wxString& name = _T("panel"))
-        : wxPanel(parent, wxID_ANY, pos, size, style, name)
-        {
-            m_view = v;
-        }
-    void OnDefaultAction(wxControl *item);
-    void OnCommand(wxWindow& win, wxCommandEvent& event);
-
-    // Extend event processing to search the view's event table
-    virtual bool ProcessEvent(wxEvent& event);
-    void SetView(wxPropertyFormView* view) { m_view = view; }
-    wxPropertyFormView* GetView() const { return m_view; }
-
-private:
-    wxPropertyFormView*       m_view;
-
-    DECLARE_CLASS(wxPropertyFormPanel)
-};
-
-/*
- * A default frame class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyFormFrame: public wxFrame
-{
-public:
-    wxPropertyFormFrame(wxPropertyFormView *v = NULL,
-                        wxFrame *parent = NULL,
-                        const wxString& title = wxEmptyString,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = _T("frame"))
-        : wxFrame(parent, wxID_ANY, title, pos, size, style, name)
-        {
-            m_view = v;
-            m_propertyPanel = NULL;
-        }
-    void OnCloseWindow(wxCloseEvent& event);
-
-    // Must call this to create panel and associate view
-    virtual bool Initialize(void);
-    virtual wxPanel *OnCreatePanel(wxFrame *parent, wxPropertyFormView *v);
-    inline virtual wxPanel *GetPropertyPanel(void) const { return m_propertyPanel; }
-
-private:
-    wxPropertyFormView*       m_view;
-    wxPanel*                  m_propertyPanel;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyFormFrame)
-};
-
-#endif
-  // wxUSE_PROPSHEET
-
-#endif
-  // _WX_PROPFORM_H_
diff --git a/contrib/include/wx/deprecated/proplist.h b/contrib/include/wx/deprecated/proplist.h
deleted file mode 100644
index ba88f36728..0000000000
--- a/contrib/include/wx/deprecated/proplist.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        proplist.h
-// Purpose:     Property list classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
- /*
-
- TO DO:
-
- (1) Optional popup-help for each item, and an optional Help button
-   for dialog.
-
- (2) Align Ok, Cancel, Help buttons properly.
-
- (3) Consider retrieving the rectangle on the panel that can be
- drawn into (where the value listbox is) and giving an example
- of editing graphically. May be too fancy.
-
- (4) Deriveable types for wxPropertyValue => may need to reorganise
- wxPropertyValue to use inheritance rather than present all-types-in-one
- scheme.
-
- (5) Optional popup panel for value list, perhaps.
-
- (6) Floating point checking routine still crashes with Floating
- point error for zany input.
-
- (7) Property sheet with choice (or listbox) to select alternative
- sheets... multiple views per panel, only one active. For this
- we really need a wxChoice that can be dynamically set: XView
- may be a problem; Motif?
-
- (8) More example validators, e.g. colour selector.
-  */
-
-#ifndef _WX_PROPLIST_H_
-#define _WX_PROPLIST_H_
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#include "wx/deprecated/prop.h"
-#include "wx/panel.h"
-
-#define wxPROP_BUTTON_CLOSE       1
-#define wxPROP_BUTTON_OK          2
-#define wxPROP_BUTTON_CANCEL      4
-#define wxPROP_BUTTON_CHECK_CROSS 8
-#define wxPROP_BUTTON_HELP        16
-#define wxPROP_DYNAMIC_VALUE_FIELD 32
-#define wxPROP_PULLDOWN           64
-#define wxPROP_SHOWVALUES         128
-
-// Show OK/Cancel buttons on X-based systems where window management is
-// more awkward
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
-#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN
-#else
-#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
-#endif
-
-#define wxID_PROP_CROSS     3000
-#define wxID_PROP_CHECK     3001
-#define wxID_PROP_EDIT      3002
-#define wxID_PROP_TEXT      3003
-#define wxID_PROP_SELECT    3004
-#define wxID_PROP_VALUE_SELECT  3005
-
-// Mediates between a physical panel and the property sheet
-class WXDLLIMPEXP_DEPRECATED wxPropertyListView: public wxPropertyView
-{
-public:
-  wxPropertyListView(wxPanel *propPanel = NULL, long flags = wxPROP_BUTTON_DEFAULT);
-  ~wxPropertyListView(void);
-
-  // Associates and shows the view
-  virtual void ShowView(wxPropertySheet *propertySheet, wxPanel *panel);
-
-  // Update this view of the viewed object, called e.g. by
-  // the object itself.
-  virtual bool OnUpdateView(void);
-
-  wxString MakeNameValueString(wxString name, wxString value);
-
-  // Update a single line in the list of properties
-  virtual bool UpdatePropertyDisplayInList(wxProperty *property);
-
-  // Update the whole list
-  virtual bool UpdatePropertyList(bool clearEditArea = true);
-
-  // Find the wxListBox index corresponding to this property
-  virtual int FindListIndexForProperty(wxProperty *property);
-
-  // Select and show string representation in editor the given
-  // property. NULL resets to show no property.
-  virtual bool ShowProperty(wxProperty *property, bool select = true);
-  virtual bool EditProperty(wxProperty *property);
-
-  // Update the display from the property
-  virtual bool DisplayProperty(wxProperty *property);
-  // Update the property from the display
-  virtual bool RetrieveProperty(wxProperty *property);
-
-  // Find appropriate validator and load property into value controls
-  virtual bool BeginShowingProperty(wxProperty *property);
-  // Find appropriate validator and unload property from value controls
-  virtual bool EndShowingProperty(wxProperty *property);
-
-  // Begin detailed editing (e.g. using value listbox)
-  virtual void BeginDetailedEditing(void);
-
-  // End detailed editing (e.g. using value listbox)
-  virtual void EndDetailedEditing(void);
-
-  // Called by the property listbox
-  void OnPropertySelect(wxCommandEvent& event);
-
-  // Called by the value listbox
-  void OnValueListSelect(wxCommandEvent& event);
-
-  virtual bool CreateControls(void);
-  virtual void ShowTextControl(bool show);
-  virtual void ShowListBoxControl(bool show);
-  virtual void EnableCheck(bool show);
-  virtual void EnableCross(bool show);
-
-  void OnOk(wxCommandEvent& event);
-  void OnCancel(wxCommandEvent& event);
-  void OnHelp(wxCommandEvent& event);
-  void OnPropertyDoubleClick(wxCommandEvent& event);
-//  virtual void OnDoubleClick(void);
-
-  void OnCheck(wxCommandEvent& event);
-  void OnCross(wxCommandEvent& event);
-  void OnEdit(wxCommandEvent& event);
-  void OnText(wxCommandEvent& event);
-
-  inline virtual wxListBox *GetPropertyScrollingList() const { return m_propertyScrollingList; }
-  inline virtual wxListBox *GetValueList() const { return m_valueList; }
-  inline virtual wxTextCtrl *GetValueText() const { return m_valueText; }
-  inline virtual wxButton *GetConfirmButton() const { return m_confirmButton; }
-  inline virtual wxButton *GetCancelButton() const { return m_cancelButton; }
-  inline virtual wxButton *GetEditButton() const { return m_editButton; }
-  inline virtual bool GetDetailedEditing(void) const { return m_detailedEditing; }
-
-  inline virtual void AssociatePanel(wxPanel *win) { m_propertyWindow = win; }
-  inline virtual wxPanel *GetPanel(void) const { return m_propertyWindow; }
-
-  inline virtual void SetManagedWindow(wxWindow *win) { m_managedWindow = win; }
-  inline virtual wxWindow *GetManagedWindow(void) const { return m_managedWindow; }
-
-  inline virtual wxButton *GetWindowCloseButton() const { return m_windowCloseButton; }
-  inline virtual wxButton *GetWindowCancelButton() const { return m_windowCancelButton; }
-  inline virtual wxButton *GetHelpButton() const { return m_windowHelpButton; }
-
-  bool OnClose(void);
-
-public:
-  static bool       sm_dialogCancelled;
-
- protected:
-  wxListBox*        m_propertyScrollingList;
-  wxListBox*        m_valueList;     // Should really be a combobox, but we don't have one.
-  wxTextCtrl*       m_valueText;
-  wxButton*         m_confirmButton;  // A tick, as in VB
-  wxButton*         m_cancelButton;   // A cross, as in VB
-  wxButton*         m_editButton;     // Invokes the custom validator, if any
-  wxSizer*          m_middleSizer;
-
-  bool              m_detailedEditing;     // E.g. using listbox for choices
-
-  wxPanel*          m_propertyWindow; // Panel that the controls will appear on
-  wxWindow*         m_managedWindow; // Frame or dialog
-
-  wxButton*         m_windowCloseButton; // Or OK
-  wxButton*         m_windowCancelButton;
-  wxButton*         m_windowHelpButton;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertyListView)
-    DECLARE_EVENT_TABLE()
-
-    virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *window)
-        { wxPropertyView::ShowView(propertySheet, window); };
-};
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyTextEdit: public wxTextCtrl
-{
-public:
-    wxPropertyTextEdit(wxPropertyListView *v = NULL,
-                       wxWindow *parent = NULL,
-                       const wxWindowID id = wxID_ANY,
-                       const wxString& value = wxEmptyString,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = 0,
-                       const wxString& name = wxT("text"));
-
-    void OnSetFocus();
-    void OnKillFocus();
-
-    wxPropertyListView* m_view;
-
-private:
-    DECLARE_CLASS(wxPropertyTextEdit)
-};
-
-#define wxPROP_ALLOW_TEXT_EDITING           1
-
-/*
- * The type of validator used for property lists (Visual Basic style)
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyListValidator: public wxPropertyValidator
-{
-public:
-   wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags) { }
-   ~wxPropertyListValidator() {}
-
-   // Called when the property is selected or deselected: typically displays the value
-   // in the edit control (having chosen a suitable control to display: (non)editable text or listbox)
-   virtual bool OnSelect(bool select, wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   // Called when the property is double clicked. Extra functionality can be provided, such as
-   // cycling through possible values.
-   inline virtual bool OnDoubleClick(
-     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
-
-   // Called when the value listbox is selected. Default behaviour is to copy
-   // string to text control, and retrieve the value into the property.
-   virtual bool OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   // Called when the property value is edited using standard text control
-   inline virtual bool OnPrepareControls(
-     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
-
-   virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-      // Called when the property is edited in detail
-   inline virtual bool OnPrepareDetailControls(
-     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
-
-   // Called if focus lost, IF we're in a modeless property editing situation.
-   inline virtual bool OnClearDetailControls(
-     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
-
-   // Called when the edit (...) button is pressed. The default implementation
-   // calls view->BeginDetailedEditing; the filename validator (for example) overrides
-   // this function to show the file selector.
-   virtual void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   // Called when TICK is pressed or focus is lost.
-   // Return false if value didn't check out; signal to restore old value.
-   inline virtual bool OnCheckValue(
-     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
-     { return true; }
-
-   // Called when TICK is pressed or focus is lost or view wants to update
-   // the property list.
-   // Does the transferance from the property editing area to the property itself
-   virtual bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   virtual bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPropertyListValidator)
-};
-
-/*
- * A default dialog box class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyListDialog: public wxDialog
-{
-public:
-    wxPropertyListDialog(wxPropertyListView *v = NULL,
-                         wxWindow *parent = NULL,
-                         const wxString& title = wxEmptyString,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = wxDEFAULT_DIALOG_STYLE,
-                         const wxString& name = wxT("dialogBox"));
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnDefaultAction(wxControl *item);
-    void OnCancel(wxCommandEvent& event);
-
-    // Extend event processing to search the view's event table
-    virtual bool ProcessEvent(wxEvent& event);
-
-private:
-    wxPropertyListView*   m_view;
-
-private:
-    DECLARE_CLASS(wxPropertyListDialog)
-    DECLARE_EVENT_TABLE()
-};
-
-/*
- * A default panel class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyListPanel: public wxPanel
-{
-public:
-    wxPropertyListPanel(wxPropertyListView *v = NULL,
-                        wxWindow *parent = NULL,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = 0,
-                        const wxString& name = wxT("panel"))
-        : wxPanel(parent, wxID_ANY, pos, size, style, name)
-        {
-            m_view = v;
-        }
-    ~wxPropertyListPanel();
-    void OnDefaultAction(wxControl *item);
-
-    inline void SetView(wxPropertyListView* v) { m_view = v; }
-    inline wxPropertyListView* GetView() const { return m_view; }
-
-    // Extend event processing to search the view's event table
-    virtual bool ProcessEvent(wxEvent& event);
-
-    // Call Layout()
-    void OnSize(wxSizeEvent& event);
-
-private:
-    wxPropertyListView*   m_view;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyListPanel)
-};
-
-/*
- * A default frame class to use.
- */
-
-class WXDLLIMPEXP_DEPRECATED wxPropertyListFrame: public wxFrame
-{
-public:
-    wxPropertyListFrame(wxPropertyListView *v = NULL,
-                        wxFrame *parent = NULL,
-                        const wxString& title = wxEmptyString,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = _T("frame"))
-        : wxFrame(parent, wxID_ANY, title, pos, size, style, name)
-        {
-            m_view = v;
-            m_propertyPanel = NULL;
-        }
-    void OnCloseWindow(wxCloseEvent& event);
-
-    // Must call this to create panel and associate view
-    virtual bool Initialize(void);
-    virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
-    inline virtual wxPropertyListPanel *GetPropertyPanel(void) const { return m_propertyPanel; }
-    inline wxPropertyListView* GetView() const { return m_view; }
-
-private:
-    wxPropertyListView*       m_view;
-    wxPropertyListPanel*      m_propertyPanel;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyListFrame)
-};
-
-/*
- * Some default validators
- */
-
-class WXDLLIMPEXP_DEPRECATED wxRealListValidator: public wxPropertyListValidator
-{
-public:
-    // 0.0, 0.0 means no range
-    wxRealListValidator(float min = 0.0, float max = 0.0, long flags = wxPROP_ALLOW_TEXT_EDITING):wxPropertyListValidator(flags)
-        { m_realMin = min; m_realMax = max; }
-    ~wxRealListValidator() {}
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost.
-    // Return false if value didn't check out; signal to restore old value.
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost or view wants to update
-    // the property list.
-    // Does the transfer from the property editing area to the property itself
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-protected:
-    float     m_realMin;
-    float     m_realMax;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRealListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxIntegerListValidator: public wxPropertyListValidator
-{
-public:
-   // 0, 0 means no range
-   wxIntegerListValidator(long min = 0, long max = 0, long flags = wxPROP_ALLOW_TEXT_EDITING):wxPropertyListValidator(flags)
-   {
-     m_integerMin = min; m_integerMax = max;
-   }
-   ~wxIntegerListValidator() {}
-
-   bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   // Called when TICK is pressed or focus is lost.
-   // Return false if value didn't check out; signal to restore old value.
-   bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-   // Called when TICK is pressed or focus is lost or view wants to update
-   // the property list.
-   // Does the transfer from the property editing area to the property itself
-   bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-protected:
-    long m_integerMin;
-    long m_integerMax;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxIntegerListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxBoolListValidator: public wxPropertyListValidator
-{
-public:
-    wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags) {}
-    ~wxBoolListValidator() {}
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost.
-    // Return false if value didn't check out; signal to restore old value.
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost or view wants to update
-    // the property list.
-    // Does the transfer from the property editing area to the property itself
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when the property is double clicked. Extra functionality can be provided,
-    // cycling through possible values.
-    virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBoolListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator
-{
-public:
-   wxStringListValidator(wxStringList *list = NULL, long flags = 0);
-
-    ~wxStringListValidator()
-    {
-        if (m_strings)
-            delete m_strings;
-    }
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost.
-    // Return false if value didn't check out; signal to restore old value.
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost or view wants to update
-    // the property list.
-    // Does the transfer from the property editing area to the property itself
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when the property is double clicked. Extra functionality can be provided,
-    // cycling through possible values.
-    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-protected:
-    wxStringList*     m_strings;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStringListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxFilenameListValidator: public wxPropertyListValidator
-{
-public:
-    wxFilenameListValidator(wxString message = wxT("Select a file"), wxString wildcard = wxALL_FILES_PATTERN, long flags = 0);
-    ~wxFilenameListValidator();
-
-    // Called when TICK is pressed or focus is lost.
-    // Return false if value didn't check out; signal to restore old value.
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost or view wants to update
-    // the property list.
-    // Does the transferance from the property editing area to the property itself
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when the edit (...) button is pressed.
-    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-protected:
-    wxString  m_filenameWildCard;
-    wxString  m_filenameMessage;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxColourListValidator: public wxPropertyListValidator
-{
-public:
-    wxColourListValidator(long flags = 0);
-    ~wxColourListValidator();
-
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when the edit (...) button is pressed.
-    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxColourListValidator)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxListOfStringsListValidator: public wxPropertyListValidator
-{
-public:
-    wxListOfStringsListValidator(long flags = 0);
-    ~wxListOfStringsListValidator() {}
-
-    bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost.
-    // Return false if value didn't check out; signal to restore old value.
-    bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when TICK is pressed or focus is lost or view wants to update
-    // the property list.
-    // Does the transfer from the property editing area to the property itself
-    bool OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-    bool OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    // Called when the property is double clicked.
-    bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-    bool EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title = wxT("String List Editor"));
-
-    // Called when the edit (...) button is pressed.
-    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxListOfStringsListValidator)
-};
-
-#endif
-  // wxUSE_PROPSHEET
-
-#endif
-  // _WX_PROPLIST_H_
diff --git a/contrib/include/wx/deprecated/resource.h b/contrib/include/wx/deprecated/resource.h
deleted file mode 100644
index 45164fd83d..0000000000
--- a/contrib/include/wx/deprecated/resource.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        resource.h
-// Purpose:     Resource processing
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RESOURCEH__
-#define _WX_RESOURCEH__
-
-#include "wx/setup.h"
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_WX_RESOURCES
-
-#include "wx/bitmap.h"
-#include <stdio.h>
-
-// A few further types not in wx_types.h
-#define wxRESOURCE_TYPE_SEPARATOR   1000
-#define wxRESOURCE_TYPE_XBM_DATA    1001
-#define wxRESOURCE_TYPE_XPM_DATA    1002
-
-#define RESOURCE_PLATFORM_WINDOWS   1
-#define RESOURCE_PLATFORM_X         2
-#define RESOURCE_PLATFORM_MAC       3
-#define RESOURCE_PLATFORM_ANY       4
-
-// Extended styles: for resource usage only
-
-// Use dialog units instead of pixels
-#define wxRESOURCE_DIALOG_UNITS     0x0001
-// Use default system colour and font
-#define wxRESOURCE_USE_DEFAULTS     0x0002
-// Old-style vertical label
-#define wxRESOURCE_VERTICAL_LABEL   0x0004
-// Old-style horizontal label
-#define wxRESOURCE_HORIZONTAL_LABEL 0x0008
-
-// Macros to help use dialog units
-#define wxDLG_POINT(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxPoint(x, y)) : wxPoint(x, y))
-#define wxDLG_SIZE(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxSize(x, y)) : wxSize(x, y))
-
-#ifdef FindResource
-#undef FindResource
-#endif
-
-class WXDLLEXPORT wxInputStream;
-
-/*
- * Internal format for control/panel item
- */
-
-class WXDLLIMPEXP_DEPRECATED wxItemResource: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxItemResource)
-
- public:
-
-  wxItemResource();
-  ~wxItemResource();
-
-  inline void SetType(const wxString& type) { m_itemType = type; }
-  inline void SetStyle(long styl) { m_windowStyle = styl; }
-  inline void SetId(int id) { m_windowId = id; }
-  inline void SetBitmap(const wxBitmap& bm) { m_bitmap = bm; }
-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-  inline void SetFont(const wxFont& font) { m_windowFont = font; }
-  inline wxFont& GetFont() const { return (wxFont&) m_windowFont; }
-  inline void SetSize(int xx, int yy, int ww, int hh)
-  {  m_x = xx; m_y = yy; m_width = ww; m_height = hh; }
-  inline void SetTitle(const wxString& title) { m_title = title; }
-  inline void SetName(const wxString& name) { m_name = name; }
-  inline void SetValue1(long v) { m_value1 = v; }
-  inline void SetValue2(long v) { m_value2 = v; }
-  inline void SetValue3(long v) { m_value3 = v; }
-  inline void SetValue5(long v) { m_value5 = v; }
-  inline void SetValue4(const wxString& v) { m_value4 = v; }
-  inline void SetStringValues(const wxStringList& svalues) { m_stringValues = svalues; }
-
-  inline const wxString& GetType() const { return m_itemType; }
-  inline int GetX() const { return m_x; }
-  inline int GetY() const { return m_y; }
-  inline int GetWidth() const { return m_width; }
-  inline int GetHeight() const { return m_height; }
-
-  inline const wxString& GetTitle() const { return m_title; }
-  inline const wxString& GetName() const { return m_name; }
-  inline long GetStyle() const { return m_windowStyle; }
-  inline int GetId() const { return m_windowId; }
-
-  inline wxInt32 GetValue1() const { return m_value1; }
-  inline wxInt32 GetValue2() const { return m_value2; }
-  inline wxInt32 GetValue3() const { return m_value3; }
-  inline wxInt32 GetValue5() const { return m_value5; }
-  inline wxString GetValue4() const { return m_value4; }
-  inline wxList& GetChildren() const { return (wxList&) m_children; }
-  inline wxStringList& GetStringValues() const { return (wxStringList&) m_stringValues; }
-
-  inline void SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; }
-  inline void SetLabelColour(const wxColour& col) { m_labelColour = col; }
-  inline void SetButtonColour(const wxColour& col) { m_buttonColour = col; }
-
-  inline wxColour& GetBackgroundColour() const { return (wxColour&) m_backgroundColour; }
-  inline wxColour& GetLabelColour() const { return (wxColour&) m_labelColour; }
-  inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; }
-
-  inline void SetResourceStyle(long style) { m_exStyle = style; }
-  inline wxInt32 GetResourceStyle() const { return m_exStyle; }
-
- protected:
-  wxList        m_children;
-  wxString      m_itemType;
-  int           m_x, m_y, m_width, m_height;
-  wxString      m_title;
-  wxString      m_name;
-  long          m_windowStyle;
-  long          m_value1, m_value2, m_value3, m_value5;
-  wxString      m_value4;
-  int           m_windowId;
-  wxStringList  m_stringValues; // Optional string values
-  wxBitmap      m_bitmap;
-  wxColour      m_backgroundColour;
-  wxColour      m_labelColour;
-  wxColour      m_buttonColour;
-  wxFont        m_windowFont;
-  long          m_exStyle; // Extended, resource-specific styles
-};
-
-/*
- * Resource table (normally only one of these)
- */
-
-class WXDLLIMPEXP_DEPRECATED wxResourceTable: public wxHashTable
-{
-  DECLARE_DYNAMIC_CLASS(wxResourceTable)
-
-  protected:
-
-  public:
-    wxHashTable identifiers;
-
-    wxResourceTable();
-    ~wxResourceTable();
-
-    virtual wxItemResource *FindResource(const wxString& name) const;
-    virtual void AddResource(wxItemResource *item);
-    virtual bool DeleteResource(const wxString& name);
-
-    virtual bool ParseResourceFile(const wxString& filename);
-    virtual bool ParseResourceFile(wxInputStream *is);
-    virtual bool ParseResourceData(const wxString& data);
-    virtual bool SaveResource(const wxString& filename);
-
-    // Register XBM/XPM data
-    virtual bool RegisterResourceBitmapData(const wxString& name, char bits[], int width, int height);
-    virtual bool RegisterResourceBitmapData(const wxString& name, char **data);
-
-    virtual wxControl *CreateItem(wxWindow *panel, const wxItemResource* childResource, const wxItemResource* parentResource) const;
-
-    virtual void ClearTable();
-};
-
-WXDLLIMPEXP_DEPRECATED extern void wxInitializeResourceSystem();
-WXDLLIMPEXP_DEPRECATED extern void wxCleanUpResourceSystem();
-
-WXDLLIMPEXP_DATA_DEPRECATED(extern wxResourceTable*) wxDefaultResourceTable;
-WXDLLIMPEXP_DEPRECATED extern long wxParseWindowStyle(const wxString& style);
-
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxIcon;
-WXDLLIMPEXP_DEPRECATED extern wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern wxMenuBar* wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL);
-WXDLLIMPEXP_DEPRECATED extern wxMenu* wxResourceCreateMenu(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const char* resource, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseFile(const wxString& filename, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(char* s, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(const wxString& s, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern void wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL);
-// Register XBM/XPM data
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table = (wxResourceTable *) NULL);
-#define wxResourceRegisterIconData wxResourceRegisterBitmapData
-
-/*
- * Resource identifer code: #define storage
- */
-
-WXDLLIMPEXP_DEPRECATED extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
-WXDLLIMPEXP_DEPRECATED extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
-
-// Used to be wxWindowBase::LoadFromResource
-WXDLLIMPEXP_DEPRECATED bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
-
-// Used to be wxWindowBase::CreateItem
-WXDLLIMPEXP_DEPRECATED wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
-
-#if defined(__WXPM__)
-#include "wx/os2/wxrsc.h"
-#endif
-#endif
-#endif
-    // _WX_RESOURCEH__
diff --git a/contrib/include/wx/deprecated/setup.h b/contrib/include/wx/deprecated/setup.h
deleted file mode 100644
index dfac4804c6..0000000000
--- a/contrib/include/wx/deprecated/setup.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/deprecated/setup.h
-// Purpose:     Configuration for deprecated features of the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     2003-03-30
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DEPRECATED_SETUP_H_
-#define _WX_DEPRECATED_SETUP_H_
-
-// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
-// the same as wxDateTime!). These classes are obsolete and shouldn't be used
-// in new code
-//
-// Default is 0
-//
-// Recommended setting: 0 unless you have legacy code which uses these classes
-#ifdef wxUSE_TIMEDATE
-#undef wxUSE_TIMEDATE
-#endif
-
-#define wxUSE_TIMEDATE 0
-
-// wxProperty[Value/Form/List] classes, used by Dialog Editor
-#ifdef wxUSE_PROPSHEET
-#undef wxUSE_PROPSHEET
-#endif
-#define wxUSE_PROPSHEET    1
-
-// wxTreeLayout class
-#ifdef wxUSE_TREELAYOUT
-#undef wxUSE_TREELAYOUT
-#endif
-#define wxUSE_TREELAYOUT     1
-
-// use wxExpr (a.k.a. PrologIO)
-#ifdef wxUSE_PROLOGIO
-#undef wxUSE_PROLOGIO
-#endif
-#define wxUSE_PROLOGIO          1
-
-// Use .wxr resource mechanism (requires PrologIO library)
-#ifdef wxUSE_WX_RESOURCES
-#undef wxUSE_WX_RESOURCES
-#endif
-#define wxUSE_WX_RESOURCES      1
-
-// Use simple, generic toolbar
-#ifdef wxUSE_TOOLBAR_SIMPLE
-#undef wxUSE_TOOLBAR_SIMPLE
-#endif
-#define wxUSE_TOOLBAR_SIMPLE 1
-
-
-#ifdef WXMAKINGDLL_DEPRECATED
-    #define WXDLLIMPEXP_DEPRECATED WXEXPORT
-    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_DEPRECATED WXIMPORT
-    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXIMPORT type
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_DEPRECATED
-    #define WXDLLIMPEXP_DATA_DEPRECATED(type) type
-#endif
-
-#endif
-    // _WX_DEPRECATED_SETUP_H_
diff --git a/contrib/include/wx/deprecated/tbarsmpl.h b/contrib/include/wx/deprecated/tbarsmpl.h
deleted file mode 100644
index 76acc6ba65..0000000000
--- a/contrib/include/wx/deprecated/tbarsmpl.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/deprecated/tbarsmpl.h
-// Purpose:     wxToolBarSimple class
-// Author:      Julian Smart
-// Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TBARSMPLH__
-#define _WX_TBARSMPLH__
-
-#include "wx/tbarbase.h"
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
-
-class WXDLLEXPORT wxMemoryDC;
-
-// ----------------------------------------------------------------------------
-// wxToolBarSimple is a generic toolbar implementation in pure wxWidgets
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase
-{
-public:
-    // ctors and dtor
-    wxToolBarSimple() { Init(); }
-
-    wxToolBarSimple(wxWindow *parent,
-                    wxWindowID winid,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                    const wxString& name = wxToolBarNameStr)
-    {
-        Init();
-
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID winid,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr);
-
-    virtual ~wxToolBarSimple();
-
-    // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-    virtual bool Realize();
-
-    virtual void SetRows(int nRows);
-
-    // implementation from now on
-    // --------------------------
-
-    // SCROLLING: this has to be copied from wxScrolledWindow since
-    // wxToolBarBase inherits from wxControl. This could have been put into
-    // wxToolBarSimple, but we might want any derived toolbar class to be
-    // scrollable.
-
-    // Number of pixels per user unit (0 or -1 for no scrollbar)
-    // Length of virtual canvas in user units
-    virtual void SetScrollbars(int horizontal, int vertical,
-            int x_length, int y_length,
-            int x_pos = 0, int y_pos = 0);
-
-    // Physically scroll the window
-    virtual void Scroll(int x_pos, int y_pos);
-    virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
-    virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
-    virtual void AdjustScrollbars();
-
-    // Prepare the DC by translating it according to the current scroll position
-    virtual void PrepareDC(wxDC& dc);
-
-    int GetScrollPageSize(int orient) const ;
-    void SetScrollPageSize(int orient, int pageSize);
-
-    // Get the view start
-    virtual void ViewStart(int *x, int *y) const;
-
-    // Actual size in pixels when scrolling is taken into account
-    virtual void GetVirtualSize(int *x, int *y) const;
-
-    int CalcScrollInc(wxScrollEvent& event);
-
-    // event handlers
-    void OnPaint(wxPaintEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnMouseEvent(wxMouseEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-    void OnScroll(wxScrollEvent& event);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // implement base class pure virtuals
-    virtual wxToolBarToolBase *DoAddTool
-                               (
-                                   int toolid,
-                                   const wxString& label,
-                                   const wxBitmap& bitmap,
-                                   const wxBitmap& bmpDisabled,
-                                   wxItemKind kind,
-                                   const wxString& shortHelp = wxEmptyString,
-                                   const wxString& longHelp = wxEmptyString,
-                                   wxObject *clientData = NULL,
-                                   wxCoord xPos = wxDefaultCoord,
-                                   wxCoord yPos = wxDefaultCoord
-                               );
-
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    virtual wxToolBarToolBase *CreateTool(int winid,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
-
-    // helpers
-    void DrawTool(wxToolBarToolBase *tool);
-    virtual void DrawTool(wxDC& dc, wxToolBarToolBase *tool);
-    virtual void SpringUpButton(int index);
-
-    int  m_currentRowsOrColumns;
-
-    int  m_pressedTool, m_currentTool;
-
-    wxCoord m_lastX, m_lastY;
-    wxCoord m_maxWidth, m_maxHeight;
-    wxCoord m_xPos, m_yPos;
-
-    // scrolling data
-    int                   m_xScrollPixelsPerLine;
-    int                   m_yScrollPixelsPerLine;
-    bool                  m_xScrollingEnabled;
-    bool                  m_yScrollingEnabled;
-    int                   m_xScrollPosition;
-    int                   m_yScrollPosition;
-    int                   m_xScrollLines;
-    int                   m_yScrollLines;
-    int                   m_xScrollLinesPerPage;
-    int                   m_yScrollLinesPerPage;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarSimple)
-};
-
-#endif // wxUSE_TOOLBAR_SIMPLE
-
-#endif
-    // _WX_TBARSMPLH__
-
diff --git a/contrib/include/wx/deprecated/treelay.h b/contrib/include/wx/deprecated/treelay.h
deleted file mode 100644
index 2b17b7de07..0000000000
--- a/contrib/include/wx/deprecated/treelay.h
+++ /dev/null
@@ -1,151 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        treelay.h
-// Purpose:     wxTreeLayout class
-// Author:      Julian Smart
-// Modified by:
-// Created:     7/4/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TREELAY_H_
-#define _WX_TREELAY_H_
-
-#ifndef WX_PRECOMP
-#include "wx/object.h"
-class wxList;
-class wxDC;
-class wxMouseEvent;
-#endif
-
-#include "wx/deprecated/setup.h"
-#include "wx/string.h"
-
-#if wxUSE_TREELAYOUT
-
-class WXDLLIMPEXP_DEPRECATED wxTreeLayout: public wxObject
-{
-public:
-    wxTreeLayout();
-    virtual ~wxTreeLayout() { }
-
-    // Redefine these
-    virtual void GetChildren(long id, wxList& list) = 0;
-    virtual long GetNextNode(long id) = 0;
-    virtual long GetNodeParent(long id) = 0;
-    virtual long GetNodeX(long id) = 0;
-    virtual long GetNodeY(long id) = 0;
-    virtual void SetNodeX(long id, long x) = 0;
-    virtual void SetNodeY(long id, long y) = 0;
-    virtual void ActivateNode(long id, bool active) = 0;
-    virtual bool NodeActive(long id) = 0;
-
-    // Optional redefinition
-    void Initialize(void);
-    inline virtual void SetNodeName(long WXUNUSED(id), const wxString& WXUNUSED(name)) {}
-    inline virtual wxString GetNodeName(long WXUNUSED(id)) { return wxString(wxT("")); }
-    virtual void GetNodeSize(long id, long *x, long *y, wxDC& dc);
-    virtual void Draw(wxDC& dc);
-    virtual void DrawNodes(wxDC& dc);
-    virtual void DrawBranches(wxDC& dc);
-    virtual void DrawNode(long id, wxDC& dc);
-    virtual void DrawBranch(long from, long to, wxDC& dc);
-
-    // Don't redefine
-    virtual void DoLayout(wxDC& dc, long topNode = -1);
-
-    // Accessors -- don't redefine
-    inline void SetTopNode(long id) { m_parentNode = id; }
-    inline long GetTopNode(void) const { return m_parentNode; }
-    inline void SetSpacing(long x, long y) { m_xSpacing = x; m_ySpacing = y; }
-    inline long GetXSpacing(void) const { return m_xSpacing; }
-    inline long GetYSpacing(void) const { return m_ySpacing; }
-    inline void SetMargins(long x, long y) { m_leftMargin = x; m_topMargin = y; }
-    inline long GetTopMargin(void) const { return m_topMargin; }
-    inline long GetLeftMargin(void) const { return m_leftMargin; }
-
-    inline bool GetOrientation(void) const { return m_orientation; }
-    inline void SetOrientation(bool orient) { m_orientation = orient; }
-
-private:
-    void CalcLayout(long node_id, int level, wxDC& dc);
-
-protected:
-    long          m_parentNode;
-    long          m_lastY;
-    long          m_lastX;
-    long          m_xSpacing;
-    long          m_ySpacing;
-    long          m_topMargin;
-    long          m_leftMargin;
-    bool          m_orientation; // true for top-to-bottom, false for left-to-right
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxTreeLayout)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxStoredNode
-{
-public:
-    wxString      m_name;
-    long          m_x, m_y;
-    long          m_parentId;
-    bool          m_active;
-    long          m_clientData;
-};
-
-/*
- * A version of wxTreeLayout with storage for nodes
- */
-
-class WXDLLIMPEXP_DEPRECATED wxTreeLayoutStored: public wxTreeLayout
-{
-public:
-    wxTreeLayoutStored(int noNodes = 200);
-    virtual ~wxTreeLayoutStored(void);
-    void Initialize(int n);
-
-    wxString HitTest(wxMouseEvent& event, wxDC& dc);
-    wxStoredNode* GetNode(long id) const;
-    inline int GetNumNodes() const { return m_maxNodes; };
-    inline int GetNodeCount() const { return m_num; };
-
-    virtual void GetChildren(long id, wxList& list);
-    virtual long GetNextNode(long id);
-    virtual long GetNodeParent(long id);
-    virtual long GetNodeX(long id);
-    virtual long GetNodeY(long id);
-    virtual void SetNodeX(long id, long x);
-    virtual void SetNodeY(long id, long y);
-    virtual void SetNodeName(long id, const wxString& name);
-    virtual wxString GetNodeName(long id);
-    virtual void ActivateNode(long id, bool active);
-    virtual bool NodeActive(long id);
-    virtual void SetClientData(long id, long clientData);
-    virtual long GetClientData(long id) const;
-
-    virtual long AddChild(const wxString& name, const wxString& parent = wxT(""));
-    virtual long AddChild(const wxString& name, long parent);
-    virtual long NameToId(const wxString& name);
-
-    // Data members
-private:
-    wxStoredNode*     m_nodes;
-    int               m_num;
-    int               m_maxNodes;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
-    DECLARE_NO_COPY_CLASS(wxTreeLayoutStored)
-};
-
-// For backward compatibility
-#define wxStoredTree wxTreeLayoutStored
-
-#endif
-    // wxUSE_TREELAYOUT
-
-#endif
- // _WX_TREELAY_H_
-
diff --git a/contrib/include/wx/deprecated/wxexpr.h b/contrib/include/wx/deprecated/wxexpr.h
deleted file mode 100644
index 1bba40eec9..0000000000
--- a/contrib/include/wx/deprecated/wxexpr.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wxexpr.h
-// Purpose:     Prolog-like file I/O, used by resource system.
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WXEXPRH__
-#define _WX_WXEXPRH__
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROLOGIO
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#include "wx/list.h"
-#include "wx/hash.h"
-
-#include "wx/deprecated/expr.h"
-
-#include <stdio.h>
-
-// Compatibility
-#define PrologExpr wxExpr
-#define PrologDatabase wxExprDatabase
-#define proioErrorHandler wxExprErrorHandler
-#define PROIO_ERROR_GENERAL 1
-#define PROIO_ERROR_SYNTAX  2
-#define PrologNull wxExprNull
-#define PrologInteger wxExprInteger
-#define PrologReal wxExprReal
-#define PrologWord wxExprWord
-#define PrologString wxExprString
-#define PrologList wxExprList
-#define PrologType wxExprType
-
-// Error types
-#define WXEXPR_ERROR_GENERAL 1
-#define WXEXPR_ERROR_SYNTAX  2
-
-// Error handler function definition. If app returns true,
-// carry on processing.
-typedef bool (*wxExprErrorHandler) (int errorType, char *msg);
-
-WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprErrorHandler) currentwxExprErrorHandler;
-
-
-typedef enum {
-    wxExprNull,
-    wxExprInteger,
-    wxExprReal,
-    wxExprWord,
-    wxExprString,
-    wxExprList
-} wxExprType;
-
-class WXDLLIMPEXP_DEPRECATED wxExprDatabase;
-
-class WXDLLIMPEXP_DEPRECATED wxExpr
-{
- public:
-  wxObject *client_data;
-  wxExprType type;
-  union {
-    long integer;
-    wxChar *word;
-    wxChar *string;
-    double real;
-    wxExpr *first;  // If is a list expr, points to the first node
-    } value;
-
-  wxExpr *next;     // If this is a node in a list, points to the next node
-  wxExpr *last;     // If is a list expr, points to the last node
-
-  wxExpr(wxExprType the_type, wxChar *word_or_string, bool allocate);
-  wxExpr(const wxString& functor);      // Assume this is a new clause - pass functor
-  wxExpr(wxExprType the_type, const wxString& word_or_string = wxT(""));
-  wxExpr(long the_integer);
-  wxExpr(double the_real);
-  wxExpr(wxList *the_list);
-  ~wxExpr(void);
-
-  inline wxExprType Type(void) const { return type; }
-  inline long IntegerValue(void) const
-  {
-    if (type == wxExprInteger)
-      return value.integer;
-    else if (type == wxExprReal)
-      return (long)value.real;
-    else return 0;
-  }
-
-  inline double RealValue(void) const {
-    if (type == wxExprReal)
-      return value.real;
-    else if (type == wxExprInteger)
-      return (double)value.integer;
-    else return (double)0.0;
-  }
-
-  inline wxString WordValue(void) const {
-    if (type == wxExprWord)
-      return value.word;
-    else if (type == wxExprString)
-      return wxString(value.string);
-    else return wxString(wxT(""));
-  }
-
-  inline wxString StringValue(void) const {
-    if (type == wxExprString)
-      return wxString(value.string);
-    else if (type == wxExprWord)
-      return wxString(value.word);
-    else return wxString(wxT(""));
-  }
-
-  // Get nth arg of clause (starting from 1)
-  wxExpr *Arg(wxExprType type, int arg) const;
-
-  // Return nth argument of a list expression (starting from zero)
-  wxExpr *Nth(int arg) const;
-
-  // Returns the number of elements in a list expression
-  int Number(void) const;
-
-  // Make a clone
-  wxExpr *Copy(void) const;
-
-  wxExpr *GetAttributeValueNode(const wxString& word) const;  // Use only for a clause or list
-  wxExpr *AttributeValue(const wxString& word) const;  // Use only for a clause
-  wxString Functor(void) const;                     // Only for a clause
-  bool IsFunctor(const wxString& s) const;                     // Only for a clause
-  void WriteClause(FILE* stream);  // Write this expression as a top-level clause
-  void WriteExpr(FILE* stream);    // Write as any other subexpression
-
-  // Append an expression to a list
-  void Append(wxExpr *expr);
-  // Insert at beginning of list
-  void Insert(wxExpr *expr);
-
-  // Get first expr in list
-  inline wxExpr *GetFirst(void) const { return ((type == wxExprList) ? value.first : (wxExpr*)NULL); }
-
-  // Get next expr if this is a node in a list
-  inline wxExpr *GetNext(void) const { return next; }
-
-  // Get last expr in list
-  inline wxExpr *GetLast(void) const { return ((type == wxExprList) ? last : (wxExpr*)NULL); }
-
-  // This should really be called SetAttributeValue since any existing
-  // attribute-value is deleted first.
-  void AddAttributeValue(const wxString& attribute, long value);
-  void AddAttributeValue(const wxString& attribute, double value);
-  void AddAttributeValueWord(const wxString& attribute, const wxString& value);
-  void AddAttributeValueString(const wxString& attribute, const wxString& value);
-  void AddAttributeValue(const wxString& attribute, wxList *value);
-  void AddAttributeValue(const wxString& attribute, wxExpr *value);
-  void AddAttributeValueStringList(const wxString& attribute, wxList *string_list);
-
-  void DeleteAttributeValue(const wxString& attribute);
-
-  bool GetAttributeValue(const wxString& att, int& var) const;
-  bool GetAttributeValue(const wxString& att, long& var) const;
-  bool GetAttributeValue(const wxString& att, float& var) const;
-  bool GetAttributeValue(const wxString& att, double& var) const;
-  bool GetAttributeValue(const wxString& att, wxString& var) const;  // Word OR string -> string
-  bool GetAttributeValue(const wxString& att, wxExpr **var) const;
-
-  // Compatibility with old PrologIO
-  inline void AssignAttributeValue(wxChar *att, int *var) const { GetAttributeValue(att, *var); }
-  inline void AssignAttributeValue(wxChar *att, long *var) const { GetAttributeValue(att, *var); }
-  inline void AssignAttributeValue(wxChar *att, float *var) const { GetAttributeValue(att, *var); }
-  inline void AssignAttributeValue(wxChar *att, double *var) const { GetAttributeValue(att, *var); }
-  inline void AssignAttributeValue(wxChar *att, wxExpr **var) const { GetAttributeValue(att, var); }
-  void AssignAttributeValue(wxChar *att, wxChar **var) const ;  // Word OR string -> string
-
-  // Add string items to list if the list attribute exists
-  bool GetAttributeValueStringList(const wxString& att, wxList *var) const;
-
-  // Associate other data with this expression, e.g. when reading in a
-  // number of linked items - store C++ object pointer with the expression
-  // so we can index into the wxExpr database and fish out the pointer.
-  inline void SetClientData(wxObject *data) { client_data = data; }
-  inline wxObject *GetClientData(void) const { return client_data; }
-
-    DECLARE_NO_COPY_CLASS(wxExpr)
-};
-
-class WXDLLIMPEXP_DEPRECATED wxExprDatabase: public wxList
-{
-private:
-    wxNode *position;              // Where we are in a search
-    wxHashTable *hash_table;
-    wxString attribute_to_hash;
-
-public:
-    int noErrors;
-
-    wxExprDatabase(wxExprErrorHandler handler = 0);
-
-    // Use hashing on both the functor, and the attribute of
-    // specified type (wxExprString or wxExprInteger) and name.
-    // So to find node 45
-    // (i.e. match the clause node(id=45, ...))
-    // it usually requires 1 look-up: the keys for functor and attribute
-    // are added together.
-    // Obviously if the attribute was missing in a clause, it would
-    // fail to be found by this method, but could be retrieved by a
-    // linear search using BeginFind and FindClauseByFunctor,
-    // or just searching through the list as per usual.
-
-    wxExprDatabase(wxExprType type, const wxString& attribute, int size = 500,
-            wxExprErrorHandler handler = 0);
-
-    ~wxExprDatabase(void);
-
-    void BeginFind(void) ;          // Initialise a search
-    wxExpr *FindClause(long id) ;  // Find a term based on an integer id attribute
-    // e.g. node(id=23, type=rectangle, ....).
-
-    // Find on basis of attribute/value pairs, e.g. type=rectangle
-    // This doesn't use hashing; it's a linear search.
-    wxExpr *FindClause(const wxString& word, const wxString& value);
-    wxExpr *FindClause(const wxString& word, long value);
-    wxExpr *FindClause(const wxString& word, double value);
-    wxExpr *FindClauseByFunctor(const wxString& functor);
-
-    wxExpr *HashFind(const wxString& functor, const wxString& value) const;
-    wxExpr *HashFind(const wxString& functor, long value) const;
-
-    void Append(wxExpr *expr);  // Does cleverer things if hashing is on
-    void ClearDatabase(void);
-    inline int GetErrorCount() const { return noErrors; }
-    bool Read(const wxString& filename);
-    bool ReadFromString(const wxString& buffer);
-    bool Write(const wxString& fileName);
-    bool Write(FILE* stream);
-
-    // Compatibility
-    inline bool ReadProlog(wxChar *filename) { return Read(wxString(filename)); }
-    inline bool ReadPrologFromString(char *buffer)
-    {
-        return ReadFromString(wxString(buffer, wxConvLibc));
-    }
-    inline void WriteProlog(FILE* stream) { Write(stream); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxExprDatabase)
-    DECLARE_NO_COPY_CLASS(wxExprDatabase)
-};
-
-// Function call-style interface - some more convenience wrappers/unwrappers
-
-// Make a call
-WXDLLIMPEXP_DEPRECATED wxExpr* wxExprMakeCall(const wxString& functor ...);
-
-#define wxExprMakeInteger(x) (new wxExpr((long)x))
-#define wxExprMakeReal(x) (new wxExpr((double)x))
-#define wxExprMakeString(x) (new wxExpr(wxExprString, x))
-#define wxExprMakeWord(x)   (new wxExpr(wxExprWord, x))
-#define wxExprMake(x)       (new wxExpr(x))
-
-// Checks functor
-WXDLLIMPEXP_DEPRECATED bool wxExprIsFunctor(wxExpr *expr, const wxString& functor);
-
-// Temporary variable for communicating between wxexpr.cpp and YACC/LEX
-WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprDatabase*) thewxExprDatabase;
-
-// YACC/LEX can leave memory lying around...
-extern "C" WXDLLIMPEXP_DEPRECATED int wxExprCleanUp();
-
-#endif // wxUSE_PROLOGIO
-
-#endif // _WX_WXEXPRH__
-
diff --git a/contrib/include/wx/fl/antiflickpl.h b/contrib/include/wx/fl/antiflickpl.h
deleted file mode 100644
index 27dcf1be4e..0000000000
--- a/contrib/include/wx/fl/antiflickpl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        antiflickpl.h
-// Purpose:     Double-buffering plugin class for reducing flicker
-// Author:      Aleksandras Gluchovas (@Lithuania)
-// Modified by:
-// Created:     23/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ANTIFLICKPL_G__
-#define __ANTIFLICKPL_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-Implements double-buffering to reduce flicker.
-Bitmap and memory DC buffers are shared 'resources' among all instances of
-antiflicker plugins within the application.
-
-Locking for multithreaded applications is not yet implemented.
-*/
-
-class WXDLLIMPEXP_FL cbAntiflickerPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
-protected:
-
-    static wxBitmap*   mpVertBuf;
-    static wxBitmap*   mpHorizBuf;
-    static wxMemoryDC* mpVertBufDc;
-    static wxMemoryDC* mpHorizBufDc;
-
-    static int mRefCount;
-
-    wxDC*  mpLRUBufDc; // last-recently-used buffer
-    wxRect mLRUArea;   // last-recently-used area
-
-protected:
-        // Finds a suitable buffer. Returns NULL if a suitable buffer is not present.
-
-    wxDC* FindSuitableBuffer( const wxRect& forArea );
-
-        // Allocates a suitable buffer.
-
-    wxDC* AllocNewBuffer( const wxRect& forArea );
-
-        // Gets the window device context.
-
-    wxDC& GetWindowDC();
-
-        // Gets the client device context.
-
-    wxDC& GetClientDC();
-public:
-
-        // Default constructor.
-
-    cbAntiflickerPlugin(void);
-
-        // Constructor taking frame layout panel, and pane mask.
-
-    cbAntiflickerPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Destructor.
-
-    virtual ~cbAntiflickerPlugin();
-
-        // Handler for plugin event.
-
-    void OnStartDrawInArea ( cbStartDrawInAreaEvent& event );
-
-        // Handler for plugin event.
-
-    void OnFinishDrawInArea( cbFinishDrawInAreaEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __ANTIFLICKPL_G__ */
-
diff --git a/contrib/include/wx/fl/bardragpl.h b/contrib/include/wx/fl/bardragpl.h
deleted file mode 100644
index 080843d2a7..0000000000
--- a/contrib/include/wx/fl/bardragpl.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bardragpl.h
-// Purpose:     cbBarDragPlugin class
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     23/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __BARDRAGPL_G__
-#define __BARDRAGPL_G__
-
-#include "wx/fl/controlbar.h"
-#include "wx/fl/toolwnd.h"
-
-/*
-Plugin class implementing bar dragging.
-*/
-
-class WXDLLIMPEXP_FL cbBarDragPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
-protected:
-
-    // plugin is active only in bar-dragging state
-    bool           mBarDragStarted;
-    bool           mCanStick;          // flag used to prevent "bouncing" of hint-rectangle
-    wxScreenDC*    mpScrDc;            // created while tracking hint-rect
-    wxCursor*      mpCurCursor;
-
-    // rectangle shows the position/dimensions of the bar,
-    // if it would be docked now
-
-    wxRect         mPrevHintRect;
-    wxRect         mHintRect;
-
-
-    int            mMouseInRectX;
-    int            mMouseInRectY;
-
-    cbDockPane*    mpSrcPane;          // pane, from which the bar was originally taken
-    int            mBarWidthInSrcPane;
-
-    cbDockPane*    mpCurPane;
-
-    cbBarInfo*     mpDraggedBar;       // bar, which is being dragged
-    bool           mBarWasFloating;
-    wxRect         mFloatedBarBounds;
-
-public: /*** public properties ***/
-
-    int            mInClientHintBorder; // when hint-rect moves within client window area,
-                                        // the thicker rectangle is drawn using hatched brush,
-                                        // the default border width for this rectangle is 8 pix.
-
-protected:
-
-        // Internal implementation function.
-    void AdjustHintRect( wxPoint& mousePos );
-
-        // Internal implementation function.
-    void ClipRectInFrame( wxRect& rect );
-
-        // Internal implementation function.
-    void ClipPosInFrame( wxPoint& pos );
-
-        // Internal implementation function. Finds the pane
-        // under the specified rectangle.
-    cbDockPane* HitTestPanes( wxRect& rect );
-
-        // Internal implementation function. Finds the pane
-        // under the specified point.
-    cbDockPane* HitTestPanes( wxPoint& pos );
-
-        // Internal implementation function.
-    bool HitsPane( cbDockPane* pPane, wxRect& rect );
-
-        // Internal implementation function.
-    void CalcOnScreenDims( wxRect& rect );
-
-        // Internal implementation function.
-    int  GetDistanceToPane( cbDockPane* pPane, wxPoint& mousePos );
-
-        // Internal implementation function.
-    bool IsInOtherPane ( wxPoint& mousePos );
-
-        // Internal implementation function.
-    bool IsInClientArea( wxPoint& mousePos );
-
-        // Internal implementation function.
-    bool IsInClientArea( wxRect& rect );
-
-        // Internal implementation function.
-    void StickToPane( cbDockPane* pPane, wxPoint& mousePos );
-
-        // Internal implementation function.
-    void UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos );
-
-        // Internal implementation function.
-    int GetBarWidthInPane( cbDockPane* pPane );
-
-        // Internal implementation function.
-    int GetBarHeightInPane( cbDockPane* pPane );
-
-        // on-screen hint-tracking related methods
-
-        // Internal implementation function.
-        // Start showing a visual hint while dragging.
-    void StartTracking();
-
-        // Internal implementation function.
-        // Draw the visual hint while dragging.
-    void DrawHintRect ( wxRect& rect, bool isInClientRect);
-
-        // Internal implementation function.
-        // Erase the visual hint while dragging.
-    void EraseHintRect( wxRect& rect, bool isInClientRect);
-
-        // Internal implementation function.
-        // Stop showing the visual hint while dragging.
-    void FinishTracking();
-
-        // Internal implementation function.
-        // Draw the hint rectangle.
-    void DoDrawHintRect( wxRect& rect, bool isInClientRect);
-
-        // Internal implementation function.
-        // Converts the given rectangle from window to screen coordinates.
-    void RectToScr( wxRect& frameRect, wxRect& scrRect );
-
-        // Internal implementation function.
-        // Show the hint; called within OnMouseMove.
-    void ShowHint( bool prevWasInClient );
-
-public:
-        // Default constructor.
-    cbBarDragPlugin(void);
-
-        // Constructor taking a parent frame, and flag. See cbPluginBase.
-    cbBarDragPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Destructor.
-    virtual ~cbBarDragPlugin();
-
-        // Handler for plugin event.
-    void OnMouseMove( cbMotionEvent& event );
-
-        // Handler for plugin event.
-    void OnLButtonUp( cbLeftUpEvent& event );
-
-        // Handler for plugin event.
-    void OnLButtonDown( cbLeftDownEvent& event );
-
-        // Handler for plugin event.
-    void OnLDblClick( cbLeftDClickEvent& event );
-
-        // Handles event, which originates from itself.
-    void OnDrawHintRect( cbDrawHintRectEvent& event );
-
-        // Handler for plugin event.
-    void OnStartBarDragging( cbStartBarDraggingEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __BARDRAGPL_G__ */
-
diff --git a/contrib/include/wx/fl/barhintspl.h b/contrib/include/wx/fl/barhintspl.h
deleted file mode 100644
index 91a7e6d7dd..0000000000
--- a/contrib/include/wx/fl/barhintspl.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        barhintspl.h
-// Purpose:     cbBarHintsPlugin class declaration
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     30/11/98 (my 22th birthday :-)
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __DRAGHINTSPL_G__
-#define __DRAGHINTSPL_G__
-
-#include "wx/fl/controlbar.h"
-#include "wx/fl/toolwnd.h"
-
-/*
-This class intercepts bar-decoration and sizing events, and draws 3D hints
-around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
-*/
-
-class WXDLLIMPEXP_FL cbBarHintsPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )
-
-protected:
-    cbDockPane* mpPane; // is set up temorarely, while handling event
-
-    cbMiniButton* mBoxes[2];
-
-    bool        mBtnPressed;
-    bool        mClosePressed;
-    cbBarInfo*  mpClickedBar;
-    bool        mDepressed;
-
-protected:
-        // Helper function: draws a 3D box.
-    void Draw3DBox      ( wxDC& dc, const wxPoint& pos, bool pressed );
-
-        // Helper function: draws a close box.
-    void DrawCloseBox   ( wxDC& dc, const wxPoint& pos, bool pressed );
-
-        // Helper function: draws a collapse box.
-    void DrawCollapseBox( wxDC& dc, const wxPoint& pos,
-                          bool atLeft, bool disabled, bool pressed );
-
-        // Helper function: draws grooves.
-    void DrawGrooves    ( wxDC& dc, const wxPoint& pos, int length );
-
-        // Helper function: draws a hint.
-    void DoDrawHint( wxDC& dc, wxRect& rect, int pos, int boxOfs, int grooveOfs, bool isFixed );
-
-        // Helper function: gets the layout of a hint.
-    void GetHintsLayout( wxRect& rect, cbBarInfo& info,
-                         int& boxOfs, int& grooveOfs, int& pos );
-
-        // Helper function: returns information about the hint under the given position.
-    int HitTestHints( cbBarInfo& info, const wxPoint& pos );
-
-        // Helper function.
-    void ExcludeHints( wxRect& rect, cbBarInfo& info );
-
-        // Helper function: creates close and collapse boxes.
-    void CreateBoxes();
-
-public:
-    /* public properties */
-
-    bool mCloseBoxOn;    // default: ON
-    bool mCollapseBoxOn; // default: ON
-    int  mGrooveCount;   // default: 2 (two shaded bars)
-    int  mHintGap;       // default: 5 (pixels from above, below, right and left)
-    int  mXWeight;       // default: 2 (width in pixels of lines which used for drawing cross)
-
-public:
-        // Default constructor.
-    cbBarHintsPlugin(void);
-
-        // Constructor, taking parent frame and pane mask flag.
-    cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
-
-        // Destructor.
-    ~cbBarHintsPlugin();
-
-        // Set the number of grooves to be shown in the pane.
-    void SetGrooveCount( int nGrooves );
-
-        // Called to initialize this plugin.
-    void OnInitPlugin();
-
-        // Handles a plugin event.
-    void OnSizeBarWindow( cbSizeBarWndEvent& event );
-
-        // Handles a plugin event.
-    void OnDrawBarDecorations( cbDrawBarDecorEvent& event );
-
-        // Handles a plugin event.
-    void OnLeftDown( cbLeftDownEvent& event );
-
-        // Handles a plugin event.
-    void OnLeftUp  ( cbLeftUpEvent&   event );
-
-        // Handles a plugin event.
-    void OnMotion  ( cbMotionEvent&   event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __DRAGHINTSPL_G__ */
-
diff --git a/contrib/include/wx/fl/cbcustom.h b/contrib/include/wx/fl/cbcustom.h
deleted file mode 100644
index b90c45d697..0000000000
--- a/contrib/include/wx/fl/cbcustom.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        cbcustom.h
-// Purpose:     cbSimpleCustomizationPlugin class declaration
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     28/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __CBCUSTOM_G__
-#define __CBCUSTOM_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-This class enables customization of a bar, popping up a
-menu and handling basic customization such as floating
-and horizontal/vertical alignment of the bar.
-*/
-
-class WXDLLIMPEXP_FL cbSimpleCustomizationPlugin : public cbPluginBase
-{
-public:
-    DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )
-
-    int mCustMenuItemId;
-public:
-
-        // Default constructor.
-    cbSimpleCustomizationPlugin(void);
-
-        // Constructor, taking parent pane and a pane mask flag.
-    cbSimpleCustomizationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Plugin event handler for cbCustomizeBarEvent.
-    void OnCustomizeBar( cbCustomizeBarEvent& event );
-
-        // Plugin event handler for cbCustomizeLayoutEvent.
-    void OnCustomizeLayout( cbCustomizeLayoutEvent& event );
-
-        // Menu event handler.
-    void OnMenuItemSelected( wxCommandEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __CBCUSTOM_G__ */
-
diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h
deleted file mode 100644
index 522ff37477..0000000000
--- a/contrib/include/wx/fl/controlbar.h
+++ /dev/null
@@ -1,2270 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        controlbar.h
-// Purpose:     Central header file for control-bar related classes
-//
-// Author:      Aleksandras Gluchovas <mailto:alex@soften.ktu.lt>
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __CONTROLBAR_G__
-#define __CONTROLBAR_G__
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/pen.h"
-#include "wx/window.h"
-#include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"
-
-#define WXCONTROLBAR_VERSION      1.3
-
-// forward declarations
-
-class  WXDLLIMPEXP_FL wxFrameLayout;
-
-class  WXDLLIMPEXP_FL cbDockPane;
-class  WXDLLIMPEXP_FL cbUpdatesManagerBase;
-class  WXDLLIMPEXP_FL cbBarDimHandlerBase;
-class  WXDLLIMPEXP_FL cbPluginBase;
-class  WXDLLIMPEXP_FL cbPluginEvent;
-class  WXDLLIMPEXP_FL cbPaneDrawPlugin;
-
-class WXDLLIMPEXP_FL cbBarInfo;
-class WXDLLIMPEXP_FL cbRowInfo;
-class WXDLLIMPEXP_FL cbDimInfo;
-class WXDLLIMPEXP_FL cbCommonPaneProperties;
-
-typedef cbBarInfo* BarInfoPtrT;
-typedef cbRowInfo* RowInfoPtrT;
-
-WXFL_DEFINE_ARRAY_PTR( BarInfoPtrT, BarArrayT );
-WXFL_DEFINE_ARRAY_PTR( RowInfoPtrT, RowArrayT );
-
-// control bar states
-
-#define wxCBAR_DOCKED_HORIZONTALLY 0
-#define wxCBAR_DOCKED_VERTICALLY   1
-#define wxCBAR_FLOATING            2
-#define wxCBAR_HIDDEN              3
-
-// the states are enumerated above
-#define MAX_BAR_STATES             4
-
-// control bar alignments
-
-#if !defined(FL_ALIGN_TOP)
-
-#define FL_ALIGN_TOP        0
-#define FL_ALIGN_BOTTOM     1
-#define FL_ALIGN_LEFT       2
-#define FL_ALIGN_RIGHT      3
-
-#endif
-
-// one pane for each alignment
-#define MAX_PANES      4
-
-// masks for each pane
-
-#define FL_ALIGN_TOP_PANE        0x0001
-#define FL_ALIGN_BOTTOM_PANE   0x0002
-#define FL_ALIGN_LEFT_PANE       0x0004
-#define FL_ALIGN_RIGHT_PANE   0x0008
-
-#define wxALL_PANES    0x000F
-
-// enumeration of hittest results, see cbDockPane::HitTestPaneItems(..)
-
-enum CB_HITTEST_RESULT
-{
-    CB_NO_ITEMS_HITTED,
-
-    CB_UPPER_ROW_HANDLE_HITTED,
-    CB_LOWER_ROW_HANDLE_HITTED,
-    CB_LEFT_BAR_HANDLE_HITTED,
-    CB_RIGHT_BAR_HANDLE_HITTED,
-    CB_BAR_CONTENT_HITTED
-};
-
-/*
-Helper class, used for spying for unhandled mouse events on control bars
-and forwarding them to the frame layout.
-*/
-
-class WXDLLIMPEXP_FL cbBarSpy : public wxEvtHandler
-{
-public:
-    DECLARE_DYNAMIC_CLASS( cbBarSpy )
-
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpBarWnd;
-
-public:
-        // Default constructor.
-
-    cbBarSpy(void);
-
-        // Constructor, taking a parent pane.
-
-    cbBarSpy( wxFrameLayout* pPanel );
-
-        // Sets the bar window.
-
-    void SetBarWindow( wxWindow* pWnd );
-
-        // Performs special event processing.
-
-    virtual bool ProcessEvent(wxEvent& event);
-};
-
-/*
-wxFrameLayout manages containment and docking of control bars,
-which can be docked along the top, bottom, right, or left side of the
-parent frame.
-*/
-
-class WXDLLIMPEXP_FL wxFrameLayout : public wxEvtHandler
-{
-public:
-        // Default constructor, used only for serialization.
-
-    wxFrameLayout();
-
-        // Constructor, taking parent window, the (MDI) client of the parent if there
-        // is one, and flag specifying whether to activate the layout.
-
-    wxFrameLayout( wxWindow* pParentFrame,
-                   wxWindow* pFrameClient = NULL,
-                   bool      activateNow  = true );
-
-        // Destructor. It does not destroy the bar windows.
-
-    virtual ~wxFrameLayout();
-
-        // Enables floating behaviour. By default floating of control bars is on.
-
-    virtual void EnableFloating( bool enable = true );
-
-        // Activate can be called after some other layout has been deactivated,
-        // and this one must take over the current contents of the frame window.
-        //
-        // Effectively hooks itself to the frame window, re-displays all non-hidden
-        // bar windows and repaints the decorations.
-
-    virtual void Activate();
-
-        // Deactivate unhooks itself from frame window, and hides all non-hidden windows.
-        //
-        // Note: two frame layouts should not be active at the same time in the
-        // same frame window, since it would cause messy overlapping of bar windows
-        // from both layouts.
-
-    virtual void Deactivate();
-
-        // Hides the bar windows, and also the client window if present.
-
-    void HideBarWindows();
-
-        // Destroys the bar windows.
-
-    virtual void DestroyBarWindows();
-
-        // Passes the client window (e.g. MDI client window) to be controlled by
-        // frame layout, the size and position of which should be adjusted to be
-        // surrounded by controlbar panes, whenever the frame is resized or the dimensions
-        // of control panes change.
-
-    void SetFrameClient( wxWindow* pFrameClient );
-
-        // Returns the frame client, or NULL if not present.
-
-    wxWindow* GetFrameClient();
-
-        // Returns the parent frame.
-
-    wxWindow& GetParentFrame() { return *mpFrame; }
-
-        // Returns an array of panes. Used by update managers.
-
-    cbDockPane** GetPanesArray() { return mPanes; }
-
-        // Returns a pane for the given alignment. See pane alignment types.
-
-    cbDockPane* GetPane( int alignment )
-
-        { return mPanes[alignment]; }
-
-        // Adds bar information to the frame layout. The appearance of the layout is not refreshed
-        // immediately; RefreshNow() can be called if necessary.
-        //
-        // Notes: the argument pBarWnd can by NULL, resulting in bar decorations to be drawn
-        // around the empty rectangle (filled with default background colour).
-        // Argument dimInfo can be reused for adding any number of bars, since
-        // it is not used directly - instead its members are copied. If the dimensions
-        // handler is present, its instance is shared (reference counted). The dimension
-        // handler should always be allocated on the heap.
-
-        // pBarWnd is the window to be managed.
-
-        // dimInfo contains dimension information.
-
-        // alignment is a value such as FL_ALIGN_TOP.
-
-        // rowNo is the vertical position or row in the pane (if in docked state).
-
-        // columnPos is the horizontal position within the row in pixels (if in docked state).
-
-        // name is a name by which the bar can be referred in layout customization dialogs.
-
-        // If spyEvents is true, input events for the bar should be "spyed" in order
-        // to forward unhandled mouse clicks to the frame layout, for example to enable
-        // easy draggablity of toolbars just by clicking on their interior regions.
-        // For widgets like text/tree control this value should be false,
-        // since there's no certain way to detect  whether the event was actually handled.
-
-        // state is the initial state, such as wxCBAR_DOCKED_HORIZONTALLY,
-        // wxCBAR_FLOATING, wxCBAR_HIDDEN.
-
-    virtual void AddBar( wxWindow*        pBarWnd,
-                         const cbDimInfo&       dimInfo,
-
-                         // defaults:
-                         int alignment    = FL_ALIGN_TOP,
-                         int rowNo        = 0,
-                         int columnPos    = 0,
-                         const wxString& name = wxT("bar"),
-                         bool spyEvents    = false,
-                         int state        = wxCBAR_DOCKED_HORIZONTALLY
-                       );
-
-        // ReddockBar can be used for repositioning existing bars. The given bar is first removed
-        // from the pane it currently belongs to, and inserted into the pane, which "matches"
-        // the given rectangular area. If pToPane is not NULL, the bar is docked to this given pane.
-        // To dock a bar which is floating, use the wxFrameLayout::DockBar method.
-
-    virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,
-                            cbDockPane* pToPane = NULL, bool updateNow = true );
-
-        // Finds the bar in the framelayout, by name.
-
-    cbBarInfo* FindBarByName( const wxString& name );
-
-        // Finds the bar in the framelayout, by window.
-
-    cbBarInfo* FindBarByWindow( const wxWindow* pWnd );
-
-        // Gets an array of bars.
-
-    BarArrayT& GetBars();
-
-        // Changes the bar's docking state (see possible control bar states).
-
-    void SetBarState( cbBarInfo* pBar, int newStatem, bool updateNow );
-
-        // Toggles the bar between visible and hidden.
-
-    void InverseVisibility( cbBarInfo* pBar );
-
-        // Reflects changes in bar information structure visually.
-        // For example, moves the bar, changes its dimension information,
-        // or changes the pane to which it is docked.
-
-    void ApplyBarProperties( cbBarInfo* pBar );
-
-        // Removes the bar from the layout permanently, and hides its corresponding window if present.
-
-    void RemoveBar( cbBarInfo* pBar );
-
-        // Recalculates the layout of panes, and all bars/rows in each pane.
-
-    virtual void RecalcLayout( bool repositionBarsNow = false );
-
-        // Returns the client height.
-
-    int     GetClientHeight();
-
-        // Returns the client width.
-
-    int     GetClientWidth();
-
-        // Returns the client's rectangle.
-
-    wxRect& GetClientRect()        { return mClntWndBounds;     }
-
-        // Returns a reference to the updates manager.
-        // Note: in future, the updates manager will become a normal plugin.
-
-    cbUpdatesManagerBase& GetUpdatesManager();
-
-        // Destroys the previous manager if any, and sets the new one.
-
-    void SetUpdatesManager( cbUpdatesManagerBase* pUMgr );
-
-        // Gets the pane properties for the given alignment.
-
-    virtual void GetPaneProperties( cbCommonPaneProperties& props, int alignment = FL_ALIGN_TOP );
-
-        // Sets the pane properties for the given alignment.
-        // Note: changing properties of panes does not result immediate on-screen update.
-
-    virtual void SetPaneProperties( const cbCommonPaneProperties& props,
-                                    int paneMask = wxALL_PANES );
-
-        // Sets the margins for the given panes.
-        // The margins should go into cbCommonPaneProperties in the future.
-        //
-        // Note: this method should be called before any custom plugins are attached.
-
-    virtual void SetMargins( int top, int bottom, int left, int right,
-                             int paneMask = wxALL_PANES );
-
-        // Sets the pane background colour.
-
-    virtual void SetPaneBackground( const wxColour& colour );
-
-        // Recalculates layout and performs on-screen update of all panes.
-
-    void RefreshNow( bool recalcLayout = true );
-
-        // Event handler for a size event.
-
-    void OnSize       ( wxSizeEvent&  event );
-
-        // Event handler for a left down button event.
-
-    void OnLButtonDown( wxMouseEvent& event );
-
-        // Event handler for a left doubleclick button event.
-
-    void OnLDblClick  ( wxMouseEvent& event );
-
-        // Event handler for a left button up event.
-
-    void OnLButtonUp  ( wxMouseEvent& event );
-
-        // Event handler for a right button down event.
-
-    void OnRButtonDown( wxMouseEvent& event );
-
-        // Event handler for a right button up event.
-
-    void OnRButtonUp  ( wxMouseEvent& event );
-
-        // Event handler for a mouse move event.
-
-    void OnMouseMove  ( wxMouseEvent& event );
-
-        // This function should be used instead of passing the event to the ProcessEvent method
-        // of the top-level plugin directly. This method checks if events are currently
-        // captured and ensures that plugin-event is routed correctly.
-
-    virtual void FirePluginEvent( cbPluginEvent& event );
-
-        // Captures user input events for the given plugin.
-        // Input events are: mouse movement, mouse clicks, keyboard input.
-
-    virtual void CaptureEventsForPlugin ( cbPluginBase* pPlugin );
-
-        // Releases user input events for the given plugin.
-        // Input events are: mouse movement, mouse clicks, keyboard input
-
-    virtual void ReleaseEventsFromPlugin( cbPluginBase* pPlugin );
-
-        // Called by plugins; also captures the mouse in the parent frame.
-
-    void CaptureEventsForPane( cbDockPane* toPane );
-
-        // Called by plugins; also releases mouse in the parent frame.
-
-    void ReleaseEventsFromPane( cbDockPane* fromPane );
-
-        // Returns the current top-level plugin (the one that receives events first,
-        // except if input events are currently captured by some other plugin).
-
-    virtual cbPluginBase& GetTopPlugin();
-
-        // Hooking custom plugins to frame layout.
-        //
-        // Note: when hooking one plugin on top of the other,
-        // use SetNextHandler or similar methods
-        // of wxEvtHandler class to compose the chain of plugins,
-        // than pass the left-most handler in this chain to
-        // the above methods (assuming that events are delegated
-        // from left-most towards right-most handler).
-        //
-        // This secenario is very inconvenient and "low-level",
-        // so use the Add/Push/PopPlugin methods instead.
-
-    virtual void SetTopPlugin( cbPluginBase* pPlugin );
-
-        // Similar to wxWindow's "push/pop-event-handler" methods, execept
-        // that the plugin is deleted upon "popping".
-
-    virtual void PushPlugin( cbPluginBase* pPugin );
-
-        // Similar to wxWindow's "push/pop-event-handler" methods, execept
-        // that the plugin is deleted upon "popping".
-
-    virtual void PopPlugin();
-
-        // Pop all plugins.
-    virtual void PopAllPlugins();
-
-        // Adds the default plugins. These are cbPaneDrawPlugin, cbRowLayoutPlugin, cbBarDragPlugin,
-        // cbAntiflickerPlugin, cbSimpleCustomizePlugin.
-        //
-        // This method is automatically invoked if no plugins were found upon
-        // firing of the first plugin-event, i.e. when wxFrameLayout configures itself.
-
-    virtual void PushDefaultPlugins();
-
-        // An advanced methods for plugin configuration    using their
-        // dynamic class information, for example CLASSINFO(pluginClass).
-
-        // First checks if the plugin of the given class is already "hooked up".
-        // If not, adds it to the top of the plugins chain.
-
-    virtual void AddPlugin( wxClassInfo* pPlInfo, int paneMask = wxALL_PANES );
-
-        // First checks if the plugin of the given class is already hooked.
-        // If so, removes it, and then inserts it into the chain
-        // before the plugin of the class given by pNextPlInfo.
-        //
-        // Note: this method is handy in some cases where the order
-        // of the plugin-chain could be important, for example when one plugin overrides
-        // some functionality of another already-hooked plugin,
-        // so that the former plugin should be hooked before the one
-        // whose functionality is being overridden.
-
-    virtual void AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo,
-                                  int paneMask = wxALL_PANES );
-
-        // Checks if the plugin of the given class is hooked, and removes
-        // it if found.
-
-    virtual void RemovePlugin( wxClassInfo* pPlInfo );
-
-        // Finds a plugin with the given class, or returns NULL if a plugin of the given
-        // class is not hooked.
-
-    virtual cbPluginBase* FindPlugin( wxClassInfo* pPlInfo );
-
-        // Returns true if there is a top plugin.
-
-    bool HasTopPlugin();
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS( wxFrameLayout )
-
-public: /* protected really, acessed only by plugins and serializers */
-
-    friend class cbDockPane;
-    friend class wxBarHandler;
-
-    wxWindow*    mpFrame;           // parent frame
-    wxWindow*    mpFrameClient;        // client window
-    cbDockPane*  mPanes[MAX_PANES];    // panes in the panel
-
-    // misc. cursors
-    wxCursor*    mpHorizCursor;
-    wxCursor*    mpVertCursor;
-    wxCursor*    mpNormalCursor;
-    wxCursor*    mpDragCursor;
-    wxCursor*    mpNECursor; // no-entry cursor
-
-    // pens for decoration and shades
-
-    wxPen        mDarkPen;     // default wxSYS_COLOUR_3DSHADOW
-    wxPen        mLightPen;  // default wxSYS_COLOUR_3DHILIGHT
-    wxPen        mGrayPen;     // default wxSYS_COLOUR_3DFACE
-    wxPen        mBlackPen;  // default wxColour(  0,  0,  0)
-    wxPen        mBorderPen; // default wxSYS_COLOUR_3DFACE
-
-    wxPen        mNullPen;   // transparent pen
-
-        // pane to which the all mouse input is currently directed (caputred)
-
-    cbDockPane*  mpPaneInFocus;
-
-        // pane, from which mouse pointer had just left
-
-    cbDockPane*  mpLRUPane;
-
-        // bounds of client window in parent frame's coordinates
-
-    wxRect       mClntWndBounds;
-    wxRect       mPrevClntWndBounds;
-
-    bool         mFloatingOn;
-    wxPoint      mNextFloatedWndPos;
-    wxSize       mFloatingPosStep;
-
-        // current plugin (right-most) plugin which receives events first
-
-    cbPluginBase* mpTopPlugin;
-
-        // plugin, which currently has captured all input events, otherwise NULL
-
-    cbPluginBase* mpCaputesInput;
-
-        // list of event handlers which are "pushed" onto each bar, to catch
-        // mouse events which are not handled by bars, and froward them to the ,
-        // frome-layout and further to plugins
-
-    wxList        mBarSpyList;
-
-        // list of top-most frames which contain floated bars
-
-    wxList        mFloatedFrames;
-
-        // linked list of references to all bars (docked/floated/hidden)
-
-    BarArrayT    mAllBars;
-
-    // FOR NOW:: dirty stuff...
-    bool         mClientWndRefreshPending;
-    bool         mRecalcPending;
-    bool         mCheckFocusWhenIdle;
-
-public: /* protected really (accessed only by plugins) */
-
-        // refrence to custom updates manager
-    cbUpdatesManagerBase* mpUpdatesMgr;
-
-        // Called to apply the calculated layout to window objects.
-
-    void PositionClientWindow();
-
-        // Called to apply the calculated layout to window objects.
-
-    void PositionPanes();
-
-        // Creates the cursors.
-
-    void CreateCursors();
-
-        // Applies the calculated layout to a floating bar.
-
-    void RepositionFloatedBar( cbBarInfo* pBar );
-
-        // Applies the state to the window objects.
-
-    void DoSetBarState( cbBarInfo* pBar );
-
-        // The purpose of this function is unknown.
-
-    bool LocateBar( cbBarInfo* pBarInfo,
-                    cbRowInfo**  ppRow,
-                    cbDockPane** ppPane );
-
-
-        // Returns true if the position is within the given pane.
-
-    bool HitTestPane( cbDockPane* pPane, int x, int y );
-
-        // Returns the pane for which the rectangle hit test succeeds, giving
-        // preference to the given pane if supplied.
-
-    cbDockPane* HitTestPanes( const wxRect& rect, cbDockPane* pCurPane );
-
-        // Returns the pane to which the given bar belongs.
-
-    cbDockPane* GetBarPane( cbBarInfo* pBar );
-
-        // Delegated from "bar-spy".
-    void ForwardMouseEvent( wxMouseEvent& event,
-                            cbDockPane*   pToPane,
-                            int           eventType );
-
-        // Routes the mouse event to the appropriate pane.
-
-    void RouteMouseEvent( wxMouseEvent& event, int pluginEvtType );
-
-        // Shows all floated windows.
-
-    void ShowFloatedWindows( bool show );
-
-        // Unhooks the layout from the frame.
-
-    void UnhookFromFrame();
-
-        // Hooks the layout up to the frame (pushes the layout onto the
-        // frame's event handler stack).
-
-    void HookUpToFrame();
-
-        // Returns true if the platform allows reparenting. This may not return true
-        // for all platforms. Reparenting allows control bars to be floated.
-
-    bool CanReparent();
-
-        // Reparents pChild to have parent pNewParent.
-
-    void ReparentWindow( wxWindow* pChild, wxWindow* pNewParent );
-
-        // Returns the previous client window rectangle.
-
-    wxRect& GetPrevClientRect() { return mPrevClntWndBounds; }
-
-        // Handles paint events, calling PaintPane for each pane.
-
-    void OnPaint( wxPaintEvent& event );
-
-        // Handles background erase events. Currently does nothing.
-
-    void OnEraseBackground( wxEraseEvent& event );
-
-        // Handles focus kill events. Currently does nothing.
-
-    void OnKillFocus( wxFocusEvent& event );
-
-        // Handles focus set events. Currently does nothing.
-
-    void OnSetFocus( wxFocusEvent& event );
-
-        // Handles activation events. Currently does nothing.
-
-    void OnActivate( wxActivateEvent& event );
-
-        // Handles idle events.
-
-    void OnIdle( wxIdleEvent& event );
-
-        // Returns a new cbGCUpdatesMgr object.
-
-    virtual cbUpdatesManagerBase* CreateUpdatesManager();
-};
-
-/*
-A structure that is present in each item of layout,
-used by any particular updates-manager to store
-auxiliary information to be used by its updating algorithm.
-*/
-
-class WXDLLIMPEXP_FL cbUpdateMgrData : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
-public:
-    wxRect mPrevBounds;      // previous state of layout item (in parent frame's coordinates)
-
-    bool   mIsDirty;         // overrides result of current-against-previous bounds comparison,
-                             // i.e. requires item to be updated, regardless of it's current area
-
-    wxObject*  mpCustomData; // any custom data stored by specific updates mgr.
-
-        // Default constructor. Is-dirty flag is set true initially.
-
-    cbUpdateMgrData();
-
-        // Store the item state.
-
-    void StoreItemState( const wxRect& boundsInParent );
-
-        // Set the dirty flag.
-
-    void SetDirty( bool isDirty = true );
-
-        // Set custom data.
-
-    void SetCustomData( wxObject* pCustomData );
-
-        // Returns the is-dirty flag.
-
-    inline bool IsDirty() { return mIsDirty; }
-};
-
-/*
-Abstract interface for bar-size handler classes.
-These objects receive notifications whenever the docking
-state of the bar is changed, thus they provide the possibility
-to adjust the values in cbDimInfo::mSizes accordingly.
-Specific handlers can be hooked up to specific types of bar.
-*/
-
-class WXDLLIMPEXP_FL cbBarDimHandlerBase : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )
-
-public:
-    int mRefCount; // since one dim-handler can be assigned
-                   // to multiple bars, it's instance is
-                   // reference-counted
-public:
-
-        // Default constructor. The initial reference count is 0, since
-        // the handler is not used until the first invocation of AddRef().
-
-    cbBarDimHandlerBase();
-
-        // Increments the reference count.
-
-    void AddRef();
-
-        // Decrements the reference count, and if the count is at zero,
-        // delete 'this'.
-
-    void RemoveRef();
-
-        // Responds to "bar-state-changes" notifications.
-
-    virtual void OnChangeBarState(cbBarInfo* pBar, int newState ) = 0;
-
-        // Responds to bar resize notifications.
-
-    virtual void OnResizeBar( cbBarInfo* pBar, const wxSize& given, wxSize& preferred ) = 0;
-};
-
-/*
-Helper class used internally by the wxFrameLayout class.
-Holds and manages information about bar dimensions.
-*/
-
-class WXDLLIMPEXP_FL cbDimInfo : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbDimInfo )
-public:
-    wxSize mSizes[MAX_BAR_STATES];  // preferred sizes for each possible bar state
-
-    wxRect mBounds[MAX_BAR_STATES]; // saved positions and sizes for each
-                                    // possible state, values contain (-1)s if
-                                    // not initialized yet
-
-    int    mLRUPane; // pane to which this bar was docked before it was floated
-                     // (FL_ALIGN_TOP,FL_ALIGN_BOTTOM,..)
-
-    // top/bottom gap, separates decorations
-    // from the bar's actual window, filled
-    // with frame's beckground color, default: 0
-
-    int    mVertGap;
-
-    // left/right gap, separates decorations
-    // from the bar's actual wndow, filled
-    // with frame's beckground colour, default: 0
-
-    int    mHorizGap;    // NOTE:: gaps are given in frame's coord. orientation
-
-    // true, if vertical/horizontal dimensions cannot be mannualy adjusted
-    //       by user using resizing handles. If false, the frame-layout
-    //       *automatically* places resizing handles among not-fixed bars
-
-    bool   mIsFixed;
-
-    cbBarDimHandlerBase* mpHandler; // NULL, if no handler present
-
-public:
-
-        // Default constructor.
-
-    cbDimInfo(void);
-
-        // Constructor.
-        // isFixed is true if vertical/horizontal dimensions cannot be manually adjusted
-        // by the user using resizing handles. If false, the frame-layout
-        // automatically places resizing handles among bars that do are not fixed.
-
-    cbDimInfo( cbBarDimHandlerBase* pDimHandler,
-               bool                 isFixed         // (see comments on mIsFixed member)
-             );
-
-        // Constructor taking dimenstion information.
-        //
-        // dh_x, dh_y are the dimensions when docked horizontally.
-        //
-        // dv_x, dv_y are the dimensions when docked vertically.
-        //
-        // f_x, f_y are the dimensions when floating.
-        //
-        // For information on isFixed, see comments above.
-        //
-        // horizGap is the left/right gap, separating decorations
-        // from the bar's actual wndow, filled with the frame's background colour.
-        // The dimension is given in the frame's coordinates.
-        //
-        // vertGap is the top/bottom gap, separating decorations
-        // from the bar's actual wndow, filled with the frame's background colour.
-        // The dimension is given in the frame's coordinates.
-
-    cbDimInfo( int dh_x, int dh_y,
-               int dv_x, int dv_y,
-               int f_x,  int f_y,
-
-               bool isFixed  = true,
-               int  horizGap = 6,
-               int  vertGap  = 6,
-
-               cbBarDimHandlerBase* pDimHandler = NULL
-             );
-
-        // Constructor.
-
-    cbDimInfo( int x, int y,
-               bool isFixed  = true,
-               int  gap = 6,
-               cbBarDimHandlerBase* pDimHandler = NULL
-             );
-
-        // Destructor. Destroys handler automatically, if present.
-
-    ~cbDimInfo();
-
-         // Assignment operator.
-
-    const cbDimInfo& operator=( const cbDimInfo& other );
-
-         // Returns the handler, if any.
-
-    inline cbBarDimHandlerBase* GetDimHandler() { return mpHandler; }
-};
-
-// FIXME: this array definition compiles but probably doesn't do what was intended (GD)
-WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
-
-/*
-Helper class used internally by the wxFrameLayout class.
-Holds and manages information about bar rows.
-*/
-
-class cbRowInfo : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbRowInfo )
-public:
-
-    BarArrayT  mBars;  // row content
-
-    // row flags (set up according to row-relations)
-
-    bool    mHasUpperHandle;
-    bool    mHasLowerHandle;
-    bool    mHasOnlyFixedBars;
-    int     mNotFixedBarsCnt;
-
-    int        mRowWidth;
-    int        mRowHeight;
-    int        mRowY;
-
-    // stores precalculated row's bounds in parent frame's coordinates
-    wxRect mBoundsInParent;
-
-    // info stored for updates-manager
-    cbUpdateMgrData mUMgrData;
-
-    cbRowInfo*    mpNext;
-    cbRowInfo*    mpPrev;
-
-    cbBarInfo*    mpExpandedBar; // NULL, if non of the bars is currently expanded
-
-    cbArrayFloat  mSavedRatios;  // length-ratios bofore some of the bars was expanded
-
-public:
-        // Constructor.
-
-    cbRowInfo(void);
-
-        // Destructor.
-
-    ~cbRowInfo();
-
-        // Returns the first bar.
-
-    inline cbBarInfo* GetFirstBar()
-
-        { return mBars.GetCount() ? mBars[0] : NULL; }
-};
-
-/*
-Helper class used internally by the wxFrameLayout class.
-Holds and manages bar information.
-*/
-
-class cbBarInfo : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbBarInfo )
-public:
-    // textual name, by which this bar is referred in layout-customization dialogs
-    wxString      mName;
-
-    // stores bar's bounds in pane's coordinates
-    wxRect        mBounds;
-
-    // stores precalculated bar's bounds in parent frame's coordinates
-    wxRect        mBoundsInParent;
-
-    // back-ref to the row, which contains this bar
-    cbRowInfo*    mpRow;
-
-    // are set up according to the types of the surrounding bars in the row
-    bool          mHasLeftHandle;
-    bool          mHasRightHandle;
-
-    // determines if this bar can float. The layout's setting as priority. For
-    // example, if the layout's mFloatingOn is false, this setting is irrelevant
-    // since nothing will float at all. If the layout's floating is on, use this
-    // setting to prevent specific bars from floating. In other words, all bars
-    // float by default and floating can be turned off on individual bars.
-    bool          mFloatingOn;    // default: ON (which is also the layout's mFloatingOn default setting)
-
-    cbDimInfo     mDimInfo;       // preferred sizes for each, control bar state
-
-    int           mState;         // (see definition of controlbar states)
-
-    int           mAlignment;     // alignment of the pane to which this
-                                  // bar is currently placed
-
-    int           mRowNo;         // row, into which this bar would be placed,
-                                  // when in the docking state
-
-    wxWindow*     mpBarWnd;          // the actual window object, NULL if no window
-                                  // is attached to the control bar (possible!)
-
-    double        mLenRatio;      // length ratio among not-fixed-size bars
-
-    wxPoint       mPosIfFloated;  // stored last position when bar was in "floated" state
-                                  // poistion is stored in parent-window's coordinates
-
-    cbUpdateMgrData mUMgrData;    // info stored for updates-manager
-
-    cbBarInfo*    mpNext;         // next. bar in the row
-    cbBarInfo*    mpPrev;         // prev. bar in the row
-
-public:
-        // Constructor.
-
-    cbBarInfo(void);
-
-        // Destructor.
-
-    ~cbBarInfo();
-
-        // Returns true if this bar is fixed.
-
-    inline bool IsFixed() const { return mDimInfo.mIsFixed; }
-
-        // Returns true if this bar is expanded.
-
-    inline bool IsExpanded() const { return this == mpRow->mpExpandedBar; }
-};
-
-/*
-Used for storing the original bar's positions in the row, when the 'non-destructive-friction'
-option is turned on.
-*/
-
-class cbBarShapeData : public wxObject
-{
-public:
-    wxRect mBounds;
-    double mLenRatio;
-};
-
-/*
-Used for traversing through all bars of all rows in the pane.
-*/
-
-class wxBarIterator
-{
-    RowArrayT*  mpRows;
-    cbRowInfo*  mpRow;
-    cbBarInfo*  mpBar;
-
-public:
-        // Constructor, taking row array.
-
-    wxBarIterator( RowArrayT& rows );
-
-        // Resets the iterator to the start of the first row.
-
-    void Reset();
-
-        // Advances the iterator and returns true if a bar is available.
-
-    bool Next();
-
-        // Gets the current bar information.
-
-    cbBarInfo& BarInfo();
-
-        // Returns a reference to the currently traversed row.
-
-    cbRowInfo& RowInfo();
-};
-
-/*
-A structure holding configuration options,
-which are usually the same for all panes in
-a frame layout.
-*/
-
-class WXDLLIMPEXP_FL cbCommonPaneProperties : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
-
-    // look-and-feel configuration
-
-    bool mRealTimeUpdatesOn;     // default: ON
-    bool mOutOfPaneDragOn;       // default: ON
-    bool mExactDockPredictionOn; // default: OFF
-    bool mNonDestructFrictionOn; // default: OFF
-
-    bool mShow3DPaneBorderOn;    // default: ON
-
-    // FOR NOW:: the below properties are reserved for the "future"
-
-    bool mBarFloatingOn;         // default: OFF
-    bool mRowProportionsOn;      // default: OFF
-    bool mColProportionsOn;      // default: ON
-    bool mBarCollapseIconsOn;    // default: OFF
-    bool mBarDragHintsOn;        // default: OFF
-
-    // minimal dimensions for not-fixed bars in this pane (16x16 default)
-
-    wxSize mMinCBarDim;
-
-    // width/height of resizing sash
-
-    int    mResizeHandleSize;
-
-        // Default constructor.
-
-    cbCommonPaneProperties(void);
-
-        // Copy constructor
-
-    cbCommonPaneProperties(const cbCommonPaneProperties&);
-
-        // Assignment operator
-
-    cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
-};
-
-/*
-This class manages containment and control of control bars
-along one of the four edges of the parent frame.
-*/
-
-class cbDockPane : public wxObject
-{
-public:
-    DECLARE_DYNAMIC_CLASS( cbDockPane )
-
-    // look-and-feel configuration for this pane
-    cbCommonPaneProperties mProps;
-
-    // pane margins (in frame's coordinate-syst. orientation)
-
-    int             mLeftMargin;     // default: 2 pixels
-    int             mRightMargin;     // default: 2 pixels
-    int             mTopMargin;         // default: 2 pixels
-    int             mBottomMargin;   // default: 2 pixels
-
-public:
-    // position of the pane in frame's coordinates
-    wxRect          mBoundsInParent;
-
-    // pane width and height in pane's coordinates
-    int             mPaneWidth;
-    int             mPaneHeight;
-
-    int                mAlignment;
-
-    // info stored for updates-manager
-    cbUpdateMgrData mUMgrData;
-
-public: /* protected really */
-
-    RowArrayT        mRows;
-    wxFrameLayout*  mpLayout;         // back-ref
-
-    // transient properties
-
-    wxList          mRowShapeData;   // shapes of bars of recently modified row,
-                                     // stored when in "non-destructive-friction" mode
-    cbRowInfo*      mpStoredRow;     // row-info for which the shapes are stored
-
-    friend class wxFrameLayout;
-
-public: /* protected really (accessed only by plugins) */
-
-        // Returns the row info for a row index. Internal function called by plugins.
-
-    cbRowInfo* GetRow( int row );
-
-        // Returns the row index for the given row info.  Internal function called by plugins.
-
-    int GetRowIndex( cbRowInfo* pRow );
-
-        // Returns the row at the given vertical position.
-        // Returns -1 if the row is not present at given vertical position.
-        // Internal function called by plugins.
-
-    int     GetRowAt( int paneY );
-
-        // Returns the row between the given vertical positions.
-        // Returns -1 if the row is not present.
-        // Internal function called by plugins.
-
-    int     GetRowAt( int upperY, int lowerY );
-
-        // Sets up flags in the row information structure, so that
-        // they match the changed state of row items correctly.
-        // Internal function called by plugins.
-
-    void SyncRowFlags( cbRowInfo* pRow );
-
-        // Returns true if the bar's dimension information indicates a fixed size.
-        // Internal function called by plugins.
-
-    bool IsFixedSize( cbBarInfo* pInfo );
-
-        // Returns the number of bars whose size is not fixed.
-        // Internal function called by plugins.
-
-    int  GetNotFixedBarsCount( cbRowInfo* pRow );
-
-        // Gets the vertical position at the given row.
-        // Internal function called by plugins.
-
-    int GetRowY( cbRowInfo* pRow );
-
-        // Returns true if there are any variable-sized rows above this one.
-        // Internal function called by plugins.
-
-    bool HasNotFixedRowsAbove( cbRowInfo* pRow );
-
-        // Returns true if there are any variable-sized rows below this one.
-        // Internal function called by plugins.
-
-    bool HasNotFixedRowsBelow( cbRowInfo* pRow );
-
-        // Returns true if there are any variable-sized rows to the left of this one.
-        // Internal function called by plugins.
-
-    bool HasNotFixedBarsLeft ( cbBarInfo* pBar );
-
-        // Returns true if there are any variable-sized rows to the right of this one.
-        // Internal function called by plugins.
-
-    bool HasNotFixedBarsRight( cbBarInfo* pBar );
-
-        // Calculate lengths.
-        // Internal function called by plugins.
-
-    virtual void CalcLengthRatios( cbRowInfo* pInRow );
-
-        // Generates a cbLayoutRowEvent event to recalculate row layouts.
-        // Internal function called by plugins.
-
-    virtual void RecalcRowLayout( cbRowInfo* pRow );
-
-        // Expands the bar.
-        // Internal function called by plugins.
-
-    virtual void ExpandBar( cbBarInfo* pBar );
-
-        // Contracts the bar.
-        // Internal function called by plugins.
-
-    virtual void ContractBar( cbBarInfo* pBar );
-
-        // Sets up links between bars.
-        // Internal function called by plugins.
-
-    void InitLinksForRow( cbRowInfo* pRow );
-
-        // Sets up links between bars.
-        // Internal function called by plugins.
-
-    void InitLinksForRows();
-
-        // Coordinate translation between parent's frame and this pane.
-        // Internal function called by plugins.
-
-    void FrameToPane( int* x, int* y );
-
-        // Coordinate translation between parent's frame and this pane.
-        // Internal function called by plugins.
-
-    void PaneToFrame( int* x, int* y );
-
-        // Coordinate translation between parent's frame and this pane.
-        // Internal function called by plugins.
-
-    void FrameToPane( wxRect* pRect );
-
-        // Coordinate translation between parent's frame and this pane.
-        // Internal function called by plugins.
-
-    void PaneToFrame( wxRect* pRect );
-
-        // Returns true if pos is within the given rectangle.
-        // Internal function called by plugins.
-
-    inline bool HasPoint( const wxPoint& pos, int x, int y, int width, int height );
-
-        // Returns the minimal row height for the given row.
-        // Internal function called by plugins.
-
-    int GetMinimalRowHeight( cbRowInfo* pRow );
-
-        // Sets the row height for the given height. newHeight includes the height of row handles, if present.
-        // Internal function called by plugins.
-
-    void SetRowHeight( cbRowInfo* pRow, int newHeight );
-
-        // Inserts the bar at the given row number.
-        // Internal function called by plugins.
-
-    void DoInsertBar( cbBarInfo* pBar, int rowNo );
-
-public: /* protected really (accessed only by plugins) */
-
-        // Generates a cbDrawBarDecorEvent and sends it to the layout to paint the bar decorations.
-        // Internal function called by plugins.
-
-    virtual void PaintBarDecorations( cbBarInfo* pBar, wxDC& dc );
-
-        // Generates a cbDrawBarHandlesEvent and sends it to the layout to paint the bar handles.
-        // Internal function called by plugins.
-
-    virtual void PaintBarHandles( cbBarInfo* pBar, wxDC& dc );
-
-        // Calls PaintBarDecorations and PaintBarHandles.
-        // Internal function called by plugins.
-
-    virtual void PaintBar( cbBarInfo* pBar, wxDC& dc );
-
-        // Generates cbDrawRowHandlesEvent and cbDrawRowDecorEvent and sends them to the layout.
-        // Internal function called by plugins.
-
-    virtual void PaintRowHandles( cbRowInfo* pRow, wxDC& dc );
-
-        // Generates cbDrawRowBkGroundEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual void PaintRowBackground ( cbRowInfo* pRow, wxDC& dc );
-
-        // Calls PaintBarDecorations for each row.
-        // Internal function called by plugins.
-
-    virtual void PaintRowDecorations( cbRowInfo* pRow, wxDC& dc );
-
-        // Calls PaintRowBackground, PaintRowDecorations, PaintRowHandles.
-        // Internal function called by plugins.
-
-    virtual void PaintRow( cbRowInfo* pRow, wxDC& dc );
-
-        // Generates cbDrawPaneBkGroundEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual void PaintPaneBackground( wxDC& dc );
-
-        // Generates cbDrawPaneDecorEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual void PaintPaneDecorations( wxDC& dc );
-
-        // Paints the pane background, the row background and decorations,
-        // and finally the pane decorations.
-        // Internal function called by plugins.
-
-    virtual void PaintPane( wxDC& dc );
-
-        // Generates a cbSizeBarWndEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual void SizeBar( cbBarInfo* pBar );
-
-        // Calls SizeBar for each bar in the row.
-        // Internal function called by plugins.
-
-    virtual void SizeRowObjects( cbRowInfo* pRow );
-
-        // Calls SizeRowObjects for each row.
-        // Internal function called by plugins.
-
-    virtual void SizePaneObjects();
-
-        // Generates cbStartDrawInAreaEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual wxDC* StartDrawInArea ( const wxRect& area );
-
-        // Generates cbFinishDrawInAreaEvent and sends it to the layout.
-        // Internal function called by plugins.
-
-    virtual void  FinishDrawInArea( const wxRect& area );
-
-public: /* public members */
-
-        // Default constructor.
-
-    cbDockPane(void);
-
-        // Constructor, taking alignment and layout panel.
-
-    cbDockPane( int alignment, wxFrameLayout* pPanel );
-
-        // Sets pane's margins in frame's coordinate orientations.
-
-    void SetMargins( int top, int bottom, int left, int right );
-
-        // Destructor.
-
-    virtual ~cbDockPane();
-
-        // Removes the bar from this pane. Does not destroy the bar.
-
-    virtual void RemoveBar( cbBarInfo* pBar );
-
-        // Inserts the bar into this pane. rect is given in the parent frame's coordinates.
-
-    virtual void InsertBar( cbBarInfo* pBar, const wxRect& rect );
-
-        // Inserts the bar into the given row, with dimensions and position
-        // stored in pBarInfo->mBounds. Returns the node of inserted bar.
-
-    virtual void InsertBar( cbBarInfo* pBar, cbRowInfo* pIntoRow );
-
-        // Inserts bar and sets its position according to the preferred settings
-        // given in pBarInfo.
-
-    virtual void InsertBar( cbBarInfo* pBarInfo );
-
-        // Removes the row from this pane. Does not destroy the row object.
-
-    virtual void RemoveRow( cbRowInfo* pRow );
-
-        // Inserts a row. Does not refresh the inserted row immediately.
-        // If pBeforeRowNode is NULL, the row is appended to the end of pane's row list.
-
-    virtual void InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow );
-
-        // Sets pane's width in the pane's coordinates (including margins).
-
-    void SetPaneWidth(int width);
-
-        // Set the position and dimensions of the pane in the parent frame's coordinates.
-
-    void SetBoundsInParent( const wxRect& rect );
-
-        // Returns the bounds of the pane, in parent coordinates.
-
-    inline wxRect& GetRealRect() { return mBoundsInParent; }
-
-        // Returns an array of rows. Used by updates-managers.
-
-    inline RowArrayT& GetRowList() { return mRows; }
-
-        // Returns the first row.
-
-    inline cbRowInfo* GetFirstRow()
-
-        { return mRows.GetCount() ? mRows[0] : NULL; }
-
-        // Returns true if the given bar is present in this pane.
-
-    bool BarPresent( cbBarInfo* pBar );
-
-        // Returns the height in the pane's coordinates.
-
-    int GetPaneHeight();
-
-        // Returns the alignment for this pane. The value is one of
-        // FL_ALIGN_TOP, FL_ALIGN_BOTTOM, FL_ALIGN_LEFT, FL_ALIGN_RIGHT.
-
-    int GetAlignment();
-
-        // Returns true if the given mask matches the pane's mask.
-
-    bool MatchesMask( int paneMask );
-
-        // Returns true if the pane is aligned to the top or bottom.
-
-    inline bool IsHorizontal()
-    {
-        return (mAlignment == FL_ALIGN_TOP ||
-                mAlignment == FL_ALIGN_BOTTOM );
-    }
-
-        // Generates events to perform layout calculations.
-
-    virtual void RecalcLayout();
-
-        // Returns wxCBAR_DOCKED_HORIZONTALLY if the alignment is top or bottom,
-        // or wxCBAR_DOCKED_VERTICALLY otherwise.
-
-    virtual int GetDockingState();
-
-        // Returns the result of hit-testing items in the pane.
-        // See CB_HITTEST_RESULT enumerated type.
-        // pos is the position in this pane's coordinates.
-
-    virtual int HitTestPaneItems( const wxPoint& pos,
-                                  cbRowInfo**    ppRow,
-                                  cbBarInfo**    ppBar
-                                );
-
-        // Returns the bar's resize range.
-
-    void GetBarResizeRange( cbBarInfo* pBar, int* from, int *till, bool forLeftHandle );
-
-        // Returns the row's resize range.
-
-    void GetRowResizeRange( cbRowInfo* pRow, int* from, int* till, bool forUpperHandle );
-
-        // Finds the bar information by corresponding window.
-
-    cbBarInfo* GetBarInfoByWindow( wxWindow* pBarWnd );
-
-public: /* protected really (accessed only by plugins) */
-
-        // Row/bar resizing related helper-method.
-
-    void DrawVertHandle ( wxDC& dc, int x, int y, int height );
-
-        // Row/bar resizing related helper-method.
-
-    void DrawHorizHandle( wxDC& dc, int x, int y, int width  );
-
-        // Row/bar resizing related helper-method.
-
-    void ResizeRow( cbRowInfo* pRow, int ofs, bool forUpperHandle );
-
-        // Row/bar resizing related helper-method.
-
-    void ResizeBar( cbBarInfo* pBar, int ofs, bool forLeftHandle );
-
-        // Returns row shape data.
-        // cbBarShapeData objects will be added to the given pLst.
-        // cbBarShapeData is used for storing the original bar's positions in the row,
-        // when the 'non-destructive-friction' option is turned on.
-
-    void GetRowShapeData( cbRowInfo* pRow, wxList* pLst );
-
-        // Sets the shape data for the given row, using the data provided in pLst.
-        // cbBarShapeData is used for storing the original bar's positions in the row,
-        // when the 'non-destructive-friction' option is turned on.
-
-    void SetRowShapeData( cbRowInfo* pRowNode, wxList* pLst );
-};
-
-/*
-This class declares an abstract interface for optimized logic that should refresh
-areas of frame layout that actually need to be updated. This should be extended in future
-to implement a custom updating strategy.
-*/
-
-class WXDLLIMPEXP_FL cbUpdatesManagerBase : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS( cbUpdatesManagerBase )
-
-public: /* protected really, accessed by serializer (if any) */
-
-    wxFrameLayout* mpLayout;
-
-public:
-        // Default constructor
-
-    cbUpdatesManagerBase(void)
-        : mpLayout( 0 ) {}
-
-        // Constructor taking layout panel.
-
-    cbUpdatesManagerBase( wxFrameLayout* pPanel )
-        : mpLayout( pPanel ) {}
-
-        // Destructor.
-
-    virtual ~cbUpdatesManagerBase() {}
-
-        // Sets the associated layout.
-
-    void SetLayout( wxFrameLayout* pLayout ) { mpLayout = pLayout; }
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnStartChanges() = 0;
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnRowWillChange( cbRowInfo* WXUNUSED(pRow), cbDockPane* WXUNUSED(pInPane) ) {}
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnBarWillChange( cbBarInfo* WXUNUSED(pBar), cbRowInfo* WXUNUSED(pInRow), cbDockPane* WXUNUSED(pInPane) ) {}
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnPaneMarginsWillChange( cbDockPane* WXUNUSED(pPane) ) {}
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnPaneWillChange( cbDockPane* WXUNUSED(pPane) ) {}
-
-        // This function receives a notification from the frame layout (in the order in which
-        // they would usually be invoked). Custom updates-managers may utilize
-        // these notifications to implement a more fine-grained updating strategy.
-
-    virtual void OnFinishChanges() {}
-
-        // Refreshes parts of the frame layout that need an update.
-
-    virtual void UpdateNow() = 0;
-};
-
-/*
-Base class for all control-bar plugin events.
-This is not a dynamically-creatable class.
-*/
-
-class cbPluginEvent : public wxEvent
-{
-public:
-        // NULL if event is not addressed to any specific pane.
-
-    cbDockPane* mpPane;
-
-        // Not used, but required.
-
-    virtual wxEvent* Clone() const { return NULL; }
-
-        // Constructor, taking event type and pane.
-
-    cbPluginEvent( wxEventType eventType, cbDockPane* pPane )
-        : mpPane( pPane )
-
-        { m_eventType = eventType; }
-};
-
-// event types handled by plugins
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_DOWN;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_UP;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RIGHT_DOWN;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RIGHT_UP;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_MOTION;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_DCLICK;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LAYOUT_ROW;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RESIZE_ROW;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LAYOUT_ROWS;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_INSERT_BAR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RESIZE_BAR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_REMOVE_BAR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_SIZE_BAR_WND;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_BAR_DECOR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_DECOR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_PANE_DECOR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_BAR_HANDLES;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_HANDLES;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_BKGROUND;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_PANE_BKGROUND;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_START_BAR_DRAGGING;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_HINT_RECT;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_START_DRAW_IN_AREA;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_FINISH_DRAW_IN_AREA;
-
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_CUSTOMIZE_BAR;
-extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_CUSTOMIZE_LAYOUT;
-
-extern WXDLLIMPEXP_FL wxEventType wxCUSTOM_CB_PLUGIN_EVENTS_START_AT;
-
-// Forward declarations, separated by categories.
-
-class cbLeftDownEvent;
-class cbLeftUpEvent;
-class cbRightDownEvent;
-class cbRightUpEvent;
-class cbMotionEvent;
-class cbLeftDClickEvent;
-
-class cbLayoutRowEvent;
-class cbResizeRowEvent;
-class cbLayoutRowsEvent;
-class cbInsertBarEvent;
-class cbResizeBarEvent;
-class cbRemoveBarEvent;
-class cbSizeBarWndEvent;
-
-class cbDrawBarDecorEvent;
-class cbDrawRowDecorEvent;
-class cbDrawPaneDecorEvent;
-class cbDrawBarHandlesEvent;
-class cbDrawRowHandlesEvent;
-class cbDrawRowBkGroundEvent;
-class cbDrawPaneBkGroundEvent;
-
-class cbStartBarDraggingEvent;
-class cbDrawHintRectEvent;
-
-class cbStartDrawInAreaEvent;
-class cbFinishDrawInAreaEvent;
-
-class cbCustomizeBarEvent;
-class cbCustomizeLayoutEvent;
-
-// Definitions for for handler-methods.
-
-typedef void (wxEvtHandler::*cbLeftDownHandler        )(cbLeftDownEvent&);
-typedef void (wxEvtHandler::*cbLeftUpHandler          )(cbLeftUpEvent&);
-typedef void (wxEvtHandler::*cbRightDownHandler       )(cbRightDownEvent&);
-typedef void (wxEvtHandler::*cbRightUpHandler         )(cbRightUpEvent&);
-typedef void (wxEvtHandler::*cbMotionHandler          )(cbMotionEvent&);
-typedef void (wxEvtHandler::*cbLeftDClickHandler      )(cbLeftDClickEvent&);
-
-typedef void (wxEvtHandler::*cbLayoutRowHandler       )(cbLayoutRowEvent&);
-typedef void (wxEvtHandler::*cbResizeRowHandler       )(cbResizeRowEvent&);
-typedef void (wxEvtHandler::*cbLayoutRowsHandler      )(cbLayoutRowsEvent&);
-typedef void (wxEvtHandler::*cbInsertBarHandler       )(cbInsertBarEvent&);
-typedef void (wxEvtHandler::*cbResizeBarHandler       )(cbResizeBarEvent&);
-typedef void (wxEvtHandler::*cbRemoveBarHandler       )(cbRemoveBarEvent&);
-typedef void (wxEvtHandler::*cbSizeBarWndHandler      )(cbSizeBarWndEvent&);
-
-typedef void (wxEvtHandler::*cbDrawBarDecorHandler    )(cbDrawBarDecorEvent&);
-typedef void (wxEvtHandler::*cbDrawRowDecorHandler    )(cbDrawRowDecorEvent&);
-typedef void (wxEvtHandler::*cbDrawPaneDecorHandler   )(cbDrawPaneDecorEvent&);
-typedef void (wxEvtHandler::*cbDrawBarHandlesHandler  )(cbDrawBarHandlesEvent&);
-typedef void (wxEvtHandler::*cbDrawRowHandlesHandler  )(cbDrawRowHandlesEvent&);
-typedef void (wxEvtHandler::*cbDrawRowBkGroundHandler )(cbDrawRowBkGroundEvent&);
-typedef void (wxEvtHandler::*cbDrawPaneBkGroundHandler)(cbDrawPaneBkGroundEvent&);
-
-typedef void (wxEvtHandler::*cbStartBarDraggingHandler )(cbStartBarDraggingEvent&);
-typedef void (wxEvtHandler::*cbDrawHintRectHandler     )(cbDrawHintRectEvent&);
-
-typedef void (wxEvtHandler::*cbStartDrawInAreaHandler )(cbStartDrawInAreaEvent&);
-typedef void (wxEvtHandler::*cbFinishDrawInAreaHandler)(cbFinishDrawInAreaEvent&);
-
-typedef void (wxEvtHandler::*cbCustomizeBarHandler    )(cbCustomizeBarEvent&);
-typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&);
-
-// Macros for creating event table entries for plugin-events.
-
-#define EVT_PL_LEFT_DOWN(func)   wxEventTableEntry( cbEVT_PL_LEFT_DOWN,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_UP(func)     wxEventTableEntry( cbEVT_PL_LEFT_UP,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler     ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_DOWN(func)  wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_UP(func)    wxEventTableEntry( cbEVT_PL_RIGHT_UP,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_MOTION(func)      wxEventTableEntry( cbEVT_PL_MOTION,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler     ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_DCLICK(func) wxEventTableEntry( cbEVT_PL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler ) & func, (wxObject *) NULL ),
-
-#define EVT_PL_LAYOUT_ROW(func)   wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_ROW(func)   wxEventTableEntry( cbEVT_PL_RESIZE_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_LAYOUT_ROWS(func)  wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_INSERT_BAR(func)   wxEventTableEntry( cbEVT_PL_INSERT_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_BAR(func)   wxEventTableEntry( cbEVT_PL_RESIZE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_REMOVE_BAR(func)   wxEventTableEntry( cbEVT_PL_REMOVE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_SIZE_BAR_WND(func) wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler ) & func, (wxObject *) NULL ),
-
-#define EVT_PL_DRAW_BAR_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_DECOR(func)    wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_BAR_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_BKGROUND(func) wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
-
-#define EVT_PL_START_BAR_DRAGGING(func) wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_HINT_RECT(func)     wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),
-
-
-#define EVT_PL_START_DRAW_IN_AREA(func)  wxEventTableEntry( cbEVT_PL_START_DRAW_IN_AREA,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartDrawInAreaHandler)  & func, (wxObject *) NULL ),
-#define EVT_PL_FINISH_DRAW_IN_AREA(func) wxEventTableEntry( cbEVT_PL_FINISH_DRAW_IN_AREA, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbFinishDrawInAreaHandler) & func, (wxObject *) NULL ),
-
-#define EVT_PL_CUSTOMIZE_BAR(func)       wxEventTableEntry( cbEVT_PL_CUSTOMIZE_BAR,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbCustomizeBarHandler)     & func, (wxObject *) NULL ),
-#define EVT_PL_CUSTOMIZE_LAYOUT(func)    wxEventTableEntry( cbEVT_PL_CUSTOMIZE_LAYOUT,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbCustomizeLayoutHandler)  & func, (wxObject *) NULL ),
-
-/*
-Abstract base class for all control-bar related plugins.
-Note: pointer positions of mouse events sent to plugins
-are always in the pane's coordinates (the pane to which
-this plugin is hooked).
-*/
-
-class cbPluginBase : public wxEvtHandler
-{
-    DECLARE_ABSTRACT_CLASS( cbPluginBase )
-public:
-        // Back-reference to the frame layout.
-
-    wxFrameLayout* mpLayout;
-
-        // Specifies panes for which this plugin receives events
-        // (see pane masks definitions).
-
-    int            mPaneMask;
-
-        // Is true when plugin is ready to handle events.
-
-    bool           mIsReady;
-
-public:
-        // Default constructor.
-
-    cbPluginBase()
-
-        : mpLayout  ( 0 ),
-          mPaneMask( wxALL_PANES ),
-          mIsReady ( false )
-    {}
-
-        // Constructor taking layout panel and a mask.
-
-    cbPluginBase( wxFrameLayout* pPanel, int paneMask = wxALL_PANES )
-
-        : mpLayout  ( pPanel ),
-          mPaneMask( paneMask ),
-          mIsReady ( false )
-    {}
-
-        // Returns the pane mask.
-
-    inline int GetPaneMask() { return mPaneMask; }
-
-        // Destructor. Destroys the whole plugin chain of connected plugins.
-
-    virtual ~cbPluginBase();
-
-        // Override this method to do plugin-specific initialization.
-        // At this point plugin is already attached to the frame layout,
-        // and pane masks are set.
-
-    virtual void OnInitPlugin() { mIsReady = true; }
-
-        // Returns true if the plugin is ready to receive events.
-
-    bool IsReady() { return mIsReady; }
-
-        // Overridden to determine whether the target pane specified in the
-        // event matches the pane mask of this plugin (specific plugins
-        // do not override this method).
-
-    virtual bool ProcessEvent(wxEvent& event);
-};
-
-/*
-Class for mouse left down events.
-*/
-
-class cbLeftDownEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbLeftDownEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_LEFT_DOWN, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for mouse left up events.
-*/
-
-class cbLeftUpEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbLeftUpEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_LEFT_UP, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for mouse right down events.
-*/
-
-class cbRightDownEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbRightDownEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_RIGHT_DOWN, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for mouse right up events.
-*/
-
-class cbRightUpEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbRightUpEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_RIGHT_UP, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for mouse motion events.
-*/
-
-class cbMotionEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbMotionEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_MOTION, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for mouse left double click events.
-*/
-
-class cbLeftDClickEvent : public cbPluginEvent
-{
-public:
-    wxPoint mPos;
-
-        // Constructor, taking mouse position and pane.
-
-    cbLeftDClickEvent( const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_LEFT_DCLICK, pPane ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for single row layout events.
-*/
-
-class cbLayoutRowEvent : public cbPluginEvent
-{
-public:
-    cbRowInfo* mpRow;
-
-        // Constructor, taking row information and pane.
-
-    cbLayoutRowEvent( cbRowInfo* pRow, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_LAYOUT_ROW, pPane ),
-          mpRow( pRow )
-    {}
-};
-
-/*
-Class for row resize events.
-*/
-
-class cbResizeRowEvent : public cbPluginEvent
-{
-public:
-    cbRowInfo* mpRow;
-    int        mHandleOfs;
-    bool       mForUpperHandle;
-
-        // Constructor, taking row information, two parameters of currently unknown use, and pane.
-
-    cbResizeRowEvent( cbRowInfo* pRow, int handleOfs, bool forUpperHandle, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_RESIZE_ROW, pPane ),
-          mpRow( pRow ),
-          mHandleOfs( handleOfs ),
-          mForUpperHandle( forUpperHandle )
-    {}
-};
-
-/*
-Class for multiple rows layout events.
-*/
-
-class cbLayoutRowsEvent : public cbPluginEvent
-{
-public:
-
-        // Constructor, taking pane.
-
-    cbLayoutRowsEvent( cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_LAYOUT_ROWS, pPane )
-    {}
-};
-
-/*
-Class for bar insertion events.
-*/
-
-class cbInsertBarEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo*  mpBar;
-    cbRowInfo*  mpRow;
-
-        // Constructor, taking bar information, row information, and pane.
-
-    cbInsertBarEvent( cbBarInfo* pBar, cbRowInfo* pIntoRow, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_INSERT_BAR, pPane ),
-
-          mpBar( pBar     ),
-          mpRow( pIntoRow )
-    {}
-};
-
-/*
-Class for bar resize events.
-*/
-
-class cbResizeBarEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-    cbRowInfo* mpRow;
-
-        // Constructor, taking bar information, row information, and pane.
-
-    cbResizeBarEvent( cbBarInfo* pBar, cbRowInfo* pRow, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_RESIZE_BAR, pPane ),
-          mpBar( pBar ),
-          mpRow( pRow )
-    {}
-};
-
-/*
-Class for bar removal events.
-*/
-
-class cbRemoveBarEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-
-        // Constructor, taking bar information and pane.
-
-    cbRemoveBarEvent( cbBarInfo* pBar, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_REMOVE_BAR, pPane ),
-          mpBar( pBar )
-    {}
-};
-
-/*
-Class for bar window resize events.
-*/
-
-class cbSizeBarWndEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-    wxRect     mBoundsInParent;
-
-        // Constructor, taking bar information and pane.
-
-    cbSizeBarWndEvent( cbBarInfo* pBar, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_SIZE_BAR_WND, pPane ),
-          mpBar( pBar ),
-          mBoundsInParent( pBar->mBoundsInParent )
-    {}
-};
-
-/*
-Class for bar decoration drawing events.
-*/
-
-class cbDrawBarDecorEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-    wxDC*      mpDc;
-    wxRect     mBoundsInParent;
-
-        // Constructor, taking bar information, device context, and pane.
-
-    cbDrawBarDecorEvent( cbBarInfo* pBar, wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_BAR_DECOR, pPane ),
-          mpBar( pBar ),
-          mpDc( &dc ),
-          mBoundsInParent( pBar->mBoundsInParent )
-    {}
-};
-
-/*
-Class for row decoration drawing events.
-*/
-
-class cbDrawRowDecorEvent : public cbPluginEvent
-{
-public:
-    cbRowInfo* mpRow;
-    wxDC*      mpDc;
-
-        // Constructor, taking row information, device context, and pane.
-
-    cbDrawRowDecorEvent( cbRowInfo* pRow, wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_ROW_DECOR, pPane ),
-          mpRow( pRow ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for pane decoration drawing events.
-*/
-
-class cbDrawPaneDecorEvent : public cbPluginEvent
-{
-public:
-    wxDC* mpDc;
-
-        // Constructor, taking device context and pane.
-
-    cbDrawPaneDecorEvent( wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_PANE_DECOR, pPane ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for bar handles drawing events.
-*/
-
-class cbDrawBarHandlesEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-    wxDC*   mpDc;
-
-        // Constructor, taking bar information, device context, and pane.
-
-    cbDrawBarHandlesEvent( cbBarInfo* pBar, wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_BAR_HANDLES, pPane ),
-          mpBar( pBar ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for row handles drawing events.
-*/
-
-class cbDrawRowHandlesEvent : public cbPluginEvent
-{
-public:
-    cbRowInfo* mpRow;
-    wxDC*      mpDc;
-
-        // Constructor, taking row information, device context, and pane.
-
-    cbDrawRowHandlesEvent( cbRowInfo* pRow, wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_ROW_HANDLES, pPane ),
-          mpRow( pRow ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for row background drawing events.
-*/
-
-class cbDrawRowBkGroundEvent : public cbPluginEvent
-{
-public:
-    cbRowInfo* mpRow;
-    wxDC*   mpDc;
-
-        // Constructor, taking row information, device context, and pane.
-
-    cbDrawRowBkGroundEvent( cbRowInfo* pRow, wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_ROW_BKGROUND, pPane ),
-          mpRow( pRow ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for pane background drawing events.
-*/
-
-class cbDrawPaneBkGroundEvent : public cbPluginEvent
-{
-public:
-    wxDC* mpDc;
-
-        // Constructor, taking device context and pane.
-
-    cbDrawPaneBkGroundEvent( wxDC& dc, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_PANE_BKGROUND, pPane ),
-          mpDc( &dc )
-    {}
-};
-
-/*
-Class for start-bar-dragging events.
-*/
-
-class cbStartBarDraggingEvent : public cbPluginEvent
-{
-public:
-    cbBarInfo* mpBar;
-    wxPoint    mPos;  // is given in frame's coordinates
-
-        // Constructor, taking bar information, mouse position, and pane.
-
-    cbStartBarDraggingEvent( cbBarInfo* pBar, const wxPoint& pos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_START_BAR_DRAGGING, pPane ),
-          mpBar( pBar ),
-          mPos( pos )
-    {}
-};
-
-/*
-Class for hint-rectangle drawing events.
-*/
-
-class cbDrawHintRectEvent : public cbPluginEvent
-{
-public:
-    wxRect mRect;       // is given in frame's coordinates
-
-
-    bool   mLastTime;  // indicates that this event finishes "session" of on-screen drawing,
-                       // thus associated resources can be freed now
-    bool   mEraseRect; // does not have any impact, if recangle is drawn using XOR-mask
-
-    bool   mIsInClient;// in cleint area hint could be drawn differently,
-                       // e.g. with fat/hatched border
-
-
-        // Constructor, taking hint rectangle and three flags.
-
-    cbDrawHintRectEvent( const wxRect& rect, bool isInClient, bool eraseRect, bool lastTime )
-
-        : cbPluginEvent( cbEVT_PL_DRAW_HINT_RECT, 0 ),
-          mRect      ( rect       ),
-          mLastTime  ( lastTime   ),
-          mEraseRect ( eraseRect  ),
-          mIsInClient( isInClient )
-    {}
-};
-
-/*
-Class for start drawing in area events.
-*/
-
-class cbStartDrawInAreaEvent : public cbPluginEvent
-{
-public:
-    wxRect mArea;
-    wxDC** mppDc; // points to pointer, where the reference
-                  // to the obtained buffer-context should be placed
-
-        // Constructor, taking rectangular area, device context pointer to a pointer, and pane.
-
-    cbStartDrawInAreaEvent( const wxRect& area, wxDC** ppDCForArea, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_START_DRAW_IN_AREA, pPane ),
-          mArea( area ),
-          mppDc( ppDCForArea )
-    {}
-};
-
-/*
-Class for finish drawing in area events.
-*/
-
-class cbFinishDrawInAreaEvent : public cbPluginEvent
-{
-public:
-    wxRect mArea;
-
-        // Constructor, taking rectangular area and pane.
-
-    cbFinishDrawInAreaEvent( const wxRect& area, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_FINISH_DRAW_IN_AREA, pPane ),
-          mArea( area )
-    {}
-};
-
-/*
-Class for bar customization events.
-*/
-
-class cbCustomizeBarEvent : public cbPluginEvent
-{
-public:
-    wxPoint    mClickPos; // in parent frame's coordinates
-    cbBarInfo* mpBar;
-
-        // Constructor, taking bar information, mouse position, and pane.
-
-    cbCustomizeBarEvent( cbBarInfo* pBar, const wxPoint& clickPos, cbDockPane* pPane )
-
-        : cbPluginEvent( cbEVT_PL_CUSTOMIZE_BAR, pPane ),
-          mClickPos( clickPos ),
-          mpBar( pBar )
-    {}
-};
-
-/*
-Class for layout customization events.
-*/
-
-class cbCustomizeLayoutEvent : public cbPluginEvent
-{
-public:
-    wxPoint mClickPos; // in parent frame's coordinates
-
-        // Constructor, taking mouse position.
-
-    cbCustomizeLayoutEvent( const wxPoint& clickPos )
-
-        : cbPluginEvent( cbEVT_PL_CUSTOMIZE_LAYOUT, 0 ),
-          mClickPos( clickPos )
-    {}
-};
-
-#endif /* __CONTROLBAR_G__ */
-
diff --git a/contrib/include/wx/fl/dynbarhnd.h b/contrib/include/wx/fl/dynbarhnd.h
deleted file mode 100644
index ad620c185b..0000000000
--- a/contrib/include/wx/fl/dynbarhnd.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynbarhnd.h
-// Purpose:     This header simply includes controlbar.h.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     23/01/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __DYNBARHND_G__
-#define __DYNBARHND_G__
-
-#include "wx/fl/controlbar.h"
-
-#endif /* __DYNBARHND_G__ */
-
diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
deleted file mode 100644
index 5db0c21d85..0000000000
--- a/contrib/include/wx/fl/dyntbar.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dyntbar.h
-// Purpose:     wxDynamicToolBar header
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     ??/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __DYNTBAR_G__
-#define __DYNTBAR_G__
-
-#include "wx/tbarbase.h"
-#include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"
-
-/*
-Tool layout item.
-*/
-
-class WXDLLIMPEXP_FL wxToolLayoutItem : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
-
-public:
-    wxRect    mRect;
-    bool      mIsSeparator;
-};
-
-class WXDLLIMPEXP_FL wxDynToolInfo;
-
-typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
-typedef wxDynToolInfo*    wxDynToolInfoPtrT;
-
-WXFL_DEFINE_ARRAY_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WXFL_DEFINE_ARRAY_PTR( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
-
-/*
-This is a base class for layout algorithm implementations.
-*/
-
-class WXDLLIMPEXP_FL LayoutManagerBase
-{
-public:
-        // Constructor.
-    virtual void Layout( const wxSize&       parentDim,
-                         wxSize&             resultingDim,
-                         wxLayoutItemArrayT& items,
-                         int                 horizGap,
-                         int                 vertGap   ) = 0;
-
-        // Destructor.
-    virtual ~LayoutManagerBase() {}
-};
-
-/*
-BagLayout lays out items in left-to-right order from
-top to bottom.
-*/
-
-class WXDLLIMPEXP_FL BagLayout : public LayoutManagerBase
-{
-public:
-        // Constructor.
-    virtual void Layout( const wxSize&       parentDim, 
-                         wxSize&             resultingDim,
-                         wxLayoutItemArrayT& items,
-                         int                 horizGap,
-                         int                 vertGap   );
-};
-
-/*
-This class holds dynamic toolbar item information.
-*/
-
-class WXDLLIMPEXP_FL wxDynToolInfo : public wxToolLayoutItem
-{
-    DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
-
-public:
-    wxWindow* mpToolWnd;
-    int       mIndex;
-    wxSize    mRealSize;
-};
-
-// Layout orientations for tools
-
-#define LO_HORIZONTAL    0
-#define LO_VERTICAL      1
-#define LO_FIT_TO_WINDOW 2
-
-/*
-wxDynamicToolBar manages containment and layout of tool windows.
-*/
-
-class WXDLLIMPEXP_FL wxDynamicToolBar : public wxToolBarBase
-{
-protected:
-    friend class wxDynamicToolBarSerializer;
-
-    wxDynToolInfoArrayT mTools;
-    LayoutManagerBase*  mpLayoutMan;
-
-protected:
-        // Internal function for sizing tool windows.
-    virtual void SizeToolWindows();
-
-public: /* public properties */
-
-    int                mSepartorSize; // default: 8
-    int                mVertGap;      // default: 0
-    int                mHorizGap;      // default: 0
-
-public:
-        // Default constructor.
-
-    wxDynamicToolBar();
-
-        // Constructor: see the documentation for wxToolBar for details.
-
-    wxDynamicToolBar(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                 const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
-                 const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
-
-        // Destructor.
-
-    ~wxDynamicToolBar(void);
-
-        // Creation function: see the documentation for wxToolBar for details.
-
-    bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                const long style = wxNO_BORDER, const int orientation = wxVERTICAL, const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
-
-        // Adds a tool. See the documentation for wxToolBar for details.
-
-    virtual void AddTool( int toolIndex, 
-                              wxWindow* pToolWindow,
-                              const wxSize& size = wxDefaultSize );
-
-        // Adds a tool. See the documentation for wxToolBar for details.
-
-    virtual void AddTool( int toolIndex,
-                              const wxString& imageFileName,
-                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = wxT(""), bool alignTextRight = false,
-                              bool isFlat = true );
-        // Adds a tool. See the documentation for wxToolBar for details.
-
-    virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = wxT(""), bool alignTextRight = false,
-                              bool isFlat = true );
-
-        // Unhide method from parent.
-
-    virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool)
-                              { return wxToolBarBase::AddTool(tool); };
-
-    // Method from wxToolBarBase (for compatibility), only
-    // the first two arguments are valid.
-    // See the documentation for wxToolBar for details.
-
-    virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-               const bool toggle = false, const long xPos = wxDefaultCoord, const long yPos = wxDefaultCoord, wxObject *clientData = NULL,
-               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
-
-        // Adds a separator. See the documentation for wxToolBar for details.
-
-    virtual void AddSeparator( wxWindow* pSepartorWnd );
-
-        // Unhide method from parent.
-
-    virtual wxToolBarToolBase *AddSeparator()
-                              { return wxToolBarBase::AddSeparator(); };
-
-        // Returns tool information for the given tool index.
-
-    wxDynToolInfo* GetToolInfo( int toolIndex );
-
-        // Removes the given tool. Misspelt in order not to clash with a similar function
-        // in the base class.
-
-    void RemveTool( int toolIndex );
-
-        // Draws a separator. The default implementation draws a shaded line.
-
-    virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
-
-        // Performs layout. See definitions of orientation types.
-
-    virtual bool Layout();
-
-        // Returns the preferred dimension, taking the given dimension and a reference to the result.
-
-    virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );
-
-        // Creates the default layout (BagLayout).
-
-    virtual LayoutManagerBase* CreateDefaultLayout() { return new BagLayout(); }
-
-        // Sets the layout for this toolbar.
-
-    virtual void SetLayout( LayoutManagerBase* pLayout );
-
-        // Enables or disables the given tool.
-
-    virtual void EnableTool(int toolIndex, bool enable = true);
-
-        // Responds to size events, calling Layout.
-
-    void OnSize( wxSizeEvent& event );
-
-        // Responds to paint events, drawing separators.
-
-    void OnPaint( wxPaintEvent& event );
-
-        // Responds to background erase events. Currently does nothing.
-
-    void OnEraseBackground( wxEraseEvent& event );
-
-        // Overriden from wxToolBarBase; does nothing.
-
-    virtual bool Realize(void);
-
-        // Finds a tool for the given position.
-
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x,
-                                                   wxCoord y) const;
-
-        // Inserts a tool at the given position.
-
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-
-        // Deletes a tool. The tool is still in m_tools list when this function is called, and it will
-        // only be deleted from it if it succeeds.
-
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-        // Called when the tools enabled flag changes.
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-
-        // Called when the tool is toggled.
-
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-
-        // Called when the tools 'can be toggled' flag changes.
-
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-        // Creates a toolbar tool.
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-
-        // Creates a toolbar tool.
-
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
-};
-
-#endif /* __DYNTBAR_G__ */
-
diff --git a/contrib/include/wx/fl/dyntbarhnd.h b/contrib/include/wx/fl/dyntbarhnd.h
deleted file mode 100644
index 279081a5ac..0000000000
--- a/contrib/include/wx/fl/dyntbarhnd.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dyntbarhnd.h
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     23/01/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __DYNTBARHND_G__
-#define __DYNTBARHND_G__
-
-#include "wx/fl/controlbar.h"
-#include "wx/fl/dyntbar.h"
-
-/*
-Dynamic toolbar dimension handler.
-*/
-
-class WXDLLIMPEXP_FL cbDynToolBarDimHandler : public cbBarDimHandlerBase
-{
-    DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler )
-public:
-
-        // Called when the bar changes state.
-
-    void OnChangeBarState(cbBarInfo* pBar, int newState );
-
-        // Called when a bar is resized.
-
-    void OnResizeBar( cbBarInfo* pBar, const wxSize& given, wxSize& preferred );
-};
-
-#endif /* __DYNTBARHND_G__ */
-
diff --git a/contrib/include/wx/fl/fldefs.h b/contrib/include/wx/fl/fldefs.h
deleted file mode 100644
index 010117b39d..0000000000
--- a/contrib/include/wx/fl/fldefs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fldefs.h
-// Purpose:     Declaration of global types and defines.
-// Author:      David M. Falkinder (david_falkinder@hp.com)
-// Modified by:
-// Created:     18/09/2002
-// RCS-ID:      $Id$
-// Copyright:   (c) David M. Falkinder
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __fldefs_H_INCLUDED__
-#define __fldefs_H_INCLUDED__
-
-#include "wx/defs.h"
-
-/*
- * If we're using wx in Dynamic Library format do we 
- * want FL to be in DLL form as well?
- */
-#ifdef WXMAKINGDLL_FL
-    #define WXDLLIMPEXP_FL WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_FL WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_FL
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Override some of the wxArray functions to
-// include our definitions
-///////////////////////////////////////////////////////////////////////////////
-#define WXFL_DEFINE_ARRAY(c,l)      \
-    class WXDLLIMPEXP_FL l;          \
-    WX_DEFINE_ARRAY(c,l)
-
-#define WXFL_DEFINE_ARRAY_PTR(c,l)\
-    class WXDLLIMPEXP_FL l;          \
-    WX_DEFINE_ARRAY_PTR(c,l)
-
-#define WXFL_DEFINE_ARRAY_LONG(t,l) \
-    class WXDLLIMPEXP_FL l;          \
-    WX_DEFINE_ARRAY_LONG(t,l)
-
-
-#endif // __fldefs_H_INCLUDED__
diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
deleted file mode 100644
index 1d371dc942..0000000000
--- a/contrib/include/wx/fl/frmview.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        frmview.h
-// Purpose:     wxFrameView and wxFrameManager classes.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     02/01/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __FRMVIEW_G__
-#define __FRMVIEW_G__
-
-#include "wx/module.h"
-
-#if 0
-#include "wx/fl/objstore.h"
-#endif
-
-class wxObjectStorage;
-
-#include "wx/fl/controlbar.h"
-
-class wxFrameManager;
-
-/*
-It is not clear what this class does. It is not used elsewhere in FL.
-*/
-
-class WXDLLIMPEXP_FL wxFrameView : public wxEvtHandler
-{
-protected:
-    wxStringList    mTopMenus;
-    wxFrameLayout*  mpLayout;
-    wxFrameManager* mpFrameMgr;
-    bool            mDoToolUpdates;
-
-    friend class wxFrameManager;
-    friend class wxFrameViewSerializer;
-
-protected:
-    void OnIdle( wxIdleEvent& event);
-
-public:
-    wxFrameView();
-    ~wxFrameView();
-
-    virtual void Activate();
-    virtual void Deactivate();
-
-    wxFrame* GetParentFrame();
-    wxWindow* GetClientWindow();
-
-    wxFrameManager& GetFrameManager();
-
-    void RegisterMenu( const wxString& topMenuName );
-
-    void CreateLayout();
-    wxFrameLayout* GetLayout();
-    void SetLayout( wxFrameLayout* pLayout );
-    void SetToolUpdates( bool doToolUpdates = true );
-
-
-    // hooks for specific frame-views
-
-    virtual void OnInit() {}
-
-    virtual void OnSerialize( wxObjectStorage& WXUNUSED(store) ) {}
-    virtual void OnActiveate() {}
-    virtual void OnDeactivate() {}
-
-    // imp. is mandatory
-    virtual void OnRecreate() {}
-    virtual void OnInitMenus() {}
-
-    DECLARE_EVENT_TABLE()
-};
-
-class wxFrame;
-
-/*
-It is not clear what this class does. It is not used elsewhere in FL.
-*/
-
-class WXDLLIMPEXP_FL wxFrameManager : public wxObject
-{
-protected:
-    wxList       mViews;
-    wxWindow*    mpFrameWnd;
-    int          mActiveViewNo;
-    wxWindow*    mpClientWnd;
-
-#if 0
-    wxObjectStorage mStore;
-#endif
-
-    wxString        mSettingsFile;
-
-protected:
-    void DoSerialize( wxObjectStorage& store );
-    void DestroyViews();
-    int GetViewNo( wxFrameView* pView );
-    void EnableMenusForView( wxFrameView* pView, bool enable );
-    void SyncAllMenus();
-
-public:
-    wxFrameManager();
-    ~wxFrameManager();
-
-    // if file name is empty, views are are not saved/loaded
-
-    virtual void Init( wxWindow* pMainFrame,
-                       const wxString& settingsFile = wxEmptyString );
-
-    // synonyms
-    wxFrame* GetParentFrame();
-    wxWindow* GetParentWindow();
-
-    int GetActiveViewNo();
-    wxFrameView* GetActiveView();
-    wxObjectList::compatibility_iterator GetActiveViewNode();
-
-    wxFrameView* GetView( int viewNo );
-
-    void SetClinetWindow( wxWindow* pFrameClient ); 
-    wxWindow* GetClientWindow();
-
-    void AddView( wxFrameView* pFrmView );
-    void RemoveView( wxFrameView* pFrmView );
-
-    void ActivateView( int viewNo );
-    void ActivateView( wxFrameView* pFrmView );
-    void DeactivateCurrentView();
-
-    wxObjectStorage& GetObjectStore();
-
-    void SaveViewsNow();
-    bool ReloadViews();
-
-    bool ViewsAreLoaded();
-};
-
-#endif /* __FRMVIEW_G__ */
-
diff --git a/contrib/include/wx/fl/garbagec.h b/contrib/include/wx/fl/garbagec.h
deleted file mode 100644
index a394196263..0000000000
--- a/contrib/include/wx/fl/garbagec.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        garbagec.h
-// Purpose:     GarbageCollector class.
-// Author:      Aleksandras Gluchovas (@Lithuania)
-// Modified by:
-// Created:     ??/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GARBAGEC_G__
-#define __GARBAGEC_G__
-
-#include "wx/list.h"
-#include "wx/fl/fldefs.h"
-
-struct GCItem
-{
-    void*      mpObj;
-    wxList    mRefs;   // references to other nodes
-};
-
-inline void* gc_node_to_obj( wxObjectList::compatibility_iterator pGCNode )
-{
-    return ( (GCItem*) (pGCNode->GetData()) )->mpObj;
-}
-
-/*
-This class implements an extremely slow but simple garbage collection algorithm.
-*/
-
-class WXDLLIMPEXP_FL GarbageCollector
-{
-protected:
-    wxList mAllNodes;
-    wxList mRegularLst;
-    wxList mCycledLst;
-
-        // Internal method for finding a node.
-    wxNode* FindItemNode( void* pForObj );
-
-        // Internal method for resolving references.
-    void    ResolveReferences();
-
-        // Internal method for findind and freeing a node.
-    wxNode* FindReferenceFreeItemNode();
-
-        // Remove references to this node.
-    void    RemoveReferencesToNode( wxNode* pItemNode );
-
-        // Destroys a list of items.
-    void    DestroyItemList( wxList& lst );
-
-public:
-
-        // Default constructor.
-    GarbageCollector() {}
-
-        // Destructor.
-    virtual ~GarbageCollector();
-
-        // Prepare data for garbage collection.
-
-    virtual void AddObject( void* pObj, int refCnt = 1 );
-
-        // Prepare data for garbage collection.
-
-    virtual void AddDependency( void* pObj, void* pDependsOnObj );
-
-        // Executes garbage collection algorithm.
-
-    virtual void ArrangeCollection();
-
-        // Accesses the results of the algorithm.
-
-    wxList& GetRegularObjects();
-
-        // Get cycled objects.
-
-    wxList& GetCycledObjects();
-
-        // Removes all data from the garbage collector.
-
-    void Reset();
-};
-
-#endif /* __GARBAGEC_G__ */
-
diff --git a/contrib/include/wx/fl/gcupdatesmgr.h b/contrib/include/wx/fl/gcupdatesmgr.h
deleted file mode 100644
index 48b7471f45..0000000000
--- a/contrib/include/wx/fl/gcupdatesmgr.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gcupdatesmgr.h
-// Purpose:     Header for cbGCUpdatesMgr class.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     19/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GCUPDATESMGR_G__
-#define __GCUPDATESMGR_G__
-
-#include "wx/fl/controlbar.h"
-#include "wx/fl/updatesmgr.h"
-
-#include "wx/fl/garbagec.h"
-
-/*
-This class implements optimized logic for refreshing
-the areas of frame layout that actually need to be updated.
-It is used as the default updates manager by wxFrameLayout.
-
-It is called 'Garbage Collecting' updates manager because
-its implementation tries to find out dependencies between bars,
-and to order them into a 'hierarchy'. This hierarchical sorting resembles
-the implementation of heap-garbage collectors, which resolve
-dependencies between references.
-
-Example: there are situations where the order in which the user
-moves windows does matter.
-
-\begin{verbatim}
-  case 1)
-     ------            ---
-     | A     |             |B|
-        ------     --->      | |
-            ---               --- ------
-            |B|                   | A  |
-            | |                   ------
-            ---
-                        (future)
-       (past)
-\end{verbatim}
-
-Past/future positions of A and B windows completely overlap, i.e.
-depend on each other, and there is no solution for
-moving the windows without refreshing both of them
--- we have a cyclic dependency here. The garbage collection algorithm will
-find this cyclic dependecy and will force refresh after movement.
-
-\begin{verbatim}
-  case 2)
-
-     ------
-     | A     |
-        ------     --->
-            ---
-            |B|                              ------
-            | |                              | A  |
-            ---                              ------
-                         ---
-                         |B|
-                         | |
-                         ---
-
-                        (future)
-       (past)
-\end{verbatim}
-
-In this case past/future positions do not overlap, so
-it is enough only to move windows without refreshing them.
-Garbage collection will 'notice' this.
-
-There is also a third case, when overlapping is partial.
-In this case the refreshing can also be avoided by
-moving windows in the order of 'most-dependant' towards the
-'least-dependent'. GC handles this automatically, by
-sorting windows by their dependency-level (or 'hierarchy').
-
-See garbagec.h for more details of this method; garbagec.h/cpp
-implement sorting of generic dependencies and does not deal
-with graphical objects directly.
-
-Summary: garbage collection improves performance when complex or large
-windows are moved around, by reducing the number of repaints. It also helps
-to avoid dirty non-client areas of moved windows
-in some special cases of 'overlapping anomalies'.
-*/
-
-class WXDLLIMPEXP_FL cbGCUpdatesMgr : public cbSimpleUpdatesMgr
-{
-    DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
-protected:
-
-    GarbageCollector mGC;
-
-        // Internal function for repositioning items.
-    void DoRepositionItems( wxList& items );
-
-        // Internal function for repositioning items.
-    void AddItem( wxList&     itemList,
-                  cbBarInfo*  pBar,
-                  cbDockPane* pPane,
-                  wxRect&     curBounds,
-                  wxRect&     prevBounds );
-
-public:
-
-        // Default constructor.
-    cbGCUpdatesMgr(void) {}
-
-        // Constructor, taking a frame layout.
-    cbGCUpdatesMgr( wxFrameLayout* pPanel );
-
-        // Receives notifications from the frame layout.
-    virtual void OnStartChanges();
-
-        // Refreshes the parts of the frame layout which need an update.
-    virtual void UpdateNow();
-};
-
-#endif /* __GCUPDATESMGR_G__ */
-
diff --git a/contrib/include/wx/fl/hintanimpl.h b/contrib/include/wx/fl/hintanimpl.h
deleted file mode 100644
index 039e3b7de3..0000000000
--- a/contrib/include/wx/fl/hintanimpl.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        hintanimpl.h
-// Purpose:     Header for cbHintAnimationPlugin class.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     9/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __HINTANIMPL_G__
-#define __HINTANIMPL_G__
-
-#include "wx/fl/controlbar.h"
-
-#include "wx/timer.h"
-
-class WXDLLIMPEXP_FL cbHintAnimTimer;
-
-/*
-A plugin to draw animated hints when the user drags a pane.
-*/
-
-class WXDLLIMPEXP_FL cbHintAnimationPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
-protected:
-    friend class cbHintAnimTimer;
-
-    wxScreenDC*      mpScrDc;     // created while tracking hint-rect
-    cbHintAnimTimer* mpAnimTimer;
-
-    // FOR NOW:: try it without mutually exculisve locks
-    volatile wxRect  mCurRect;
-
-    // state variables
-
-    bool   mAnimStarted;
-    bool   mStopPending;
-
-    bool   mPrevInClient;
-    bool   mCurInClient;
-
-    wxRect mPrevRect;
-
-public:
-    int    mMorphDelay;         // delay between frames in miliseconds,     default: 20
-    int    mMaxFrames;          // number  of iterations for hint morphing, default: 30
-                                // (morph duration = mMorphDelay * mMaxFrames msec)
-
-    int    mInClientHintBorder; // default: 4 pixels
-
-    bool   mAccelerationOn;     // true, if morph accelerates, otherwise morph
-                                // speed is constant. Default: true
-
-    // TBD:: get/set methods for above members
-
-protected:
-
-        // Internal function for starting tracking.
-    void StartTracking();
-
-        // Internal function for drawing a hint rectangle.
-    void DrawHintRect ( wxRect& rect, bool isInClientRect);
-
-        // Internal function for erasing a hint rectangle.
-    void EraseHintRect( wxRect& rect, bool isInClientRect);
-
-        // Internal function for finishing tracking.
-    void FinishTracking();
-
-        // Internal function for drawing a hint rectangle.
-    void DoDrawHintRect( wxRect& rect, bool isInClientRect);
-
-        // Internal function for translating coordinates.
-    void RectToScr( wxRect& frameRect, wxRect& scrRect );
-
-public:
-        // Default constructor.
-    cbHintAnimationPlugin();
-
-        // Constructor, taking a layout panel and pane mask.
-    cbHintAnimationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Destructor.
-    ~cbHintAnimationPlugin();
-
-        // Event handler respoding to hint draw events.
-    void OnDrawHintRect( cbDrawHintRectEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-/*
-A private helper class.
-*/
-
-struct WXDLLIMPEXP_FL MorphInfoT
-{
-    wxPoint mFrom;
-    wxPoint mTill;
-};
-
-/*
-A private helper class.
-*/
-
-class WXDLLIMPEXP_FL cbHintAnimTimer : public wxTimer 
-{
-protected:
-
-    friend class cbHintAnimationPlugin;
-
-    wxRect      mPrevMorphed;
-
-    MorphInfoT  mUpperLeft;
-    MorphInfoT  mLowerRight;
-    int         mCurIter;
-
-    long        mLock;
-
-    cbHintAnimationPlugin* mpPl;
-
-    void MorphPoint( wxPoint& origin, MorphInfoT& info, wxPoint& point );
-
-public: 
-
-    cbHintAnimTimer(void);
-
-    virtual void Notify(void);
-
-    virtual bool Init( cbHintAnimationPlugin* pAnimPl, bool reinit );
-};
-
-#endif /* __HINTANIMPL_G__ */
-
diff --git a/contrib/include/wx/fl/newbmpbtn.h b/contrib/include/wx/fl/newbmpbtn.h
deleted file mode 100644
index 29c8cc9127..0000000000
--- a/contrib/include/wx/fl/newbmpbtn.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        newbmpbtn.h
-// Purpose:     wxNewBitmapButton header.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     ??/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __NEWBMPBTN_G__
-#define __NEWBMPBTN_G__
-
-#include "wx/button.h"
-#include "wx/string.h"
-#include "wx/fl/fldefs.h"
-
-// defaults
-#define NB_DEFAULT_MARGIN 2
-
-// button label-text alignment types
-
-#define NB_ALIGN_TEXT_RIGHT  0
-#define NB_ALIGN_TEXT_BOTTOM 1
-#define NB_NO_TEXT           2
-#define NB_NO_IMAGE          3
-
-// classes declared in this header file
-
-class WXDLLIMPEXP_FL wxNewBitmapButton;
-class WXDLLIMPEXP_FL wxBorderLessBitmapButton;
-
-/*
-This is an alternative class to wxBitmapButton. It is used
-in the implementation of dynamic toolbars.
-*/
-
-class wxNewBitmapButton: public wxPanel
-{
-    DECLARE_DYNAMIC_CLASS(wxNewBitmapButton)
-
-protected:
-
-    friend class wxNewBitmapButtonSerializer;
-
-    int      mTextToLabelGap;
-    int      mMarginX;
-    int      mMarginY;
-    int      mTextAlignment;
-    bool     mIsSticky;
-    bool     mIsFlat;
-
-    wxString mLabelText;
-    wxString mImageFileName;
-    wxBitmapType mImageFileType;
-
-    wxBitmap mDepressedBmp; // source image for rendering
-                            // labels for particular state
-
-    wxBitmap mFocusedBmp;   // may not be always present -
-                            // only if mHasFocusedBmp is true
-
-    wxBitmap* mpDepressedImg;
-    wxBitmap* mpPressedImg;
-    wxBitmap* mpDisabledImg;
-    wxBitmap* mpFocusedImg;
-
-    // button state variables;
-    bool      mDragStarted;
-    bool      mIsPressed;
-    bool      mIsInFocus;
-    bool      mIsToggled;
-
-    bool      mHasFocusedBmp;
-
-    // type of event which is fired upon depression of this button
-    int       mFiredEventType;
-
-    // pens for drawing decorations (borders)
-    wxPen     mBlackPen;
-    wxPen     mDarkPen;
-    wxPen     mGrayPen;
-    wxPen     mLightPen;
-
-    bool      mIsCreated;
-    int       mSizeIsSet;
-
-protected:
-
-        // Internal function for destroying labels.
-    void DestroyLabels();
-
-        // Returns the label that matches the current button state.
-    virtual wxBitmap* GetStateLabel();
-
-        // Draws shading on the button.
-    virtual void DrawShade( int outerLevel,
-                            wxDC&  dc,
-                            wxPen& upperLeftSidePen,
-                            wxPen& lowerRightSidePen );
-
-        // Returns true if the given point is in the window.
-    bool IsInWindow( int x, int y );
-
-    virtual void OnIdle(wxIdleEvent& event);
-    // (EVT_UPDATE_UI handler)
-    virtual void DoButtonUpdate();
-
-public:
-
-        // Constructor.
-    wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
-                       const wxString& labelText   = wxT(""),
-                       int   alignText             = NB_ALIGN_TEXT_BOTTOM,
-                       bool  isFlat                = true,
-                       // this is the default type of fired events
-                       int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
-                       int marginX        = NB_DEFAULT_MARGIN,
-                       int marginY        = NB_DEFAULT_MARGIN,
-                       int textToLabelGap = 2,
-                       bool isSticky      = false
-                     );
-
-        // Use this constructor if buttons have to be persistant
-    wxNewBitmapButton( const wxString& bitmapFileName,
-                           const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
-                           const wxString& labelText      = wxT(""),
-                           int alignText                  = NB_ALIGN_TEXT_BOTTOM,
-                           bool  isFlat                   = true,
-                           // this is the default type of fired events
-                           int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
-                           int marginX        = NB_DEFAULT_MARGIN,
-                           int marginY        = NB_DEFAULT_MARGIN,
-                           int textToLabelGap = 2,
-                           bool isSticky      = false
-                             );
-
-        // Destructor.
-    ~wxNewBitmapButton();
-
-        // This function should be called after Create. It renders the labels, having
-        // reloaded the button image if necessary.
-    virtual void Reshape();
-
-        // Sets the label and optionally label text.
-    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
-
-        // Unhide method from parents.
-
-    virtual void SetLabel(const wxString& label)
-                         { wxPanel::SetLabel(label); };
-
-        // Sets the text alignment and margins.
-    virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
-                                int marginX        = NB_DEFAULT_MARGIN,
-                                int marginY        = NB_DEFAULT_MARGIN,
-                                int textToLabelGap = 2);
-
-        // Draws the decorations.
-    virtual void DrawDecorations( wxDC& dc );
-
-        // Draws the label.
-    virtual void DrawLabel( wxDC& dc );
-
-        // Renders the label image.
-    virtual void RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp, 
-                                   bool isEnabled = true,
-                                   bool isPressed = false);
-
-        // Renders label images.
-    virtual void RenderLabelImages();
-
-        // Renders label images.
-    virtual void RenderAllLabelImages();
-
-        // Enables/disables button
-    virtual bool Enable(bool enable);
-
-        // Depress button
-    virtual bool Toggle(bool enable);
-
-        // Responds to a left mouse button down event.
-    void OnLButtonDown( wxMouseEvent& event );
-
-        // Responds to a left mouse button up event.
-    void OnLButtonUp( wxMouseEvent& event );
-
-        // Responds to mouse enter to window.
-    void OnMouseEnter( wxMouseEvent& event );
-
-        // Responds to mouse leave from window.
-    void OnMouseLeave( wxMouseEvent& event );
-
-        // Responds to a size event.
-    void OnSize( wxSizeEvent& event );
-
-        // Responds to a paint event.
-    void OnPaint( wxPaintEvent& event );
-
-        // Responds to an erase background event.
-    void OnEraseBackground( wxEraseEvent& event );
-
-        // Responds to a kill focus event.
-    void OnKillFocus( wxFocusEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __NEWBMPBTN_G__ */
-
diff --git a/contrib/include/wx/fl/panedrawpl.h b/contrib/include/wx/fl/panedrawpl.h
deleted file mode 100644
index 5ba399a23d..0000000000
--- a/contrib/include/wx/fl/panedrawpl.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        panedrawpl.h
-// Purpose:     cbPaneDrawPlugin class header.
-// Author:      Aleksandras Gluchovas <mailto:alex@soften.ktu.lt>
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __PANEDRAWPL_G__
-#define __PANEDRAWPL_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-Simple but all-in-one plugin implementation. Resembles the look and feel of
-MFC control-bars. The class handles painting of the pane and the items in it;
-it generates bar/layout customization events, when the user right-clicks the bar/pane.
-Hooking an instance of this and row-layout plugins for each pane
-would be enough for the frame layout to function properly
-(they are plugged in automatically by the wxFrameLayout class).
-*/
-
-class WXDLLIMPEXP_FL cbPaneDrawPlugin : public cbPluginBase
-{
-public:
-    DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )
-protected:
-
-    // resizing bars/rows state variables
-    bool           mResizeStarted;
-    bool           mResizeCursorOn;
-    wxPoint        mDragOrigin;
-
-    cbBarInfo*     mpDraggedBar; // also used when in bar-drag action
-    cbRowInfo*     mpResizedRow;
-
-    bool           mRowHandleHitted;
-    bool           mIsUpperHandle;
-    bool           mBarHandleHitted;
-    bool           mIsLeftHandle;
-    bool           mBarContentHitted;
-
-    // contstraints for dragging the handle
-    wxRect         mHandleDragArea;
-    bool           mHandleIsVertical;
-    int            mHandleOfs;
-    int            mDraggedDelta;
-    wxPoint        mPrevPos;
-
-    // used for handling, start-draw-in-area events
-    wxClientDC*    mpClntDc;
-
-    cbDockPane*    mpPane; // is set up temorary short-cut, while handling event
-
-protected:
-        // Internal helper: draws the dragged handle.
-    void DrawDraggedHandle( const wxPoint& pos, cbDockPane& pane );
-
-        // Internal helper: draws the pane shading.
-    virtual void DrawPaneShade( wxDC& dc, int alignment );
-
-        // Internal helper: draws the pane shading for a row.
-    virtual void DrawPaneShadeForRow( cbRowInfo* pRow, wxDC& dc );
-
-        // Internal helper: draws the upper row handle.
-    virtual void DrawUpperRowHandle( cbRowInfo* pRow, wxDC& dc );
-
-        // Internal helper: draws the lower row handle.
-    virtual void DrawLowerRowHandle( cbRowInfo* pRow, wxDC& dc );
-
-        // Internal helper: draws the upper row shading.
-    virtual void DrawUpperRowShades( cbRowInfo* pRow, wxDC& dc, int level );
-
-        // Internal helper: draws the lower row shading.
-    virtual void DrawLowerRowShades( cbRowInfo* pRow, wxDC& dc, int level );
-
-        // Internal helper: draws the inner bar shading.
-    virtual void DrawBarInnerShadeRect( cbBarInfo* pBar, wxDC& dc );
-
-        // Internal helper: draws shading.
-    virtual void DrawShade( int level, wxRect& rect, int alignment, wxDC& dc );
-
-        // Internal helper: draws shading.
-    virtual void DrawShade1( int level, wxRect& rect, int alignment, wxDC& dc );
-
-        // Internal helper: sets a light pixel at the given location.
-    inline void SetLightPixel( int x, int y, wxDC& dc );
-
-        // Internal helper: sets a dark pixel at the given location.
-    inline void SetDarkPixel ( int x, int y, wxDC& dc );
-
-public:
-        // Default constructor.
-    cbPaneDrawPlugin();
-
-        // Constructor taking frame layout pane and a pane mask.
-    cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Destructor.
-    virtual ~cbPaneDrawPlugin();
-
-        // Clone function, returning a new instance of this class.
-    virtual cbPluginBase* Clone() { return new cbPaneDrawPlugin(0,0); }
-
-        // Handler for left mouse button down events.
-    void OnLButtonDown( cbLeftDownEvent&   event );
-
-        // Handler for left double-click mouse button down events.
-    void OnLDblClick  ( cbLeftDClickEvent& event );
-
-        // Handler for left mouse button up events.
-    void OnLButtonUp  ( cbLeftUpEvent&     event );
-
-        // Handler for right mouse button up events.
-    void OnRButtonUp  ( cbRightUpEvent&    event );
-
-        // Handler for mouse move events.
-    void OnMouseMove  ( cbMotionEvent&     event );
-
-        // Handler for draw pane background events.
-    void OnDrawPaneBackground ( cbDrawPaneBkGroundEvent& event );
-
-        // Handler for draw pane decoration events.
-    void OnDrawPaneDecorations( cbDrawPaneDecorEvent&    event );
-
-        // Handler for draw row decoration events.
-    void OnDrawRowDecorations ( cbDrawRowDecorEvent&     event );
-
-        // Handler for draw row handles events.
-    void OnDrawRowHandles     ( cbDrawRowHandlesEvent&   event );
-
-        // Handler for draw row background events.
-    void OnDrawRowBackground  ( cbDrawRowBkGroundEvent&  event );
-
-        // Handler for bar size events.
-    void OnSizeBarWindow      ( cbSizeBarWndEvent&       event );
-
-        // Handler for draw bar decorations events.
-    void OnDrawBarDecorations ( cbDrawBarDecorEvent&     event );
-
-        // Handler for draw bar handles events.
-    void OnDrawBarHandles     ( cbDrawBarHandlesEvent&   event );
-
-        // Handler for start draw in area events.
-    void OnStartDrawInArea    ( cbStartDrawInAreaEvent&  event );
-
-        // Handler for finish draw in area events.
-    void OnFinishDrawInArea   ( cbFinishDrawInAreaEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __PANEDRAWPL_G__ */
-
diff --git a/contrib/include/wx/fl/rowdragpl.h b/contrib/include/wx/fl/rowdragpl.h
deleted file mode 100644
index 4e57159d9d..0000000000
--- a/contrib/include/wx/fl/rowdragpl.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        rowdragpl.h
-// Purpose:     cbRowDragPlugin class header.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ROWDRAGPL_G__
-#define __ROWDRAGPL_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-This plugin adds row-dragging functionality to the pane.
-It handles mouse movement and pane background-erasing plugin events.
-The behaviour and appearance resembles drag and drop positioning
-of the toolbar rows in Netscape Communicator 4.xx.
-*/
-
-class WXDLLIMPEXP_FL cbRowDragPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
-public:
-    // background colours for the highlighted/unhighlighted icons
-
-    wxColour mHightColor;      // light-blue for NC-look
-    wxColour mLowColor;        // light-gray -/-
-    wxColour mTrianInnerColor; // blue       -/-
-    wxPen    mTrianInnerPen;   // black      -/-
-
-protected:
-    friend class cbRowDragPluginSerializer;
-
-    // drag & drop state variables
-    bool    mDragStarted;
-    bool    mDecisionMode;
-    wxPoint mDragOrigin;
-    int     mCurDragOfs;
-    bool    mCaptureIsOn;
-
-    // saved margins of the pane
-    int mSvTopMargin;
-    int mSvBottomMargin;
-    int mSvLeftMargin;
-    int mSvRightMargin;
-
-    // on-screen drawing state variables
-    wxBitmap* mpPaneImage;
-    wxBitmap* mpRowImage;
-    wxBitmap* mpCombinedImage;
-
-    wxScreenDC* mpScrDc;
-    wxRect    mCombRect;
-    wxSize    mRowImgDim;
-    int       mInitialRowOfs;
-
-    // NOTE:: if mpRowInFocus is not NULL, then mCollapsedIconInFocus is -1,
-    //        and v.v. (two different items cannot be in focus at the same time)
-
-    cbRowInfo* mpRowInFocus;
-    int        mCollapsedIconInFocus;
-
-    cbDockPane* mpPane; // is set up temorarely, while handling event
-
-    wxList      mHiddenBars;
-
-        // Helper for drag and drop.
-    wxBitmap* CaptureDCArea( wxDC& dc, wxRect& area );
-
-        // Helper for drag and drop.
-    int GetHRowsCountForPane( cbDockPane* pPane );
-
-        // Helper for drag and drop.
-    void SetMouseCapture( bool captureOn );
-
-        // Helper for drag and drop.
-    void PrepareForRowDrag();
-
-        // Helper for drag and drop.
-    void ShowDraggedRow( int offset );
-
-        // Helper for drag and drop.
-    void ShowPaneImage();
-
-        // Helper for drag and drop.
-    void FinishOnScreenDraw();
-
-        // Helper for drag and drop.
-    void CollapseRow( cbRowInfo* pRow );
-
-        // Helper for drag and drop.
-    void ExpandRow( int collapsedIconIdx );
-
-        // Helper for drag and drop.
-    void InsertDraggedRowBefore( cbRowInfo* pBeforeRow );
-
-        // Helper for drag and drop.
-    bool ItemIsInFocus();
-
-        // Helper for drag and drop.
-    void CheckPrevItemInFocus( cbRowInfo* pRow, int iconIdx );
-
-        // Helper for drag and drop.
-    void UnhighlightItemInFocus();
-
-        // Helper for drag and drop.
-    cbRowInfo* GetFirstRow();
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawTrianUp( wxRect& inRect, wxDC& dc );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawTrianDown( wxRect& inRect, wxDC& dc );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawTrianRight( wxRect& inRect, wxDC& dc );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void Draw3DPattern( wxRect& inRect, wxDC& dc );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawRombShades( wxPoint& p1, wxPoint& p2, wxPoint& p3, wxPoint& p4, wxDC& dc );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawOrtoRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void Draw3DRect( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush );
-
-        // Implements 'hard-coded metafile' for Netscape Navigator look.
-    virtual void DrawRectShade( wxRect& inRect, wxDC& dc,
-                                int level, const wxPen& upperPen, const wxPen& lowerPen );
-
-        // Helper for drag and drop.
-    virtual void GetRowHintRect( cbRowInfo* pRow, wxRect& rect );
-
-        // Helper for drag and drop.
-    virtual void GetCollapsedInconRect( int iconIdx, wxRect& rect );
-
-        // Helper for drag and drop.
-    virtual int GetCollapsedIconsPos();
-
-public:
-
-        // Default constructor.
-    cbRowDragPlugin();
-
-        // Constructor, taking paren layout frame and pane mask.
-    cbRowDragPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
-
-        // Destructor.
-    virtual ~cbRowDragPlugin();
-
-        // Clone function, returning a new instance of this class.
-    virtual cbPluginBase* Clone() { return new cbRowDragPlugin(NULL,0); }
-
-        // Called to initialize this plugin.
-    virtual void OnInitPlugin();
-
-        // Handles mouse move plugin events (appearance-independent logic).
-    void OnMouseMove  ( cbMotionEvent& event );
-
-        // Handles left button down plugin events (appearance-independent logic).
-    void OnLButtonDown( cbLeftDownEvent& event );
-
-        // Handles left button up plugin events (appearance-independent logic).
-    void OnLButtonUp  ( cbLeftUpEvent& event );
-
-        // Handles pane drawing plugin events (appearance-independent logic).
-    void OnDrawPaneBackground( cbDrawPaneDecorEvent& event );
-
-        // Draws collapsed row icon (appearance-dependent).
-    virtual void DrawCollapsedRowIcon( int index, wxDC& dc, bool isHighlighted );
-
-        // Draws collapsed rows border (appearance-dependent).
-    virtual void DrawCollapsedRowsBorder( wxDC& dc );
-
-        // Draws rows drag hints border (appearance-dependent).
-    virtual void DrawRowsDragHintsBorder( wxDC& dc );
-
-        // Draws row drag hint (appearance-dependent).
-    virtual void DrawRowDragHint( cbRowInfo* pRow, wxDC& dc, bool isHighlighted );
-
-        // Draws empty row (appearance-dependent).
-    virtual void DrawEmptyRow( wxDC& dc, wxRect& rowBounds );
-
-        // Gets the collapsed row icon height.
-    virtual int GetCollapsedRowIconHeight();
-
-        // Gets the row drag hint width.
-    virtual int GetRowDragHintWidth();
-
-        // Sets the pane margins.
-    virtual void SetPaneMargins();
-
-        // Test for the collapsed row icon position.
-    virtual bool HitTestCollapsedRowIcon( int iconIdx, const wxPoint& pos );
-
-        // Test for the row drag hint position.
-    virtual bool HitTestRowDragHint( cbRowInfo* pRow, const wxPoint& pos );
-
-    DECLARE_EVENT_TABLE()
-};
-
-/*
-Internal helper class.
-*/
-
-class WXDLLIMPEXP_FL cbHiddenBarInfo : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
-public:
-    cbBarInfo* mpBar;
-    int        mRowNo;
-    int        mIconNo;
-    int        mAlignment;
-};
-
-#endif /* __ROWDRAGPL_G__ */
-
diff --git a/contrib/include/wx/fl/rowlayoutpl.h b/contrib/include/wx/fl/rowlayoutpl.h
deleted file mode 100644
index 1f008cc03f..0000000000
--- a/contrib/include/wx/fl/rowlayoutpl.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        rowlayoutpl.h
-// Purpose:     cbRowLayoutPlugin header.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     02/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ROWLAYOUTPL_G__
-#define __ROWLAYOUTPL_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-Simple implementation of a plugin which handles row layout
-requests sent from a frame layout.
-*/
-
-class WXDLLIMPEXP_FL cbRowLayoutPlugin : public cbPluginBase
-{
-    DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
-protected:
-    cbDockPane* mpPane; // is set up temporarily, while handling event
-protected:
-
-        // Internal helper relating to not-fixed-bars layout.
-    void FitBarsToRange( int from, int till, cbBarInfo* pTheBar, cbRowInfo* pRow ); 
-
-        // Internal helper relating to not-fixed-bars layout.
-    void RelayoutNotFixedBarsAround( cbBarInfo* pTheBar, cbRowInfo* pRow );
-
-        // Internal helper relating to not-fixed-bars layout.
-    void MinimzeNotFixedBars( cbRowInfo* pRow, cbBarInfo* pBarToPreserve );
-
-        // Internal helper relating to not-fixed-bars layout.
-    int  GetRowFreeSpace( cbRowInfo* pRow );
-
-
-        // Internal helper relating to not-fixed-bars layout.
-    void RecalcLengthRatios( cbRowInfo* pRow );
-
-        // Internal helper relating to not-fixed-bars layout.
-    void ApplyLengthRatios( cbRowInfo* pRow );
-
-        // Internal helper relating to not-fixed-bars layout.
-    void ExpandNotFixedBars( cbRowInfo* pRow );
-
-        // Internal helper relating to not-fixed-bars layout.
-    void AdjustLengthOfInserted( cbRowInfo* pRow, cbBarInfo* pTheBar );
-
-
-        // Internal helper relating to not-fixed-bars layout.
-    void DetectBarHandles( cbRowInfo* pRow );
-
-        // Internal helper relating to not-fixed-bars layout.
-    void CheckIfAtTheBoundary( cbBarInfo* pTheBar, cbRowInfo& rowInfo );
-
-
-        // Row layout helper simulating bar 'friction'.
-    int  CalcRowHeight( cbRowInfo& row );
-
-        // Row layout helper simulating bar 'friction'.
-    void LayoutItemsVertically( cbRowInfo& row );
-
-
-        // Row layout helper simulating bar 'friction'.
-    void StickRightSideBars( cbBarInfo* pToBar );
-
-
-        // Row layout helper simulating bar 'friction'.
-    void SlideLeftSideBars ( cbBarInfo* pTheBar );
-
-        // Row layout helper simulating bar 'friction'.
-    void SlideRightSideBars( cbBarInfo* pTheBar );
-
-
-        // Row layout helper simulating bar 'friction'.
-    void ShiftLeftTrashold ( cbBarInfo* pTheBar, cbRowInfo& row );
-
-        // Row layout helper simulating bar 'friction'.
-    void ShiftRightTrashold( cbBarInfo* pTheBar, cbRowInfo& row );
-
-
-        // Insert the bar before the given row.
-    void InsertBefore( cbBarInfo* pBeforeBar, 
-                       cbBarInfo* pTheBar,
-                       cbRowInfo& row
-                     );
-
-        // Insert the bar before the given row.
-    void DoInsertBar( cbBarInfo* pTheBar, cbRowInfo& row );
-
-public:
-        // Default constructor.
-    cbRowLayoutPlugin(void);
-
-        // Constructor taking frame layout pane and pane mask.
-    cbRowLayoutPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
-
-        // Responds to row resize event.
-    void OnResizeRow ( cbResizeRowEvent&  event );
-
-        // Responds to bar insertion event.
-    void OnInsertBar ( cbInsertBarEvent&  event );
-
-        // Responds to bar removal event.
-    void OnRemoveBar ( cbRemoveBarEvent&  event );
-
-        // Responds to row layout event.
-    void OnLayoutRow ( cbLayoutRowEvent&  event );
-
-        // Responds to rows layout event.
-    void OnLayoutRows( cbLayoutRowsEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __ROWLAYOUTPL_G__ */
-
diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
deleted file mode 100644
index 486085ea78..0000000000
--- a/contrib/include/wx/fl/toolwnd.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        toolwnd.h
-// Purpose:     wxToolWindow, cbMiniButton, cbCloseBox, cbCollapseBox,
-//              cbDockBox, cbFloatedBarWindow class declarations.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __TOOLWND_G__
-#define __TOOLWND_G__
-
-#include "wx/frame.h"
-#include "wx/dynarray.h"
-#include "wx/fl/fldefs.h"
-
-// fixed settings
-
-#define BTN_BOX_HEIGHT       12
-#define BTN_BOX_WIDTH        12
-#define BTN_X_WEIGHT         2
-
-class WXDLLIMPEXP_FL cbMiniButton;
-
-typedef cbMiniButton* cbMinitButtonPtrT;
-
-WXFL_DEFINE_ARRAY_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT );
-
-/*
-A tool window is a special kind of frame that paints its own title, and
-can be used to implement small floating windows.
-*/
-
-class WXDLLIMPEXP_FL wxToolWindow : public wxFrame
-{
-    DECLARE_DYNAMIC_CLASS( wxToolWindow )
-
-public:    /** protected really, accessed only by serializers **/
-
-    cbMiniButtonArrayT mButtons;
-    wxWindow* mpClientWnd;
-
-    wxFont    mTitleFont;
-
-    int       mTitleHeight;
-    int       mClntHorizGap;
-    int       mClntVertGap;
-    int       mWndVertGap;
-    int       mWndHorizGap;
-    int       mButtonGap;
-    int       mInTitleMargin;
-    int       mHintBorder;
-
-    bool      mResizeStarted;
-    bool      mRealTimeUpdatesOn;
-
-    int       mMTolerance;
-
-    int       mCursorType;
-    bool      mMouseCaptured;
-
-    // drag&drop state variables
-
-    wxPoint     mDragOrigin;
-    wxRect      mInitialRect;
-    wxRect      mPrevHintRect;
-    wxScreenDC* mpScrDc;
-
-protected:
-        // Maps client coordinates to screen coordinates.
-    void GetScrWindowRect( wxRect& r );
-
-        // Gets the mouse position in screen coordinates.
-    void GetScrMousePos  ( wxMouseEvent& event, wxPoint& pos );
-
-        // Sets the hint cursor.
-    void SetHintCursor   ( int type );
-
-        // Calculate resized rectangle.
-    void CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize& minDim );
-
-        // Helper function.
-    void AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect );
-
-        // Helper function.
-    wxSize GetMinimalWndDim();
-
-        // Draws the hint rectangle.
-    void DrawHintRect( const wxRect& r );
-
-        // Tests if the mouse position is in this window.
-    int HitTestWindow( wxMouseEvent& event );
-
-        // Lays out the buttons.
-    void LayoutMiniButtons();
-
-public:
-
-        // Default constructor.
-    wxToolWindow();
-
-        // Destructor.
-    ~wxToolWindow();
-
-        // Sets the client for this tool window.
-    void SetClient( wxWindow* pWnd );
-
-        // Returns the client window.
-    wxWindow* GetClient();
-
-        // Sets the title font.
-    void SetTitleFont( wxFont& font );
-
-        // Adds a button. Buttons are added in right-to-left order.
-    void AddMiniButton( cbMiniButton* pBtn );
-
-        // Responds to a paint event.
-    void OnPaint( wxPaintEvent& event );
-
-        // Responds to a mouse move event.
-    void OnMotion( wxMouseEvent& event );
-
-        // Responds to a mouse left down event.
-    void OnLeftDown( wxMouseEvent& event );
-
-        // Responds to a mouse left up event.
-    void OnLeftUp( wxMouseEvent& event );
-
-        // Responds to a size event.
-    void OnSize( wxSizeEvent& event );
-
-        // Responds to an erase background event.
-    void OnEraseBackground( wxEraseEvent& event );
-
-        // Returns the preferred size for the window.
-    virtual wxSize GetPreferredSize( const wxSize& given );
-
-        // Called when a mini button is clicked.
-        // By default, does nothing.
-    virtual void OnMiniButtonClicked( int WXUNUSED(btnIdx) ) {}
-
-        // Handles clicking on the title. By default, does nothing.
-    virtual bool HandleTitleClick( wxMouseEvent& WXUNUSED(event) ) { return false; }
-
-    DECLARE_EVENT_TABLE()
-};
-
-// FIXME:: the code below should be moved to a separate file
-
-#include "wx/fl/controlbar.h"
-
-/*
-cbMiniButton is the base class for a small button that can be placed in a wxToolWindow
-titlebar.
-*/
-
-class cbMiniButton : public wxObject
-{
-public:
-    wxPoint   mPos;
-    wxSize    mDim;
-    bool      mVisible;
-    bool      mEnabled;
-
-    wxFrameLayout* mpLayout;
-    cbDockPane*    mpPane;
-    cbPluginBase*  mpPlugin;
-
-    wxWindow*      mpWnd;
-
-    bool      mWasClicked;
-    bool      mDragStarted;
-
-    bool      mPressed;
-public:
-        // Default constructor.
-    cbMiniButton();
-
-        // Set the position of the button.
-    void SetPos( const wxPoint& pos );
-
-        // Returns true if the given position was over the button.
-    bool HitTest( const wxPoint& pos );
-
-        // Responds to a left down event.
-    void OnLeftDown( const wxPoint& pos );
-
-        // Responds to a left up event.
-    void OnLeftUp( const wxPoint& pos );
-
-        // Responds to a mouse move event.
-    void OnMotion( const wxPoint& pos );
-
-        // Refreshes the button.
-    void Refresh();
-
-        // Draws the button. Override this to implement
-        // the desired appearance.
-    virtual void Draw( wxDC& dc );
-
-        // Returns true if the button was clicked.
-    bool WasClicked();
-
-        // Reset the button.
-    void Reset();
-
-        // Enable or disable the button.
-    void Enable( bool enable ) { mEnabled = enable; }
-
-        // Returns true if this button is pressed.
-    bool IsPressed() { return mPressed; }
-};
-
-/*
-cbCloseBox is a window close button, used in a wxToolWindow titlebar.
-*/
-
-class WXDLLIMPEXP_FL cbCloseBox : public cbMiniButton
-{
-public:
-        // Draws the close button appearance.
-    virtual void Draw( wxDC& dc );
-};
-
-/*
-cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
-*/
-
-class WXDLLIMPEXP_FL cbCollapseBox  : public cbMiniButton
-{
-public:
-    bool mIsAtLeft;
-
-        // Draws the collapse button appearance.
-    virtual void Draw( wxDC& dc );
-};
-
-/*
-cbDockBox is a window dock button, used in a wxToolWindow titlebar.
-*/
-
-class WXDLLIMPEXP_FL cbDockBox : public cbMiniButton
-{
-public:
-        // Draws the dock button appearance.
-    virtual void Draw( wxDC& dc );
-};
-
-/*
-cbFloatedBarWindow is a kind of wxToolWindow,
-implementing floating toolbars.
-*/
-
-class WXDLLIMPEXP_FL cbFloatedBarWindow : public wxToolWindow
-{
-    DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
-protected:
-    cbBarInfo*     mpBar;
-    wxFrameLayout* mpLayout;
-
-    friend class cbFloatedBarWindowSerializer;
-
-public:
-        // Default constructor.
-    cbFloatedBarWindow();
-
-        // Sets the bar information for this window.
-    void SetBar( cbBarInfo* pBar );
-
-        // Sets the layout for this window.
-    void SetLayout( wxFrameLayout* pLayout );
-
-        // Returns the bar information for this window.
-    cbBarInfo* GetBar();
-
-        // Position the floating window. The given coordinates
-        // are those of the bar itself; the floated container window's
-        // position and size are ajusted accordingly.
-    void PositionFloatedWnd( int scrX,  int scrY,
-                             int width, int height );
-
-        // Overridden function returning the preferred size.
-    virtual wxSize GetPreferredSize( const wxSize& given );
-
-        // Overridden function responding to mouse clicks on mini-buttons.
-    virtual void OnMiniButtonClicked( int btnIdx );
-
-        // Overridden function responding to mouse button clicks on the titlebar.
-    virtual bool HandleTitleClick( wxMouseEvent& event );
-
-        // Responds to double-click mouse events.
-    void OnDblClick( wxMouseEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif /* __TOOLWND_G__ */
-
-
diff --git a/contrib/include/wx/fl/updatesmgr.h b/contrib/include/wx/fl/updatesmgr.h
deleted file mode 100644
index 12dba3b2d8..0000000000
--- a/contrib/include/wx/fl/updatesmgr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        updatesmgr.h
-// Purpose:     cbSimpleUpdatesMgr class declaration
-// Author:      Aleksandras Gluchovas (@Lithuania)
-// Modified by:
-// Created:     19/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __UPDATESMGR_G__
-#define __UPDATESMGR_G__
-
-#include "wx/fl/controlbar.h"
-
-/*
-This class implements slightly optimized logic for refreshing
-the areas of frame layout that actually need to be updated.
-*/
-
-class WXDLLIMPEXP_FL cbSimpleUpdatesMgr : public cbUpdatesManagerBase
-{
-    DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
-protected:
-
-        // Helper function.
-    bool WasChanged( cbUpdateMgrData& data, wxRect& currentBounds );
-
-public:
-        // Default constructor.
-    cbSimpleUpdatesMgr() {}
-
-        // Constructor taking frame layout panel.
-    cbSimpleUpdatesMgr( wxFrameLayout* pPanel );
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnStartChanges();
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnRowWillChange( cbRowInfo* pRow, cbDockPane* pInPane );
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnBarWillChange( cbBarInfo* pBar, cbRowInfo* pInRow, cbDockPane* pInPane );
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnPaneMarginsWillChange( cbDockPane* pPane );
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnPaneWillChange( cbDockPane* pPane );
-
-        // Notification received from Frame Layout in the order in which
-        // they would usually be invoked.
-    virtual void OnFinishChanges();
-
-        // Refreshes the parts of the frame layoutthat need an update.
-    virtual void UpdateNow();
-};
-
-#endif /* __UPDATESMGR_G__ */
-
diff --git a/contrib/include/wx/foldbar/captionbar.h b/contrib/include/wx/foldbar/captionbar.h
deleted file mode 100644
index 0d276337ea..0000000000
--- a/contrib/include/wx/foldbar/captionbar.h
+++ /dev/null
@@ -1,476 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        captionbar.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __FOLDPANELBAR_H__
-#define __FOLDPANELBAR_H__
-
-#ifdef WXMAKINGDLL_FOLDBAR
-    #define WXDLLIMPEXP_FOLDBAR WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_FOLDBAR WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_FOLDBAR
-#endif
-
-
-#define wxFPB_EXTRA_X 10
-#define wxFPB_EXTRA_Y 4
-#define wxFPB_BMP_RIGHTSPACE 2    // pixels of the bmp to be aligned from the right filled with space
-
-enum
-{
-    /** Specifies the bars as gradient vertical filled caption bars going from top to bottom. The gradient
-        starts with first colour, and ends with second colour */
-    wxCAPTIONBAR_GRADIENT_V = 1,
-    /** Specifies the gradient going from left to right. The gradient starts with first colour, and
-        ends with second colour on the right */
-    wxCAPTIONBAR_GRADIENT_H,
-    /** Fills the captionbar with a single colour. The first colour is used for this fill */
-    wxCAPTIONBAR_SINGLE,
-    /** Draws a rectangle only using the second colour. The first colour is not used*/
-    wxCAPTIONBAR_RECTANGLE,
-    /** Fills the captionbar with a single colour (first colour) and draws a rectangle around it
-        using the second colour. */
-    wxCAPTIONBAR_FILLED_RECTANGLE
-};
-
-/** \class wxCaptionBarStyle
-    This class encapsulates the styles you wish to set for the wxCaptionBar (this is the part of the wxFoldPanel
-    where the caption is displayed). It can either be applied at creation time be reapplied when styles need to
-    be changed.
-
-    At construction time, all styles are set to their default transparency. This means none of the styles will be
-    applied to the wxCaptionBar in question, meaning it will be created using the default internals. When setting i.e
-    the color, font or panel style, these styles become active to be used.
-*/
-class WXDLLIMPEXP_FOLDBAR wxCaptionBarStyle
-{
-private:
-    // boolean flags for default transparency on styles
-    bool m_firstColourUsed,
-         m_secondColourUsed,
-         m_textColourUsed,
-         m_captionFontUsed,
-         m_captionStyleUsed;
-
-    wxFont m_captionFont;
-    wxColour m_firstColour, m_secondColour, m_textColour;
-
-    int m_captionStyle;
-
-public:
-    /** Default constructor for this class */
-    wxCaptionBarStyle() {
-        ResetDefaults();
-    };
-
-    ~wxCaptionBarStyle() {
-
-    };
-
-    void ResetDefaults() {
-        m_firstColourUsed = false;
-        m_secondColourUsed = false;
-        m_textColourUsed = false;
-        m_captionFontUsed = false;
-        m_captionStyleUsed = false;
-        m_captionStyle = wxCAPTIONBAR_GRADIENT_V;
-    };
-
-    /** Copy operator. Only the styles in use in the source object are being copied to the destination object. All other
-        styles are not copied */
-    void operator=(const wxCaptionBarStyle &s) {
-        if(s.m_captionStyleUsed)
-        {
-            m_captionStyleUsed = true;
-            m_captionStyle = s.m_captionStyle;
-        }
-        if(s.m_captionFontUsed)
-        {
-            m_captionFontUsed = true;
-            m_captionFont = s.m_captionFont;
-        }
-        if(s.m_firstColourUsed)
-        {
-            m_firstColourUsed = true;
-            m_firstColour = s.m_firstColour;
-        }
-        if(s.m_secondColourUsed)
-        {
-            m_secondColourUsed = true;
-            m_secondColour = s.m_secondColour;
-        }
-        if(s.m_textColourUsed)
-        {
-            m_textColourUsed = true;
-            m_textColour = s.m_textColour;
-        }
-    };
-
-    // ------- CaptionBar Font -------
-
-    /** Set font for the caption bar. If this is not set, the font property is undefined
-        and will not be used. Use CaptionFontUsed() to check if this style is used */
-    void SetCaptionFont(const wxFont &font) {
-        m_captionFont = font;
-        m_captionFontUsed = true;
-    };
-
-    /** Checks if the caption bar font is set */
-    bool CaptionFontUsed() const {
-        return m_captionFontUsed;
-    };
-
-    /** Returns the font for the caption bar. Please be warned this will result in an assertion failure when
-        this property is not previously set
-        \sa SetCaptionFont(), CaptionFontUsed() */
-    wxFont GetCaptionFont() const {
-        wxASSERT(m_captionFontUsed);
-        return m_captionFont;
-    };
-
-    // ------- FirstColour -------
-
-    /** Set first colour for the caption bar. If this is not set, the colour property is
-        undefined and will not be used. Use FirstColourUsed() to check if this
-        style is used */
-    void SetFirstColour(const wxColour &col) {
-        m_firstColour = col;
-        m_firstColourUsed = true;
-    };
-
-    /** Checks if the first colour of the caption bar is set */
-    bool FirstColourUsed() const {
-        return m_firstColourUsed;
-    };
-
-    /** Returns the first colour for the caption bar. Please be warned this will
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionFirstColour(), CaptionFirstColourUsed() */
-    wxColour GetFirstColour() const {
-        wxASSERT(m_firstColourUsed);
-        return m_firstColour;
-    };
-
-    // ------- SecondColour -------
-
-    /** Set second colour for the caption bar. If this is not set, the colour property is undefined and
-        will not be used. Use SecondColourUsed() to check if this style is used */
-    void SetSecondColour(const wxColour &col) {
-        m_secondColour = col;
-        m_secondColourUsed = true;
-    };
-
-    /** Checks if the second colour of the caption bar is set */
-    bool SecondColourUsed() const {
-        return m_secondColourUsed;
-    };
-
-    /** Returns the second colour for the caption bar. Please be warned this will result in
-        an assertion failure when this property is not previously set.
-        \sa SetSecondColour(), SecondColourUsed() */
-    wxColour GetSecondColour() const {
-        wxASSERT(m_secondColourUsed);
-        return m_secondColour;
-    };
-
-    // ------- Caption Text Colour -------
-
-    /** Set caption colour for the caption bar. If this is not set, the colour property is
-        undefined and will not be used. Use CaptionColourUsed() to check if this style is used */
-    void SetCaptionColour(const wxColour &col) {
-        m_textColour = col;
-        m_textColourUsed = true;
-    };
-
-    /** Checks if the caption colour of the caption bar is set */
-    bool CaptionColourUsed() const {
-        return m_textColourUsed;
-    };
-
-    /** Returns the caption colour for the caption bar. Please be warned this will
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionColour(), CaptionColourUsed() */
-    wxColour GetCaptionColour() const {
-        wxASSERT(m_textColourUsed);
-        return m_textColour;
-    };
-
-    // ------- CaptionStyle  -------
-
-    /** Set caption style for the caption bar. If this is not set, the property is
-        undefined and will not be used. Use CaptionStyleUsed() to check if this style is used.
-        The following styles can be applied:
-        - wxCAPTIONBAR_GRADIENT_V: Draws a vertical gradient from top to bottom
-        - wxCAPTIONBAR_GRADIENT_H: Draws a horizontal gradient from left to right
-        - wxCAPTIONBAR_SINGLE: Draws a single filled rectangle to draw the caption
-        - wxCAPTIONBAR_RECTANGLE: Draws a single colour with a rectangle around the caption
-        - wxCAPTIONBAR_FILLED_RECTANGLE: Draws a filled rectangle and a border around it
-    */
-    void SetCaptionStyle(int style) {
-        m_captionStyle = style;
-        m_captionStyleUsed = true;
-    };
-
-    /** Checks if the caption style of the caption bar is set */
-    bool CaptionStyleUsed() const {
-        return m_captionStyleUsed;
-    };
-
-    /** Returns the caption style for the caption bar. Please be warned this will
-        result in an assertion failure when this property is not previously set.
-        \sa SetCaptionStyle(), CaptionStyleUsed() */
-    int GetCaptionStyle() const {
-        wxASSERT(m_captionStyleUsed);
-        return m_captionStyle;
-    };
-};
-
-#ifndef _NO_CAPTIONBAR_
-
-/** \class wxCaptionBar
-    This class is a graphical caption component that consists of a caption and a clickable arrow.
-
-    The wxCaptionBar fires an event EVT_CAPTIONBAR which is a wxCaptionBarEvent. This event can be caught
-    and the parent window can act upon the collapsed or expanded state of the bar (which is actually just
-    the icon which changed). The parent panel can reduce size or expand again.
-*/
-
-#include <wx/imaglist.h>
-
-/** Defines an empty captionbar style */
-#define wxEmptyCaptionBarStyle wxCaptionBarStyle()
-
-class WXDLLIMPEXP_FOLDBAR wxCaptionBar: public wxWindow
-{
-private:
-    wxString m_caption;
-    wxImageList *m_foldIcons;
-    wxSize m_oldSize;
-    //wxFont m_captionFont;
-    int m_rightIndent;
-    int m_iconWidth, m_iconHeight;
-    //int m_captionStyle;
-
-    //wxColour m_firstColour, m_secondColour, m_textColour;
-
-    /** True when the caption is in collapsed state (means at the bottom of the wxFoldPanel */
-    bool m_collapsed;
-
-    wxCaptionBarStyle m_captionStyle;
-
-    /** Fills the background of the caption with either a gradient, or a solid color */
-    void FillCaptionBackground(wxPaintDC &dc);
-
-    /* Draw methods */
-    void DrawHorizontalGradient(wxDC &dc, const wxRect &rect );
-    void DrawVerticalGradient(wxDC &dc, const wxRect &rect );
-    void DrawSingleColour(wxDC &dc, const wxRect &rect );
-    void DrawSingleRectangle(wxDC &dc, const wxRect &rect );
-
-    void RedrawIconBitmap();
-
-    void ApplyCaptionStyle(const wxCaptionBarStyle &cbstyle, bool applyDefault);
-
-public:
-    /** Constructor of wxCaptionBar. To create a wxCaptionBar with the arrow images, simply pass an image list
-        which contains at least two bitmaps. The bitmaps contain the expanded and collapsed icons needed to
-        represent it's state. If you don't want images, simply pass a null pointer and the bitmap is disabled. */
-    wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images,
-                 wxWindowID id = wxID_ANY, const wxCaptionBarStyle &cbstyle = wxEmptyCaptionBarStyle,
-                 const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);
-
-    ~wxCaptionBar();
-
-    /** Set wxCaptionBar styles with wxCapionBarSyle class. All styles that are actually set, are applied. If you
-        set applyDefault to true, all other (not defined) styles will be set to default. If it is false,
-        the styles which are not set in the wxCaptionBarStyle will be ignored */
-    void SetCaptionStyle(bool applyDefault, wxCaptionBarStyle style = wxEmptyCaptionBarStyle) {
-        ApplyCaptionStyle(style, applyDefault);
-        Refresh();
-    };
-
-    /** Returns the current style of the captionbar in a wxCaptionBarStyle class. This can be used to change and set back the
-        changes. */
-    wxCaptionBarStyle GetCaptionStyle() {
-        return m_captionStyle;
-    };
-
-    bool IsVertical() const;
-
-#if 0
-    /** Sets a pointer to an image list resource (a non owned pointer) to the collapsed and expand icon bitmap.
-        The reason why it will be assigned a pointer is that it is very likely that multiple caption bars will
-        be used and if they all have their own bitmap resources it will eat up more memory then needed. It will
-        also ease the use of shared icon change, when there is any need to.
-
-        If no wxImageList is assigned, there will be no fold icons and only the doubleclick on the panel
-        will work to collapse / expand.
-
-        The image list must contain 2 bitmaps. Index 0 will be the expanded state, and index 1 will be the
-        collapsed state of the bitmap. The size of the bitmap is taken in account when the minimal height and
-        widht is calculated.
-
-        The bitmaps must be the second thing to be done before using it (SetRightIndent should be the first thing),
-        make sure if the icons are larger than the font, that the parent of this window gets a Fit call to resize
-        all the windows accordingly */
-
-    void SetFoldIcons(wxImageList *images) {
-        m_foldIcons = images;
-        m_iconWidth = m_iconHeight = 0;
-        if(m_foldIcons)
-            m_foldIcons->GetSize(0, m_iconWidth, m_iconHeight);
-
-        Refresh();
-    };
-
-#endif
-
-    /** Returns wether the status of the bar is expanded or collapsed */
-    bool IsCollapsed() const {
-        return m_collapsed;
-    };
-
-    /** Sets the amount of pixels on the right from which the bitmap is trailing. If this is 0, it will be
-        drawn all the way to the right, default is equal to wxFPB_BMP_RIGHTSPACE. Assign this before
-        assigning an image list to prevent a redraw */
-
-    void SetRightIndent(int pixels) {
-        wxCHECK2(pixels >= 0, return);
-        m_rightIndent = pixels;
-        // issue a refresh (if we have a bmp)
-        if(m_foldIcons)
-            Refresh();
-    };
-
-
-    /** Return the best size for this panel, based upon the font assigned to this window, and the
-        caption string */
-    wxSize DoGetBestSize() const;
-
-    /** This sets the internal state / representation to collapsed. This does not trigger a wxCaptionBarEvent
-        to be sent to the parent */
-    void Collapse() {
-        m_collapsed = true;
-        RedrawIconBitmap();
-    };
-
-    /** This sets the internal state / representation to expanded. This does not trigger a wxCaptionBarEvent
-        to be sent to the parent */
-    void Expand() {
-        m_collapsed = false;
-        RedrawIconBitmap();
-    };
-
-    void SetBoldFont() {
-        GetFont().SetWeight(wxBOLD);
-    };
-
-    void SetNormalFont() {
-        GetFont().SetWeight(wxNORMAL);
-    };
-
-
-private:
-    /** The paint event for flat or gradient fill */
-    void OnPaint(wxPaintEvent& event);
-
-    /** For clicking the icon, the mouse event must be intercepted */
-    void OnMouseEvent(wxMouseEvent& event);
-
-    /** Maybe when focus (don't know how yet) a cursor left or backspace will collapse or expand */
-    void OnChar(wxKeyEvent& event);
-
-    void OnSize(wxSizeEvent &event);
-
-
-protected:
-    DECLARE_NO_COPY_CLASS(wxCaptionBar)
-    DECLARE_EVENT_TABLE()
-};
-
-/***********************************************************************************************************/
-
-/** \class wxCaptionBarEvent
-    This event will be sent when a EVT_CAPTIONBAR is mapped in the parent. It is to notify the parent
-    that the bar is now in collapsed or expanded state. The parent should re-arrange the associated
-    windows accordingly */
-
-class WXDLLIMPEXP_FOLDBAR wxCaptionBarEvent : public wxCommandEvent
-{
-
-private:
-    bool m_collapsed;
-    wxCaptionBar *m_captionBar;
-    void *m_tag;
-
-public:
-    wxCaptionBarEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-        : wxCommandEvent(commandType, id)
-        , m_collapsed(false)
-        , m_captionBar(NULL)
-        , m_tag(0)
-    { }
-
-    /** Constructor for clone copy */
-    wxCaptionBarEvent(const wxCaptionBarEvent &event);
-
-    /** Clone function */
-    virtual wxEvent *Clone() const {
-        return new wxCaptionBarEvent(*this);
-    };
-
-    /** Returns wether the bar is expanded or collapsed. True means expanded */
-    bool GetFoldStatus() const {
-        wxCHECK(m_captionBar, false);
-        return !m_captionBar->IsCollapsed();
-    };
-
-    /** Returns the bar associated with this event */
-    wxCaptionBar *GetCaptionBar() const {
-        return m_captionBar;
-    };
-
-    void SetTag(void *tag) {
-        m_tag = tag;
-    };
-
-    void *GetTag() const {
-        return m_tag;
-    };
-
-    /** Sets the bar associated with this event, should not used
-        by any other then the originator of the event */
-    void SetCaptionBar(wxCaptionBar *bar) {
-        m_captionBar = bar;
-    };
-
-    DECLARE_DYNAMIC_CLASS(wxCaptionBarEvent)
-
-};
-
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_FOLDBAR, wxEVT_CAPTIONBAR, 7777)
-END_DECLARE_EVENT_TYPES()
-
-typedef void (wxEvtHandler::*wxCaptionBarEventFunction)(wxCaptionBarEvent&);
-
-#define EVT_CAPTIONBAR(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_CAPTIONBAR, id, wxID_ANY, \
-        (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent(wxCaptionBarEventFunction, & fn), \
-        (wxObject *) NULL \
-    ),
-
-#endif // _NO_CAPTIONBAR_
-
-#endif
diff --git a/contrib/include/wx/foldbar/doc_mainpage.h b/contrib/include/wx/foldbar/doc_mainpage.h
deleted file mode 100644
index e709b114c9..0000000000
--- a/contrib/include/wx/foldbar/doc_mainpage.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        doc_mainpage.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/** \author Jorgen Bodde
-    \mainpage
-
-    This is the wxFoldPanel documentation guide. This control is written for wxWidgets (http://www.wxwidgets.com), and 
-    can be used as a side bar with managed panels which can collapse and expand. 
-
-    The wxFoldPanelBar is very easy in it's use and allows great flexibility in manipulating it even after creation. It can 
-    be created in two modes:
-
-    - In place folding: This means that the panels which are collapsed, stay where they are. 
-    - To bottom folding: This means that the panels are collapsed to the bottom
-
-    The caption bars are managed by another stand alone control (which I will fix up to be released soon), called the 
-    wxCaptionBar. You as user don't have to do much with this control right now, all styles are rerouted through the
-    wxFoldPanelBar. The only class of interest is wxCaptionBarStyle which takes care of the visual style of the
-    bar. The caption bar can be drawn in the following modes:
-
-    - Gradient horizontal fill
-    - Gradient vertical fill
-    - Single flat colour
-    - Single colour with border
-    - Single border with background fill
-
-    wxFoldPanelBar is freeware and distributed under the wxWidgets license. wxWidgets is THE toolkit for 
-    (cross platform) C++ / Python programming!
-
-    \section things_done Things to be done
-
-    I would like to add the following features when time allows me. When you really like one of these features to be in the 
-    next release, you can either make that clear to me, or help me with it. They aren't that hard.
-
-    - Single fold which means all other panels are collapsed automatically
-    - Smart size of panels when only one is open, take the whole space, or use sizers to proportionally size
-    - Small icons next to the caption for clarity and make it a bit more visually nice
-    - A bottom bar with visual icon when the bar cannot be completely shown to aid the user that there is more then can be seen
-    - Panels can be hidden. This feature will also need the bottom bar, so that the icons of hidden panels will apear there
-    - Resizable panels, the user can manually size the panels bigger or smaller
-
-    \section how_work How does it work?
-
-    The internals of the wxFoldPanelBar is a list of wxFoldPanelItem classes. Through the reference of wxFoldPanel these
-    panels can be controlled by adding new controls to a wxFoldPanel or adding new wxFoldPanels to the wxFoldPanelBar. The
-    wxCaptionBar fires events to the parent (container of all panel items) when a sub-panel needs resizing (either folding
-    or expanding). The fold or expand process is simply a resize of the panel so it looks like all controls on it are gone.
-    All controls are still child of the wxFoldPanel they are located on. If they don't handle the event (and they won't) 
-    then the owner of the wxFoldPanelBar gets the events. This is what you need to handle the controls. There isn't much to it
-    just a lot of calculations to see what panel belongs where. There are no sizers involved in the panels, everything is
-    purely xy positioning.
-
-    \section what_dp What can it do and what not?
-
-    What it can do:
-
-    - Run-time addition of panels (no deletion just yet)
-    - Run time addition of controls to the panel (it will be resized accordingly)
-    - Creating panels in collapsed mode or expanded mode
-    - Various modes of caption behaviour and filling to make it more appealing
-    - Panels can be folded and collapsed (or all of them) to allow more space
-    
-    What it cannot do:
-
-    - Selection of a panel like in a list ctrl
-    - Dragging and dropping the panels
-    - Re-ordering the panels (not yet)
-
-    Special thanks to Julian Smart et al. for making this great toolkit!
-*/
-
diff --git a/contrib/include/wx/foldbar/foldpanelbar.h b/contrib/include/wx/foldbar/foldpanelbar.h
deleted file mode 100644
index 68e70ec185..0000000000
--- a/contrib/include/wx/foldbar/foldpanelbar.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbar.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXFOLDPANELBAR_H__
-#define __WXFOLDPANELBAR_H__
-
-/** Not yet supported but added for future reference. Single fold forces other panels to close when
-    they are open, and only opens the current panel. This will allow the open panel to gain the full
-    size left in the client area */
-#define wxFPB_SINGLE_FOLD           0x0001
-
-/** All panels are stacked to the bottom. When they are expanded again they show up at the top */
-#define wxFPB_COLLAPSE_TO_BOTTOM    0x0002
-
-/** Orientation flag **/
-#define wxFPB_HORIZONTAL            wxHORIZONTAL /*  0x0004 */
-#define wxFPB_VERTICAL              wxVERTICAL   /*  0x0008 */
-
-/** Not yet supported, but added for future reference. Single fold plus panels will be stacked at the bottom */
-#define wxFPB_EXCLUSIVE_FOLD        wxFPB_SINGLE_FOLD | wxFPB_COLLAPSE_TO_BOTTOM
-
-/** Default style of the wxFoldPanelBar */
-#define wxFPB_DEFAULT_EXTRASTYLE    0
-
-#define wxFPB_DEFAULT_STYLE         wxTAB_TRAVERSAL | wxNO_BORDER
-
-#include "wx/foldbar/foldpanelitem.h"
-
-/** \class wxFoldPanel
-    This class is used to return a reference to the fold panel that is added by wxFoldPanelBar::AddFoldPanel(). Use
-    wxFoldPanel::IsOk() to check wether the result is ok to be used in further operations. Use wxFoldPanel::GetItem()
-    to obtain a parent window reference to create the controls on you want to add with wxFoldPanelBar::AddFoldPanelWindow().<br><br>
-*/
-
-class wxFoldPanel
-{
-private:
-    wxFoldPanelItem *m_item;
-
-public:
-    /** Constructor, usually not directly used by the developer. */
-    wxFoldPanel(wxFoldPanelItem *item)
-        : m_item(item)
-    {
-    }
-
-    /** Returns true if this is a valid wxFoldPanelItem reference. */
-    bool IsOk() const {
-        return (m_item != 0);
-    };
-
-    /** Copy operator to assign one instance to the other, this is needed because these classes are passed
-        as instance not by reference. */
-    virtual void operator=(const wxFoldPanel &item) {
-        m_item = item.m_item;
-    };
-
-#ifndef _NO_DOXYGEN_
-    // not allowed to be seen by doxygen
-    wxFoldPanelItem *GetItem() const {
-        return m_item;
-    };
-#endif
-
-    /** Use this method to obtain the wxPanel derived class to which you need to add your components. For example;<br>
-
-    \code
-        wxFoldPanel item = m_pnl->AddFoldPanel(wxT("Test me"), false);
-        m_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), wxID_ANY, wxT("Press Me")));
-    \endcode
-    */
-    wxFoldPanelItem *GetParent() const {
-        wxASSERT(m_item);
-        return m_item;
-    };
-
-
-};
-
-#include <wx/dynarray.h>
-WX_DEFINE_ARRAY_WITH_DECL_PTR(wxFoldPanelItem *, wxFoldPanelItemArray, class WXDLLIMPEXP_FOLDBAR);
-
-/** \class wxFoldPanelBar
-    The wxFoldPanelBar is a class which can maintain a list of collapsable panels. Once a panel is collapsed, only
-    it's panel bar is visible to the user. This will provide more space for the other panels, or allow the user to
-    close panels which are not used often to get the most out of the work area.
-
-    This control is easy to use. Simply create it as a child for a panel or sash window, and populate panels with
-    wxFoldPanelBar::AddFoldPanel(). Then use the wxFoldPanelBar::AddFoldPanelWindow() to add wxWindow derived controls
-    to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeparator() to put separators between the groups of
-    controls that need a visual separator to group them together. After all is constructed, the user can fold
-    the panels by doubleclicking on the bar or single click on the arrow, which will indicate the collapsed or
-    expanded state.
-*/
-
-class WXDLLIMPEXP_FOLDBAR wxFoldPanelBar: public wxPanel
-{
-private:
-    DECLARE_DYNAMIC_CLASS( wxFoldPanelBar )
-    DECLARE_EVENT_TABLE()
-
-    wxImageList *m_images;
-    wxFoldPanelItemArray m_panels;
-    wxBoxSizer* m_panelSizer;
-    wxPanel *m_foldPanel, *m_bottomPanel;
-    wxFlexGridSizer* m_mainSizer;
-    bool m_controlCreated;
-    wxBitmap *m_moreBmp;
-    int m_extraStyle;
-
-private:
-    /** Refreshes all the panels from given index down to last one */
-    void RefreshPanelsFrom(size_t i);
-
-    /** Refreshes all the panels from given pointer down to last one in the list */
-    void RefreshPanelsFrom(wxFoldPanelItem *item);
-
-    /** Returns the length of the panels that are expanded and collapsed. This is useful to determine
-        quickly what size is used to display, and what is left at the bottom (right) to align
-        the collapsed panels. */
-    int GetPanelsLength(int &collapsed, int &expanded);
-
-    /** Reposition all the collapsed panels to the bottom. When it is not possible to
-        align them to the bottom, stick them behind the visible panels. The Rect holds the
-        slack area left between last repositioned panel and the bottom panels. This needs to
-        get a refresh */
-    wxRect RepositionCollapsedToBottom();
-
-public:
-    /** Two step constructor used for XRC. Use wxFoldPanelBar::Create() to create the panel. Do not call
-        any other methods before the control is fully created! */
-    wxFoldPanelBar();
-    /** One step creation. Look at wxPanel for the argument and style flags. The extraStyle flags are
-        - wxFPB_DEFAULT_EXTRASTYLE : Takes default styles.
-        - wxFPB_COLLAPSE_TO_BOTTOM : When panels are collapsed, they are put at the bottom of the area. */
-    wxFoldPanelBar( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
-                    long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
-
-    /** wxFoldPanelBar destructor */
-    virtual ~wxFoldPanelBar();
-
-    /** Two step create call. Use this when the control is not created using the wxPanel derived constructor.
-        WARNING: Do not create this component more then once! */
-    virtual void Create( wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize, long style = wxFPB_DEFAULT_STYLE,
-                         long extraStyle = wxFPB_DEFAULT_EXTRASTYLE);
-
-    /** Adds a fold panel to the list of panels. If the flag collapsedInitially is set to true, the panel
-        is collapsed initially. The wxFoldPanel item which is returned, can be used as a reference to
-        perform actions upon the fold panel like collapsing it, expanding it, or deleting it from the list.
-
-        Use this foldpanel to add windows to it. Please consult wxFoldPanelBar::AddFoldPanelWindow() and
-        wxFoldPanelBar::AddFoldPanelSeparator() how to add wxWindow items to the panels. */
-    wxFoldPanel AddFoldPanel(const wxString &caption, bool collapsedInitially = false,
-                             const wxCaptionBarStyle &style = wxEmptyCaptionBarStyle);
-
-
-    /** Adds a wxWindow derived class to the referenced wxFoldPanel. IMPORTANT: Make the to be created window,
-        child of the wxFoldPanel. See example that follows. The flags to be used are:
-        - wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be aligned to fit the width of the
-          wxFoldPanel when it is resized. Very handy for sizer items, buttons and text boxes.
-        - wxFPB_ALIGN_LEFT: Aligns left instead of fitting the width of the child window to be added. Use either
-          this one or wxFPB_ALIGN_WIDTH.
-
-        The wxWindow to be added can be slightly indented from left and right so it is more visibly placed
-        in the wxFoldPanel. Use ySpacing > 0 to give the control an y offset from the previous wxWindow added,
-        use leftSpacing to give it a slight indent from the left, and rightSpacing also reserves a little space
-        on the right so the wxWindow can be properly placed in the wxFoldPanel.
-
-        The following example adds a wxFoldPanel to the wxFoldPanelBar and adds two wxWindow derived controls
-        to the wxFoldPanel:
-
-        \code
-
-            // create the wxFoldPanelBar
-            m_pnl = new wxFoldPanelBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, wxFPB_COLLAPSE_TO_BOTTOM);
-
-            // add a foldpanel to the control. "Test me" is the caption and it is initially not collapsed.
-            wxFoldPanel item = m_pnl->AddFoldPanel(wxT("Test me"), false);
-
-            // now add a button to the fold panel. Mind that the button should be made child of the
-            // wxFoldPanel and not of the main form.
-            m_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, wxT("Collapse Me")));
-
-            // add a separator between the two controls. This is purely a visual line that can have a certain
-            // color and also the indents and width alligning like a control.
-            m_pnl->AddFoldPanelSeperator(item);
-
-            // now add a text ctrl. Also very easy. Align this on width so that when the control gets wider
-            // the text control also sizes along.
-            m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
-
-        \endcode
-    */
-    int AddFoldPanelWindow(const wxFoldPanel &panel, wxWindow *window, int flags = wxFPB_ALIGN_WIDTH,
-                           int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTSPACING,
-                           int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING);
-
-    /** Adds a separator line to the current wxFoldPanel. The separator is a simple line which is drawn and is no
-        real component. It can be used to separate groups of controls which belong to each other. The colour is
-        adjustable, and it takes the same ySpacing, leftSpacing and rightSpacing as AddFoldPanelWindow(). */
-    int AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color = wxColour(167,167,167),
-                           int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,
-                           int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING);
-
-    /** Returns the number of panels currently present in the wxFoldPanelBar. This is independent if they are
-        visible or hidden. */
-    size_t GetCount() const {
-        return m_panels.GetCount();
-    };
-
-    inline bool IsVertical() const
-        {
-            return HasFlag(wxFPB_VERTICAL);
-        }
-
-    /** Returns the wxFoldPanel reference belonging to the current index. An empty panel is returned when the
-        index is out of bounds. Use GetCount() to get the amount of panels present. Collapsing and folding the
-        panel does not change the order in which they are indexed. So it is safe enough to keep a reference
-        to the panel by number. */
-    wxFoldPanel Item(size_t i) {
-        wxCHECK((int)i >= 0 && i < GetCount(), wxFoldPanel(0));
-        return wxFoldPanel(m_panels.Item(i));
-    };
-
-    /** Collapses the given wxFoldPanel reference, and updates the foldpanel bar. In the wxFPB_COLLAPSE_TO_BOTTOM
-        style, all collapsed captions are put at the bottom of the control. In the normal mode, they stay where
-        they are */
-    void Collapse(const wxFoldPanel &item) {
-        wxCHECK2(item.IsOk(), return);
-        item.GetItem()->Collapse();
-
-        RefreshPanelsFrom(item.GetItem());
-    };
-
-    /** Expands the given wxFoldPanel reference, and updates the foldpanel bar. In the wxFPB_COLLAPSE_TO_BOTTOM
-       they will be removed from the bottom and the order where the panel originally was placed is restored.  */
-    void Expand(const wxFoldPanel &item) {
-        wxCHECK2(item.IsOk(), return);
-        item.GetItem()->Expand();
-
-        RefreshPanelsFrom(item.GetItem());
-    };
-
- /** Sets the style of the caption bar (called wxCaptionBar) of the wxFoldPanel. The changes are applied immediately.
-        All styles not set in the wxCaptionBarStyle class are not applied. Use the wxCaptionBar reference to indicate
-        what captionbar you want to apply the style to. To apply one style to all wxCaptionBar items, use
-        ApplyCaptionStyleAll() */
-    void ApplyCaptionStyle(wxFoldPanel &fp, const wxCaptionBarStyle &style) {
-        wxCHECK2(fp.IsOk(), return);
-        fp.GetItem()->ApplyCaptionStyle(style);
-    };
-
-    /** Sets the style of all the caption bars of the wxFoldPanel. The changes are applied immediately */
-    void ApplyCaptionStyleAll(const wxCaptionBarStyle &style) {
-        for(size_t i = 0; i < GetCount(); i++)
-        {
-            wxFoldPanel item = Item(i);
-            ApplyCaptionStyle(item, style);
-        }
-    };
-
-    /** Returns the currently used caption style for the wxFoldPanel. It is returned as a wxCaptionBarStyle class.
-        after modifying it, it can be set again */
-    wxCaptionBarStyle GetCaptionStyle(wxFoldPanel &fp) const {
-        wxCHECK2(fp.IsOk(), return wxEmptyCaptionBarStyle);
-        return fp.GetItem()->GetCaptionStyle();
-    };
-
-private:
-    void OnPressCaption(wxCaptionBarEvent &event);
-    void OnSizePanel(wxSizeEvent &event);
-
-    /** Resize the fold panels so they match the width */
-    void RedisplayFoldPanelItems();
-
-    void OnPaint(wxPaintEvent &event);
-};
-
-#endif // __WXFOLDPANELBAR_H__
diff --git a/contrib/include/wx/foldbar/foldpanelitem.h b/contrib/include/wx/foldbar/foldpanelitem.h
deleted file mode 100644
index 2b8d490e3a..0000000000
--- a/contrib/include/wx/foldbar/foldpanelitem.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelitem.h
-// Purpose:     wxFoldPanel
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXFOLDPANELITEM_H__
-#define __WXFOLDPANELITEM_H__
-
-#include "wx/foldbar/captionbar.h"
-
-#define wxFPB_ALIGN_LEFT  0
-#define wxFPB_ALIGN_WIDTH 1
-
-#define wxFPB_DEFAULT_LEFTSPACING  5
-#define wxFPB_DEFAULT_RIGHTSPACING 10
-#define wxFPB_DEFAULT_SPACING     8
-
-#define wxFPB_DEFAULT_LEFTLINESPACING  2
-#define wxFPB_DEFAULT_RIGHTLINESPACING 2
-
-class wxFoldWindowItem
-{
-private:
-    wxWindow *m_wndItem;
-    int m_type, m_flags;
-    int m_leftSpacing,
-        m_rightSpacing,
-        m_Spacing;
-    int m_lineLength, m_lineY;
-    wxColour m_sepLineColour;
-
-public:
-    enum
-    {
-        WINDOW = 0,
-        SEPARATOR
-    };
-
-    // wxWindow constructor. This initialises the class as a wxWindow type
-    wxFoldWindowItem(wxWindow *wnd, int flags = wxFPB_ALIGN_WIDTH, int Spacing = wxFPB_DEFAULT_SPACING,
-                     int leftSpacing = wxFPB_DEFAULT_LEFTSPACING, int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING)
-        : m_wndItem(wnd)
-        , m_type(WINDOW)
-        , m_flags(flags)
-        , m_leftSpacing(leftSpacing)
-        , m_rightSpacing(rightSpacing)
-        , m_Spacing(Spacing)
-        , m_lineLength(0)
-        , m_lineY(0)
-    {
-    };
-
-    // separator constructor. This initialises the class as a separator type
-    wxFoldWindowItem(int y, const wxColour &lineColor = *wxBLACK, int Spacing = wxFPB_DEFAULT_SPACING,
-                     int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,
-                     int rightSpacing = wxFPB_DEFAULT_RIGHTLINESPACING)
-        : m_wndItem(NULL)
-        , m_type(SEPARATOR)
-        , m_flags(wxFPB_ALIGN_WIDTH)
-        , m_leftSpacing(leftSpacing)
-        , m_rightSpacing(rightSpacing)
-        , m_Spacing(Spacing)
-        , m_lineLength(0)
-        , m_lineY(y)
-        , m_sepLineColour(lineColor)
-    {
-    };
-
-    // TODO: Make a c'tor for a captioned splitter
-
-    int GetType() const {
-        return m_type;
-    };
-
-    int GetLineY() const {
-        return m_lineY;
-    };
-
-    int GetLineLength() const {
-        return m_lineLength;
-    };
-
-    const wxColour &GetLineColour() const {
-        return m_sepLineColour;
-    };
-
-    int GetLeftSpacing() const {
-        return m_leftSpacing;
-    };
-
-    int GetRightSpacing() const {
-        return m_rightSpacing;
-    };
-
-    int GetSpacing() const {
-        return m_Spacing;
-    };
-
-    // returns space needed by the window if type is wxFoldWindowItem::WINDOW
-    // and returns the total size plus the extra spacing
-
-    int GetWindowLength(bool vertical) const {
-        int value = 0;
-        if(m_type == WINDOW)
-        {
-            wxCHECK(m_wndItem, 0);
-            wxSize size = m_wndItem->GetSize();
-            value = ( vertical ? size.GetHeight() : size.GetWidth() ) + m_Spacing;
-        }
-        else if(m_type == SEPARATOR)
-            value = 1 + m_Spacing;
-
-        return value;
-    };
-
-    // resize the element, whatever it is. A separator or
-    // line will be always aligned by width or height
-    // depending on orientation of the whole panel
-
-    void ResizeItem(int size, bool vertical) {
-        if(m_flags & wxFPB_ALIGN_WIDTH)
-        {
-            // align by taking full width
-            int mySize = size - m_leftSpacing - m_rightSpacing;
-
-            if(mySize < 0)
-                mySize = 10; // can't have negative width
-
-            if(m_type == SEPARATOR)
-                m_lineLength = mySize;
-            else
-            {
-                wxCHECK2(m_wndItem, return);
-                m_wndItem->SetSize(vertical?mySize:wxDefaultCoord, vertical?wxDefaultCoord:mySize);
-            }
-        }
-    };
-
-};
-
-#include <wx/dynarray.h>
-WX_DECLARE_OBJARRAY_WITH_DECL(wxFoldWindowItem, wxFoldWindowItemArray, class WXDLLIMPEXP_FOLDBAR);
-
-#ifndef _NO_DOXYGEN_
-
-/** \wxFoldPanelItem
-    This class is a child sibling of the wxFoldPanelBar class. It will be containing a wxCaptionBar class
-    for receiving of events, and a the rest of the area can be populated by a wxPanel derived class.
-*/
-
-class WXDLLIMPEXP_FOLDBAR wxFoldPanelItem: public wxPanel
-{
-private:
-    wxCaptionBar *m_captionBar;
-
-    bool m_controlCreated;
-    int m_userSize,
-        m_panelSize,
-        m_lastInsertPos;
-    int m_itemPos;
-    bool m_userSized;
-
-private:
-    DECLARE_CLASS( wxFoldPanelItem )
-    DECLARE_EVENT_TABLE()
-
-private:
-    wxFoldWindowItemArray m_items;
-
-    void OnSize(wxSizeEvent &event);
-    void OnPressCaption(wxCaptionBarEvent &event);
-    void OnPaint(wxPaintEvent &event);
-
-public:
-    // constructors and destructors
-    wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxImageList *icons = 0, bool collapsedInitially = false,
-                     const wxCaptionBarStyle &style = wxEmptyCaptionBarStyle);
-    virtual ~wxFoldPanelItem();
-
-    /** Add a window item to the list of items on this panel. The flags are wxFPB_ALIGN_LEFT for a non sizing
-        window element, and wxFPB_ALIGN_WIDTH for a width aligned item. The ySpacing parameter reserves a number
-        of pixels before the window element, and leftSpacing is an indent. rightSpacing is only relevant when the
-        style wxFPB_ALIGN_WIDTH is chosen. */
-    void AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing);
-
-    void AddSeparator(const wxColour &color, int ySpacing, int leftSpacing, int rightSpacing);
-
-    /** Repositions this wxFoldPanelBar and reports the length occupied for the next wxFoldPanelBar in the
-        list */
-    int Reposition(int pos);
-
-    void ResizePanel();
-
-    /** Return expanded or collapsed status. If the panel is expanded, true is returned */
-    bool IsExpanded() const {
-        return !m_captionBar->IsCollapsed();
-    };
-
-    /** Return Y pos */
-
-    int GetItemPos() const {
-        return m_itemPos;
-    };
-
-    // this should not be called by the user, because it doesn't trigger the parent
-    // to tell it that we are collapsed or expanded, it only changes visual state
-    void Collapse() {
-        m_captionBar->Collapse();
-        ResizePanel();
-    };
-
-    // this should not be called by the user, because it doesn't trigger the parent
-    // to tell it that we are collapsed or expanded, it only changes visual state
-    void Expand() {
-        m_captionBar->Expand();
-        ResizePanel();
-    };
-
-    /* Return size of panel */
-
-    int GetPanelLength() const {
-        if(m_captionBar->IsCollapsed())
-            return GetCaptionLength();
-        else if(m_userSized)
-            return m_userSize;
-        return m_panelSize;
-    };
-
-    bool IsVertical() const;
-
-    // returns space of caption only. This is for folding calulation
-    // purposes
-
-    int GetCaptionLength() const {
-        wxSize size = m_captionBar->GetSize();
-        return IsVertical() ? size.GetHeight() : size.GetWidth();
-    };
-
-    void ApplyCaptionStyle(const wxCaptionBarStyle &style) {
-        wxCHECK2(m_captionBar, return);
-        m_captionBar->SetCaptionStyle(false, style);
-    };
-
-    wxCaptionBarStyle GetCaptionStyle() {
-        wxCHECK(m_captionBar, wxEmptyCaptionBarStyle);
-        return m_captionBar->GetCaptionStyle();
-    };
-};
-
-
-#endif // _NO_DOXYGEN_
-
-#endif // __WXFOLDPANELITEM_H__
diff --git a/contrib/include/wx/gizmos/dynamicsash.h b/contrib/include/wx/gizmos/dynamicsash.h
deleted file mode 100644
index 2d5da5c8b0..0000000000
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynamicsash.h
-// Purpose:     A window which can be dynamically split to an arbitrary depth
-//              and later reunified through the user interface
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DYNAMICSASH_H_
-#define _WX_DYNAMICSASH_H_
-
-#include "wx/gizmos/gizmos.h"
-
-#if !wxUSE_MDI
-#    error "wxUSE_MDI must be defined for gizmos to compile."
-#endif /* !wxUSE_MDI */
-
-
-/*
-
-    wxDynamicSashWindow
-
-    wxDynamicSashWindow widgets manages the way other widgets are viewed.
-    When a wxDynamicSashWindow is first shown, it will contain one child
-    view, a viewport for that child, and a pair of scrollbars to allow the
-    user to navigate the child view area.  Next to each scrollbar is a small
-    tab.  By clicking on either tab and dragging to the appropriate spot, a
-    user can split the view area into two smaller views separated by a
-    draggable sash.  Later, when the user wishes to reunify the two subviews,
-    the user simply drags the sash to the side of the window.
-    wxDynamicSashWindow will automatically reparent the appropriate child
-    view back up the window hierarchy, and the wxDynamicSashWindow will have
-    only one child view once again.
-
-    As an application developer, you will simply create a wxDynamicSashWindow
-    using either the Create() function or the more complex constructor
-    provided below, and then create a view window whose parent is the
-    wxDynamicSashWindow.  The child should respond to
-    wxDynamicSashSplitEvents -- perhaps with an OnSplit() event handler -- by
-    constructing a new view window whose parent is also the
-    wxDynamicSashWindow.  That's it!  Now your users can dynamically split
-    and reunify the view you provided.
-
-    If you wish to handle the scrollbar events for your view, rather than
-    allowing wxDynamicSashWindow to do it for you, things are a bit more
-    complex.  (You might want to handle scrollbar events yourself, if,
-    for instance, you wish to scroll a subwindow of the view you add to
-    your wxDynamicSashWindow object, rather than scrolling the whole view.)
-    In this case, you will need to construct your wxDynamicSashWindow without
-    the wxDS_MANAGE_SCROLLBARS style and  you will need to use the
-    GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
-    controls and call SetEventHanler() on them to redirect the scrolling
-    events whenever your window is reparented by wxDyanmicSashWindow.
-    You will need to set the scrollbars' event handler at three times:
-
-        *  When your view is created
-        *  When your view receives a wxDynamicSashSplitEvent
-        *  When your view receives a wxDynamicSashUnifyEvent
-
-    See the dynsash_switch sample application for an example which does this.
-
-*/
-
-
-#include "wx/event.h"
-#include "wx/window.h"
-
-class WXDLLIMPEXP_CORE wxScrollBar;
-
-// ----------------------------------------------------------------------------
-// dynamic sash styles
-// ----------------------------------------------------------------------------
-
-/*
-    wxDS_MANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
-    will cause it to respond to scrollbar events for your application by
-    automatically scrolling the child view.
-*/
-#define wxDS_MANAGE_SCROLLBARS  0x0010
-
-
-/*
-  wxDS_DRAG_CORNER style indicates that the views can also be resized by
-  dragging the corner piece between the scrollbars, and which is reflected up
-  to the frame if necessary.
-*/
-#define wxDS_DRAG_CORNER        0x0020
-
-/*
-    Default style for wxDynamicSashWindow.
- */
-#define wxDS_DEFAULT            wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER
-
-// ----------------------------------------------------------------------------
-// dynamic sash events
-// ----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_GIZMOS const wxEventType wxEVT_DYNAMIC_SASH_SPLIT;
-extern WXDLLIMPEXP_GIZMOS const wxEventType wxEVT_DYNAMIC_SASH_UNIFY;
-
-#define EVT_DYNAMIC_SASH_SPLIT(id, func) \
-    wx__DECLARE_EVT1(wxEVT_DYNAMIC_SASH_SPLIT, id, \
-                        wxDynamicSashSplitEventHandler(func))
-
-#define EVT_DYNAMIC_SASH_UNIFY(id, func) \
-    wx__DECLARE_EVT1(wxEVT_DYNAMIC_SASH_UNIFY, id, \
-                        wxDynamicSashUnifyEventHandler(func))
-
-
-/*
-    wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
-    whenever your view is being split by the user.  It is your
-    responsibility to handle this event by creating a new view window as
-    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
-    automatically reparent it to the proper place in its window hierarchy.
-*/
-class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent
-{
-public:
-    wxDynamicSashSplitEvent();
-    wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event)
-        : wxCommandEvent(event) { }
-    wxDynamicSashSplitEvent(wxObject *target);
-
-    virtual wxEvent* Clone() const { return new wxDynamicSashSplitEvent(*this); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
-};
-
-/*
-    wxDynamicSashUnifyEvents are sent to your view by wxDynamicSashWindow
-    whenever the sash which splits your view and its sibling is being
-    reunified such that your view is expanding to replace its sibling.
-    You needn't do anything with this event if you are allowing
-    wxDynamicSashWindow to manage your view's scrollbars, but it is useful
-    if you are managing the scrollbars yourself so that you can keep
-    the scrollbars' event handlers connected to your view's event handler
-    class.
-*/
-class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent
-{
-public:
-    wxDynamicSashUnifyEvent();
-    wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
-    wxDynamicSashUnifyEvent(wxObject *target);
-
-    virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent)
-};
-
-typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);
-typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&);
-
-#define wxDynamicSashSplitEventHandler(func) \
-    (wxObjectEventFunction)(wxEventFunction) \
-        wxStaticCastEvent(wxDynamicSashSplitEventFunction, &func)
-
-#define wxDynamicSashUnifyEventHandler(func) \
-    (wxObjectEventFunction)(wxEventFunction) \
-        wxStaticCastEvent(wxDynamicSashUnifyEventFunction, &func)
-
-#define wx__DECLARE_TREEEVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREE_ ## evt, id, wxTreeEventHandler(fn))
-
-// ----------------------------------------------------------------------------
-// wxDynamicSashWindow itself
-// ----------------------------------------------------------------------------
-
-WXDLLIMPEXP_GIZMOS extern const wxChar* wxDynamicSashWindowNameStr;
-
-class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow
-{
-public:
-    wxDynamicSashWindow();
-    wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxDS_DEFAULT,
-                        const wxString& name = wxDynamicSashWindowNameStr);
-    virtual ~wxDynamicSashWindow();
-
-    virtual bool Create(wxWindow *parent, wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDS_DEFAULT,
-                        const wxString& name = wxDynamicSashWindowNameStr);
-    virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
-    virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
-
-    /*  This is overloaded from wxWindowBase.  It's not here for you to
-        call directly.  */
-    virtual void AddChild(wxWindowBase *child);
-
-private:
-    class wxDynamicSashWindowImpl *m_impl;
-
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
-};
-
-#endif // _WX_DYNAMICSASH_H_
-
diff --git a/contrib/include/wx/gizmos/editlbox.h b/contrib/include/wx/gizmos/editlbox.h
deleted file mode 100644
index e0206d1cd9..0000000000
--- a/contrib/include/wx/gizmos/editlbox.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        editlbox.h
-// Purpose:     ListBox with editable items
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __WX_EDITLBOX_H__
-#define __WX_EDITLBOX_H__
-
-#include "wx/panel.h"
-#include "wx/gizmos/gizmos.h"
-
-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
-
-#define wxEL_ALLOW_NEW          0x0100
-#define wxEL_ALLOW_EDIT         0x0200
-#define wxEL_ALLOW_DELETE       0x0400
-#define wxEL_NO_REORDER         0x0800
-
-// This class provides a composite control that lets the
-// user easily enter list of strings
-
-class WXDLLIMPEXP_GIZMOS wxEditableListBox : public wxPanel
-{
-    DECLARE_CLASS(wxEditableListBox)
-
-public:
-    wxEditableListBox(wxWindow *parent, wxWindowID id,
-                      const wxString& label,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
-                      const wxString& name = wxT("editableListBox"));
-
-    void SetStrings(const wxArrayString& strings);
-    void GetStrings(wxArrayString& strings) const;
-
-    wxListCtrl* GetListCtrl()       { return m_listCtrl; }
-    wxBitmapButton* GetDelButton()  { return m_bDel; }
-    wxBitmapButton* GetNewButton()  { return m_bNew; }
-    wxBitmapButton* GetUpButton()   { return m_bUp; }
-    wxBitmapButton* GetDownButton() { return m_bDown; }
-    wxBitmapButton* GetEditButton() { return m_bEdit; }
-
-protected:
-    wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
-    wxListCtrl *m_listCtrl;
-    int m_selection;
-    long m_style;
-
-    void OnItemSelected(wxListEvent& event);
-    void OnEndLabelEdit(wxListEvent& event);
-    void OnNewItem(wxCommandEvent& event);
-    void OnDelItem(wxCommandEvent& event);
-    void OnEditItem(wxCommandEvent& event);
-    void OnUpItem(wxCommandEvent& event);
-    void OnDownItem(wxCommandEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
diff --git a/contrib/include/wx/gizmos/gizmos.h b/contrib/include/wx/gizmos/gizmos.h
deleted file mode 100644
index 43207ea437..0000000000
--- a/contrib/include/wx/gizmos/gizmos.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _WX_GIZMOS_H_
-#define _WX_GIZMOS_H_
-
-#ifdef WXMAKINGDLL_GIZMOS
-    #define WXDLLIMPEXP_GIZMOS WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_GIZMOS WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_GIZMOS
-#endif
-
-#ifdef WXMAKINGDLL_GIZMOS_XRC
-    #define WXDLLIMPEXP_GIZMOS_XRC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_GIZMOS_XRC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_GIZMOS_XRC
-#endif
-
-#endif
diff --git a/contrib/include/wx/gizmos/ledctrl.h b/contrib/include/wx/gizmos/ledctrl.h
deleted file mode 100644
index b3421f7c3e..0000000000
--- a/contrib/include/wx/gizmos/ledctrl.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef _WX_LEDNUMBERCTRL_H_
-#define _WX_LEDNUMBERCTRL_H_
-
-#include "wx/gizmos/gizmos.h"
-
-#include <wx/window.h>
-#include <wx/control.h>
-
-class wxEraseEvent;
-class wxPaintEvent;
-class wxSizeEvent;
-
-// ----------------------------------------------------------------------------
-// enum and styles
-// ----------------------------------------------------------------------------
-
-enum wxLEDValueAlign
-{
-    wxLED_ALIGN_LEFT   = 0x01,
-    wxLED_ALIGN_RIGHT  = 0x02,
-    wxLED_ALIGN_CENTER = 0x04,
-
-    wxLED_ALIGN_MASK   = 0x07
-};
-
-#define wxLED_DRAW_FADED 0x08
-
-// ----------------------------------------------------------------------------
-// wxLEDNumberCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl : public wxControl
-{
-public:
-    // Constructors.
-    wxLEDNumberCtrl();
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
-
-    // Create functions.
-    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0);
-
-    wxLEDValueAlign GetAlignment() const { return m_Alignment; }
-    bool GetDrawFaded() const { return m_DrawFaded; }
-    const wxString &GetValue() const { return m_Value; }
-
-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = true);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = true);
-    void SetValue(const wxString &Value, bool Redraw = true);
-
-private:
-    // Members.
-    wxString m_Value;
-    wxLEDValueAlign m_Alignment;
-
-    int m_LineMargin;
-    int m_DigitMargin;
-    int m_LineLength;
-    int m_LineWidth;
-    bool m_DrawFaded;
-    int m_LeftStartPos;
-
-    // Functions.
-    void DrawDigit(wxDC &Dc, int Digit, int Column);
-    void RecalcInternals(const wxSize &CurrentSize);
-
-    // Events.
-    DECLARE_EVENT_TABLE()
-
-    void OnEraseBackground(wxEraseEvent &Event);
-    void OnPaint(wxPaintEvent &Event);
-    void OnSize(wxSizeEvent &Event);
-};
-
-#endif
diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h
deleted file mode 100644
index 6e44285488..0000000000
--- a/contrib/include/wx/gizmos/multicell.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        multicell.h
-// Purpose:     provide two new classes for layout, wxMultiCellSizer and wxMultiCellCanvas
-// Author:      Jonathan Bayer
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) Jonathan Bayer
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// This was inspired by the gbsizer class written by Alex Andruschak
-
-
-#ifndef __WX_MULTICELL_H__
-#define __WX_MULTICELL_H__
-
-#include "wx/gizmos/gizmos.h"
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// The classes are derived from wxSizer
-#include "wx/sizer.h"
-
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-enum wxResizable
-{
-    wxNOT_RESIZABLE =           0x00,
-    wxHORIZONTAL_RESIZABLE =    0x01,
-    wxVERTICAL_RESIZABLE =      0x10,
-    wxRESIZABLE =               0x11
-};
-
-//---------------------------------------------------------------------------
-// classes
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// wxMultiCellItemHandle
-//---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
-{
-    DECLARE_CLASS(wxMultiCellItemHandle)
-protected:
-    int             m_column;
-    int             m_row;
-    int             m_width;
-    int             m_height;
-    wxResizable     m_style;
-    wxSize          m_fixedSize;
-    int             m_alignment;
-    wxSize          m_weight;
-
-public:
-    wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-    int             GetColumn() const;
-    int             GetRow() const;
-    int             GetWidth() const;
-    int             GetHeight() const;
-    wxResizable     GetStyle() const;
-    wxSize          GetLocalSize() const;
-    int             GetAlignment() const;
-    wxSize          GetWeight() const;
-
-private:
-    void Initialize( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
-
-};
-
-//---------------------------------------------------------------------------
-// wxMultiCellSizer
-//---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
-{
-    DECLARE_CLASS(wxMultiCellSizer)
-
-protected:
-    wxSize m_cell_count;
-
-public:
-    wxMultiCellSizer(wxSize & size);
-    wxMultiCellSizer(int rows, int cols);
-    ~wxMultiCellSizer();
-
-    virtual void RecalcSizes();
-    virtual wxSize CalcMin();
-    bool SetDefaultCellSize(wxSize size);
-    bool SetColumnWidth(int column, int colSize = 5, bool expandable = false);
-    bool SetRowHeight(int row, int rowSize = 5, bool expandable = false);
-    bool EnableGridLines(wxWindow *win);
-    bool SetGridPen(const wxPen *pen);
-    void OnPaint(wxDC& dc);
-
-private:
-    void GetMinimums();
-    static int Sum(int *array, int x);
-
-private:
-    int *m_maxHeight;
-    int *m_maxWidth;
-    int *m_rowStretch;
-    int *m_colStretch;
-    wxSize **m_weights;
-    wxSize **m_minSizes;
-    int m_maxWeights;
-    wxSize m_defaultCellSize;
-    wxWindow *m_win; // usually used for debugging
-    const wxPen *m_pen;
-
-    void DrawGridLines(wxDC& dc);
-    void Initialize(wxSize size);
-};
-
-
-// wxCell is used internally, so we don't need to declare it here
-
-class wxCell;
-
-//---------------------------------------------------------------------------
-// wxMultiCellCanvas
-//---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer
-{
-public:
-    wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
-    void Add(wxWindow *win, unsigned int row, unsigned int col);
-
-    void Resize(int numRows, int numCols);
-    int MaxRows() const
-    {
-        return m_maxRows;
-    };
-    int MaxCols() const
-    {
-        return m_maxCols;
-    };
-    void CalculateConstraints();
-    void SetMinCellSize(const wxSize size)
-    {
-        m_minCellSize = size;
-    };
-
-  /* These are to hide Add() method of parents and to avoid Borland warning about hiding virtual functions */
-  void Add( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL )
-       { wxFlexGridSizer::Add( window, proportion, flag, border, userData); }
-  void Add( wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL )
-       { wxFlexGridSizer::Add( sizer, proportion, flag, border, userData); }
-  void Add( int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL )
-       { wxFlexGridSizer::Add( width, height, proportion, flag, border, userData); }
-  void Add( wxSizerItem *item )
-       { wxFlexGridSizer::Add( item); }
-
-private:
-    wxWindow            *m_parent;
-    unsigned int         m_maxRows, m_maxCols;
-
-    wxSize              m_minCellSize;
-    wxCell              **m_cells;
-};
-
-#endif
-
-
-
-/*** End of File ***/
diff --git a/contrib/include/wx/gizmos/splittree.h b/contrib/include/wx/gizmos/splittree.h
deleted file mode 100644
index c6cd5896ad..0000000000
--- a/contrib/include/wx/gizmos/splittree.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        splittree.h
-// Purpose:     Classes to achieve a remotely-scrolled tree in a splitter
-//              window that can be scrolled by a scrolled window higher in the
-//              hierarchy
-// Author:      Julian Smart
-// Modified by:
-// Created:     8/7/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SPLITTREE_H_
-#define _WX_SPLITTREE_H_
-
-#include "wx/gizmos/gizmos.h"
-
-// Set this to 1 to use generic tree control (doesn't yet work properly)
-#define USE_GENERIC_TREECTRL 0
-
-#include "wx/wx.h"
-#include "wx/treectrl.h"
-#include "wx/splitter.h"
-#include "wx/scrolwin.h"
-
-#if USE_GENERIC_TREECTRL
-#include "wx/generic/treectlg.h"
-#ifndef wxTreeCtrl
-#define wxTreeCtrl wxGenericTreeCtrl
-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
-#endif
-#endif
-
-class wxRemotelyScrolledTreeCtrl;
-class wxThinSplitterWindow;
-class wxSplitterScrolledWindow;
-
-/*
- * wxRemotelyScrolledTreeCtrl
- *
- * This tree control disables its vertical scrollbar and catches scroll
- * events passed by a scrolled window higher in the hierarchy.
- * It also updates the scrolled window vertical scrollbar as appropriate.
- */
-
-class WXDLLIMPEXP_GIZMOS wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
-{
-    DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
-public:
-    wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
-        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
-    ~wxRemotelyScrolledTreeCtrl();
-
-//// Events
-    void OnSize(wxSizeEvent& event);
-    void OnExpand(wxTreeEvent& event);
-    void OnScroll(wxScrollWinEvent& event);
-    void OnPaint(wxPaintEvent& event);
-
-//// Overrides
-    // Override this in case we're using the generic tree control.
-    // Calls to this should disable the vertical scrollbar.
-
-    // Number of pixels per user unit (0 or -1 for no scrollbar)
-    // Length of virtual canvas in user units
-    // Length of page in user units
-    virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
-                             int noUnitsX, int noUnitsY,
-                             int xPos = 0, int yPos = 0,
-                             bool noRefresh = false );
-
-    // In case we're using the generic tree control.
-    // Get the view start
-    virtual void GetViewStart(int *x, int *y) const;
-
-    // In case we're using the generic tree control.
-    virtual void PrepareDC(wxDC& dc);
-
-    // In case we're using the generic tree control.
-    virtual int GetScrollPos(int orient) const;
-
-//// Helpers
-    void HideVScrollbar();
-
-    // Calculate the tree overall size so we can set the scrollbar
-    // correctly
-    void CalcTreeSize(wxRect& rect);
-    void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);
-
-    // Adjust the containing wxScrolledWindow's scrollbars appropriately
-    void AdjustRemoteScrollbars();
-
-    // Find the scrolled window that contains this control
-    wxScrolledWindow* GetScrolledWindow() const;
-
-    // Scroll to the given line (in scroll units where each unit is
-    // the height of an item)
-    void ScrollToLine(int posHoriz, int posVert);
-
-//// Accessors
-
-    // The companion window is one which will get notified when certain
-    // events happen such as node expansion
-    void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
-    wxWindow* GetCompanionWindow() const { return m_companionWindow; }
-
-
-    DECLARE_EVENT_TABLE()
-protected:
-    wxWindow*   m_companionWindow;
-    bool        m_drawRowLines;
-};
-
-/*
- * wxTreeCompanionWindow
- *
- * A window displaying values associated with tree control items.
- */
-
-class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow
-{
-public:
-    DECLARE_CLASS(wxTreeCompanionWindow)
-
-    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = 0);
-
-//// Overrides
-    virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);
-
-//// Events
-    void OnPaint(wxPaintEvent& event);
-    void OnScroll(wxScrollWinEvent& event);
-    void OnExpand(wxTreeEvent& event);
-
-//// Operations
-
-//// Accessors
-    wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
-    void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }
-
-//// Data members
-protected:
-    wxRemotelyScrolledTreeCtrl* m_treeCtrl;
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-/*
- * wxThinSplitterWindow
- *
- * Implements a splitter with a less obvious sash
- * than the usual one.
- */
-
-class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow
-{
-public:
-    DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
-
-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = wxSP_3D | wxCLIP_CHILDREN);
-    ~wxThinSplitterWindow();
-
-//// Overrides
-
-    void SizeWindows();
-    // Tests for x, y over sash. Overriding this allows us to increase
-    // the tolerance.
-    bool SashHitTest(int x, int y, int tolerance = 2);
-    void DrawSash(wxDC& dc);
-
-//// Events
-
-    void OnSize(wxSizeEvent& event);
-
-//// Operations
-
-//// Accessors
-
-//// Data members
-protected:
-    wxPen*      m_facePen;
-    wxBrush*    m_faceBrush;
-
-    DECLARE_EVENT_TABLE()
-};
-
-/*
- * wxSplitterScrolledWindow
- *
- * This scrolled window is aware of the fact that one of its
- * children is a splitter window. It passes on its scroll events
- * (after some processing) to both splitter children for them
- * scroll appropriately.
- */
-
-class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow
-{
-public:
-    DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
-
-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = 0);
-
-//// Overrides
-
-//// Events
-
-    void OnScroll(wxScrollWinEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-//// Operations
-
-//// Accessors
-
-//// Data members
-public:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-        // _SPLITTREE_H_
diff --git a/contrib/include/wx/gizmos/statpict.h b/contrib/include/wx/gizmos/statpict.h
deleted file mode 100644
index fd8633dbe6..0000000000
--- a/contrib/include/wx/gizmos/statpict.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        statpict.h
-// Purpose:     wxStaticPicture class
-// Author:      Wade Brainerd
-// Modified by:
-// Created:     2003-05-01
-// RCS-ID:
-// Copyright:   (c) Wade Brainerd
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATPICT_H_
-#define _WX_STATPICT_H_
-
-#include "wx/control.h"
-
-#include "wx/icon.h"
-#include "wx/bitmap.h"
-#include "wx/image.h"
-
-#include "wx/gizmos/gizmos.h"
-
-enum
-{
-    wxSCALE_HORIZONTAL = 0x1,
-    wxSCALE_VERTICAL   = 0x2,
-    wxSCALE_UNIFORM    = 0x4,
-    wxSCALE_CUSTOM     = 0x8
-};
-
-WXDLLIMPEXP_GIZMOS extern const wxChar* wxStaticPictureNameStr;
-
-class WXDLLIMPEXP_GIZMOS wxStaticPicture : public wxControl
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticPicture)
-
-public:
-    wxStaticPicture() {}
-
-    wxStaticPicture( wxWindow* parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticPictureNameStr )
-    {
-        Create( parent, id, label, pos, size, style, name );
-    }
-
-    bool Create( wxWindow* parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticPictureNameStr );
-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
-    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event)) {return true;}
-    void OnPaint(wxPaintEvent& event);
-
-    void SetBitmap( const wxBitmap& bmp );
-
-    wxBitmap GetBitmap() const
-    {
-        return Bitmap;
-    }
-
-    // Icon interface for compatibility with wxStaticBitmap.
-    void SetIcon( const wxIcon& icon )
-    {
-        wxBitmap bmp;
-        bmp.CopyFromIcon( icon );
-        SetBitmap( bmp );
-    }
-
-    wxIcon GetIcon() const
-    {
-        wxIcon icon;
-        icon.CopyFromBitmap( Bitmap );
-        return icon;
-    }
-
-    void SetAlignment( int align )
-    {
-        Align = align;
-    }
-
-    int GetAlignment() const
-    {
-        return Align;
-    }
-
-    void SetScale( int scale )
-    {
-        Scale = scale;
-    }
-
-    int GetScale() const
-    {
-        return Scale;
-    }
-
-    void SetCustomScale( float sx, float sy )
-    {
-        ScaleX = sx;
-        ScaleY = sy;
-    }
-
-    void GetCustomScale( float* sx, float* sy ) const
-    {
-        *sx = ScaleX;
-        *sy = ScaleY;
-    }
-
-protected:
-    wxBitmap Bitmap;
-
-    int Align;
-
-    int Scale;
-    float ScaleX;
-    float ScaleY;
-
-#ifndef __WXMSW__
-    // When scaling is enabled, measures are taken to improve performance on non-Windows platforms.
-    // - The original bitmap is stored as a wxImage, because conversion from wxBitmap to wxImage is slow.
-    // - The latest scaled bitmap is cached, this improves performance when the control is repainted
-    //   but the size hasn't changed (overlapping windows, movement, etc).
-    wxImage OriginalImage;
-    float LastScaleX;
-    float LastScaleY;
-    wxBitmap ScaledBitmap;
-#endif
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // #ifndef _WX_STATPICT_H_
diff --git a/contrib/include/wx/gizmos/xh_statpict.h b/contrib/include/wx/gizmos/xh_statpict.h
deleted file mode 100644
index a5ff3b4354..0000000000
--- a/contrib/include/wx/gizmos/xh_statpict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_statpict.h
-// Purpose:     XRC resource handler for wxStaticPicture
-// Author:      David A. Norris
-// Created:     2005/03/13
-// RCS-ID:      $Id$
-// Copyright:   David A. Norris
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STATPICT_H
-#define _WX_XH_STATPICT_H
-
-#include "wx/xrc/xmlres.h"
-#include "wx/gizmos/gizmos.h"
-
-//
-// XML resource handler for the wxStaticPicture class in wxContrib.
-//
-
-class WXDLLIMPEXP_GIZMOS_XRC wxStaticPictureXmlHandler
-    : public wxXmlResourceHandler
-{
-public:
-
-    // Constructor.
-    wxStaticPictureXmlHandler();
-
-    // Creates the control and returns a pointer to it.
-    virtual wxObject *DoCreateResource();
-
-    // Returns true if we know how to create a control for the given node.
-    virtual bool CanHandle(wxXmlNode *node);
-
-    // Register with wxWindows' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(wxStaticPictureXmlHandler)
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/cdbase.h b/contrib/include/wx/mmedia/cdbase.h
deleted file mode 100644
index b8d6f6e1e5..0000000000
--- a/contrib/include/wx/mmedia/cdbase.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// ---------------------------------------------------------------------------
-// Name:       cdbase.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998, 1999, 2000
-// Copyright:  (C) 1997, 1998, 1999, 2000 Guilhem Lavaux
-// License:    wxWindows license
-// ---------------------------------------------------------------------------
-#ifndef __CDA_base_H__
-#define __CDA_base_H__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/mmedia/defs.h"
-
-typedef struct wxCDtime {
-  wxUint8 track;
-  wxUint8 hour, min, sec;
-} wxCDtime;
-
-class WXDLLIMPEXP_MMEDIA wxCDAudio : public wxObject {
-  DECLARE_ABSTRACT_CLASS(wxCDAudio)
-public:
-  typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
-  // Table of contents manager
-  class WXDLLIMPEXP_MMEDIA CDtoc {
-  protected:
-    wxCDtime *tracks_time, *tracks_pos;
-    wxCDtime total_time;
-  public:
-    //
-    CDtoc(wxCDtime& tot_tm, wxCDtime *trks_tm, wxCDtime *trks_pos)
-      { tracks_time = trks_tm; total_time = tot_tm; tracks_pos = trks_pos; }
-
-    // Returns the length of the specified track
-    // track: track to get length
-    wxCDtime GetTrackTime(wxUint8 track) const;
-    // Returns the position of the specified track
-    // track: track to get position
-    wxCDtime GetTrackPos(wxUint8 track) const;
-    // Returns the total time
-    inline wxCDtime GetTotalTime() const { return total_time; }
-  };
-public:
-  //
-  wxCDAudio() : wxObject() {}
-  //
-  virtual ~wxCDAudio() {}
-
-  // Play audio at the specified position
-  virtual bool Play(const wxCDtime& beg_play, const wxCDtime& end_play) = 0;
-  // Play audio from the specified to the end of the CD audio
-  bool Play(const wxCDtime& beg_play);
-  //
-  bool Play(wxUint8 beg_track, wxUint8 end_track = 0);
-  // Pause the audio playing
-  virtual bool Pause() = 0;
-  // Resume a paused audio playing
-  virtual bool Resume() = 0;
-  // Get the current CD status
-  virtual CDstatus GetStatus() = 0;
-  // Get the current playing time
-  virtual wxCDtime GetTime() = 0;
-  // Returns the table of contents
-  virtual const CDtoc& GetToc() = 0;
-  // CD ok
-  virtual bool Ok() const = 0;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/cdunix.h b/contrib/include/wx/mmedia/cdunix.h
deleted file mode 100644
index 1d297b63e1..0000000000
--- a/contrib/include/wx/mmedia/cdunix.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// ---------------------------------------------------------------------------
-// Name:       cdunix.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    2000
-// Copyright:  (C) 1997, 1998, 1999, 2000 Guilhem Lavaux
-// License:    wxWindows license
-// ---------------------------------------------------------------------------
-#ifndef __CDUNIXH__
-#define __CDUNIXH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/cdbase.h"
-
-///
-class WXDLLIMPEXP_MMEDIA wxCDAudioLinux : public wxCDAudio {
-  DECLARE_DYNAMIC_CLASS(wxCDAudioLinux)
-protected:
-  wxCDtime m_time;
-  CDstatus m_status;
-  CDtoc *m_toc;
-  int m_fd;
-  wxCDtime *m_trksize, *m_trkpos;
-public:
-  ///
-  wxCDAudioLinux();
-  ///
-  wxCDAudioLinux(const wxString& dev_name);
-  ///
-  virtual ~wxCDAudioLinux();
-
-  ///
-  virtual bool Play(const wxCDtime& beg_time, const wxCDtime& end_time);
-  ///
-  virtual bool Pause();
-  ///
-  virtual bool Resume();
-  ///
-  virtual CDstatus GetStatus();
-  ///
-  virtual wxCDtime GetTime();
-  ///
-  virtual CDtoc& GetToc();
-  ///
-  virtual inline bool Ok() const { return (m_fd != -1); }
-protected:
-  ///
-  void OpenDevice(const wxString& dev_name);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/cdwin.h b/contrib/include/wx/mmedia/cdwin.h
deleted file mode 100644
index bf17f81727..0000000000
--- a/contrib/include/wx/mmedia/cdwin.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// /////////////////////////////////////////////////////////////////////////////
-// Name:       cdwin.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// License:    wxWindows license
-// /////////////////////////////////////////////////////////////////////////////
-#ifndef __CDA_win_H__
-#define __CDA_win_H__
-
-#include "wx/wxprec.h"
-#include "wx/mmedia/defs.h"
-#include "cdbase.h"
-
-#ifdef WXMMEDIA_INTERNAL
-#include <windows.h>
-#include <mmsystem.h>
-typedef struct CDAW_Internal {
-  MCIDEVICEID dev_id;
-} CDAW_Internal;
-#endif
-
-///
-class WXDLLIMPEXP_MMEDIA wxCDAudioWin : public wxCDAudio {
-  DECLARE_DYNAMIC_CLASS(wxCDAudioWin)
-protected:
-  struct CDAW_Internal *m_internal;
-  wxCDtime *m_trksize, *m_trkpos;
-  CDtoc *m_toc;
-  bool m_ok;
-public:
-  ///
-  wxCDAudioWin(void);
-  ///
-  wxCDAudioWin(const char *dev_name);
-  ///
-  virtual ~wxCDAudioWin(void);
-
-  ///
-  virtual bool Play(const wxCDtime& beg_time, const wxCDtime& end_time);
-  ///
-  virtual bool Pause(void);
-  ///
-  virtual bool Resume(void);
-  ///
-  virtual CDstatus GetStatus(void);
-  ///
-  virtual wxCDtime GetTime(void);
-  ///
-  virtual const CDtoc& GetToc(void);
-  ///
-  virtual inline bool Ok(void) const { return m_ok; }
-protected:
-  void PrepareToc();
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/defs.h b/contrib/include/wx/mmedia/defs.h
deleted file mode 100644
index 223f84216b..0000000000
--- a/contrib/include/wx/mmedia/defs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _WX_MMEDIA_DEFS_H_
-#define _WX_MMEDIA_DEFS_H_
-
-#ifdef WXMAKINGDLL_MMEDIA
-    #define WXDLLIMPEXP_MMEDIA WXEXPORT
-    #define WXDLLIMPEXP_DATA_MMEDIA(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_MMEDIA WXIMPORT
-    #define WXDLLIMPEXP_DATA_MMEDIA(type) WXIMPORT type
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_MMEDIA
-    #define WXDLLIMPEXP_DATA_MMEDIA(type) type
-#endif
-
-#endif // _WX_MMEDIA_DEFS_H_
diff --git a/contrib/include/wx/mmedia/internal/g72x.h b/contrib/include/wx/mmedia/internal/g72x.h
deleted file mode 100644
index dbfd64fd5b..0000000000
--- a/contrib/include/wx/mmedia/internal/g72x.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g72x.h
- *
- * Header file for CCITT conversion routines.
- *
- */
-#ifndef _G72X_H
-#define	_G72X_H
-
-#define	AUDIO_ENCODING_ULAW	(1)	/* ISDN u-law */
-#define	AUDIO_ENCODING_ALAW	(2)	/* ISDN A-law */
-#define	AUDIO_ENCODING_LINEAR	(3)	/* PCM 2's-complement (0-center) */
-
-/*
- * The following is the definition of the state structure
- * used by the G.721/G.723 encoder and decoder to preserve their internal
- * state between successive calls.  The meanings of the majority
- * of the state structure fields are explained in detail in the
- * CCITT Recommendation G.721.  The field names are essentially indentical
- * to variable names in the bit level description of the coding algorithm
- * included in this Recommendation.
- */
-struct g72x_state {
-	long yl;	/* Locked or steady state step size multiplier. */
-	short yu;	/* Unlocked or non-steady state step size multiplier. */
-	short dms;	/* Short term energy estimate. */
-	short dml;	/* Long term energy estimate. */
-	short ap;	/* Linear weighting coefficient of 'yl' and 'yu'. */
-
-	short a[2];	/* Coefficients of pole portion of prediction filter. */
-	short b[6];	/* Coefficients of zero portion of prediction filter. */
-	short pk[2];	/*
-			 * Signs of previous two samples of a partially
-			 * reconstructed signal.
-			 */
-	short dq[6];	/*
-			 * Previous 6 samples of the quantized difference
-			 * signal represented in an internal floating point
-			 * format.
-			 */
-	short sr[2];	/*
-			 * Previous 2 samples of the quantized difference
-			 * signal represented in an internal floating point
-			 * format.
-			 */
-	char td;	/* delayed tone detect, new in 1988 version */
-};
-
-/* External function definitions. */
-
-extern unsigned char linear2alaw (int pcm_val);	/* 2's complement (16-bit range) */
-extern int alaw2linear (unsigned char a_val);
-extern unsigned char linear2ulaw (int pcm_val);	/* 2's complement (16-bit range) */
-extern int ulaw2linear (unsigned char u_val);
-extern int predictor_zero (struct g72x_state *state_ptr);
-extern int predictor_pole (struct g72x_state *state_ptr);
-extern int step_size (struct g72x_state *state_ptr);
-extern int quantize (int d, int y, short *table, int size);
-extern int reconstruct (int sign, int dqln, int y);
-
-extern void update
-    ( int code_size, int y, int wi, int fi, int dq
-	, int sr, int dqsez, struct g72x_state *state_ptr);
-
-int tandem_adjust_alaw
-    (int sr, int se, int y, int i, int sign, short *qtab);
-
-int tandem_adjust_ulaw
-    (int sr, int se, int y, int i, int sign, short *qtab);
-
-extern void g72x_init_state (struct g72x_state *);
-extern int g721_encoder(
-		int sample,
-		int in_coding,
-		struct g72x_state *state_ptr);
-extern int g721_decoder(
-		int code,
-		int out_coding,
-		struct g72x_state *state_ptr);
-extern int g723_24_encoder(
-		int sample,
-		int in_coding,
-		struct g72x_state *state_ptr);
-extern int g723_24_decoder(
-		int code,
-		int out_coding,
-		struct g72x_state *state_ptr);
-extern int g723_40_encoder(
-		int sample,
-		int in_coding,
-		struct g72x_state *state_ptr);
-extern int g723_40_decoder(
-		int code,
-		int out_coding,
-		struct g72x_state *state_ptr);
-
-#endif /* !_G72X_H */
diff --git a/contrib/include/wx/mmedia/sndaiff.h b/contrib/include/wx/mmedia/sndaiff.h
deleted file mode 100644
index 778708a52f..0000000000
--- a/contrib/include/wx/mmedia/sndaiff.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndaiff.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDAIFF_H
-#define _WX_SNDAIFF_H
-
-#include "wx/defs.h"
-#include "wx/stream.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-
-//
-// AIFF codec
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundAiff: public wxSoundFileStream {
-public:
-    wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound);
-    wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound);
-    ~wxSoundAiff();
-    
-    bool CanRead();
-    wxString GetCodecName() const;
-    
-protected:
-    bool PrepareToPlay(); 
-    bool PrepareToRecord(wxUint32 time);
-    bool FinishRecording();
-    bool RepositionStream(wxUint32 position);
-    
-    wxUint32 GetData(void *buffer, wxUint32 len);
-    wxUint32 PutData(const void *buffer, wxUint32 len);
-protected:
-    off_t m_base_offset;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndbase.h b/contrib/include/wx/mmedia/sndbase.h
deleted file mode 100644
index 02a33dabdf..0000000000
--- a/contrib/include/wx/mmedia/sndbase.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndbase.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDBASE_H
-#define _WX_SNDBASE_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-
-// ------------------------------------------------------------------------
-// DEFINITIONS
-
-// ---------------------
-// Sound streaming mode:
-//   - wxSOUND_INPUT: simple recording mode
-//   - wxSOUND_OUTPUT: simple playing mode
-//   - wxSOUND_DUPLEX: full duplex record/play at the same time
-// ---------------------
-enum {
-  wxSOUND_INPUT = 1,
-  wxSOUND_OUTPUT = 2,
-  wxSOUND_DUPLEX = wxSOUND_INPUT | wxSOUND_OUTPUT,
-};
-
-// ---------------------
-// wxSoundFormatType: it specifies the format family of the sound data
-// which will be passed to the stream.
-// ---------------------
-typedef enum {
-  wxSOUND_NOFORMAT,
-  wxSOUND_PCM,
-  wxSOUND_ULAW,
-  wxSOUND_G72X,
-  wxSOUND_MSADPCM
-} wxSoundFormatType;
-
-// ---------------------
-// wxSoundError:
-//   - wxSOUND_NOERR: No error occurred
-//   - wxSOUND_IOERR: an input/output error occurred, it may concern either
-//                    a driver or a file
-//   - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
-//                      Generally, it means that you passed out of range values
-//                      to the codec stream or you don't pass the right sound
-//                      format object to the right sound codec stream.
-//   - wxSOUND_INVDEV: Invalid device. Generally, it means that the sound stream
-//                     didn't manage to open the device driver due to an invalid//                     parameter or to the fact that sound is not supported on
-//                     this computer.
-//   - wxSOUND_NOEXACT: No exact matching sound codec has been found for
-//                      this sound format. It means that the sound driver didn't
-//                      manage to setup the sound card with the specified
-//                      values.
-//   - wxSOUND_NOCODEC: No matching codec has been found. Generally, it 
-//                      may happen when you call
-//                      wxSoundRouterStream::SetSoundFormat().
-//   - wxSOUND_MEMERR:  Not enough memory.
-//   - wxSOUND_NOTSTARTED: You did not start the production using
-//                         StartProduction()
-// ---------------------
-typedef enum {
-  wxSOUND_NOERROR,
-  wxSOUND_IOERROR,
-  wxSOUND_INVFRMT,
-  wxSOUND_INVDEV,
-  wxSOUND_NOEXACT,
-  wxSOUND_INVSTRM,
-  wxSOUND_NOCODEC,
-  wxSOUND_MEMERROR,
-  wxSOUND_NOTSTARTED
-} wxSoundError;
-
-class WXDLLIMPEXP_MMEDIA wxSoundStream;
-
-// ---------------------
-// wxSoundCallback(stream, evt, cdata): C callback for sound event.
-//    - stream: current wxSoundStream
-//    - evt: the sound event which has occurred, it may be wxSOUND_INPUT,
-//            wxSOUND_OUTPUT or wxSOUND_DUPLEX
-//    - cdata: User callback data
-// ---------------------
-typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt,
-                                void *cdata);
-
-//
-// Base class for sound format specification
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundFormatBase {
- public:
-  wxSoundFormatBase();
-  virtual ~wxSoundFormatBase();
-
-  // It returns a "standard" format type.
-  virtual wxSoundFormatType GetType() const { return wxSOUND_NOFORMAT; }
-  // It clones the current format.
-  virtual wxSoundFormatBase *Clone() const;
-
-  virtual wxUint32 GetTimeFromBytes(wxUint32 bytes) const = 0;
-  virtual wxUint32 GetBytesFromTime(wxUint32 time) const = 0;
- 
-  virtual bool operator !=(const wxSoundFormatBase& frmt2) const;
-};
-
-//
-// Base class for sound streams
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundStream {
- public:
-  wxSoundStream();
-  virtual ~wxSoundStream();
-
-  // Reads "len" bytes from the sound stream.
-  virtual wxSoundStream& Read(void *buffer, wxUint32 len) = 0;
-  // Writes "len" byte to the sound stream.
-  virtual wxSoundStream& Write(const void *buffer, wxUint32 len) = 0;
-  // Returns the best size for IO calls
-  virtual wxUint32 GetBestSize() const { return 1024; }
-
-  // SetSoundFormat returns true when the format can be handled.
-  virtual bool SetSoundFormat(const wxSoundFormatBase& format);
-
-  // GetSoundFormat returns the current sound format.
-  wxSoundFormatBase& GetSoundFormat() const { return *m_sndformat; }
-
-  // Register a callback for a specified async event.
-  void SetCallback(int evt, wxSoundCallback cbk, void *cdata);
-
-  // Starts the async notifier. After this call, the stream begins either 
-  // recording or playing or the two at the same time.
-  virtual bool StartProduction(int evt) = 0;
-  // Stops the async notifier.
-  virtual bool StopProduction() = 0;
-  // Sets the event handler: if it is non-null, all events are routed to it.
-  void SetEventHandler(wxSoundStream *handler) { m_handler = handler; }
-
-  wxSoundError GetError() const { return m_snderror; }
-  wxUint32 GetLastAccess() const { return m_lastcount; }
-
-  // This is only useful for device (I think).
-  virtual bool QueueFilled() const { return true; }
-
- protected:
-  // Current sound format
-  wxSoundFormatBase *m_sndformat;
-
-  // Last error
-  wxSoundError m_snderror;
-
-  // Last access
-  wxUint32 m_lastcount;
-
-  // Event handler
-  wxSoundStream *m_handler;
-
-  wxSoundCallback m_callback[2];
-  void *m_cdata[2];
-
- protected:
-  // Handles event
-  virtual void OnSoundEvent(int evt);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndcodec.h b/contrib/include/wx/mmedia/sndcodec.h
deleted file mode 100644
index 814565eb69..0000000000
--- a/contrib/include/wx/mmedia/sndcodec.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcodec.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDCODEC_H
-#define _WX_SNDCODEC_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-
-class WXDLLIMPEXP_MMEDIA wxSoundStreamCodec: public wxSoundStream {
- public:
-  wxSoundStreamCodec(wxSoundStream& snd_io);
-  ~wxSoundStreamCodec();
-
-  bool StartProduction(int evt);
-  bool StopProduction();
-
-  wxUint32 GetBestSize() const;
-
- protected:
-  wxSoundStream *m_sndio;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndcpcm.h b/contrib/include/wx/mmedia/sndcpcm.h
deleted file mode 100644
index 89ba551ba4..0000000000
--- a/contrib/include/wx/mmedia/sndcpcm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcpcm.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDCPCM_H
-#define _WX_SNDCPCM_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-
-//
-// PCM converter class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundStreamPcm: public wxSoundStreamCodec {
-public:
-    typedef void (*ConverterType)(const void *buf_in, void *buf_out,
-                                  wxUint32 len);
-    
-    wxSoundStreamPcm(wxSoundStream& sndio);
-    ~wxSoundStreamPcm();
-    
-    wxSoundStream& Read(void *buffer, wxUint32 len);
-    wxSoundStream& Write(const void *buffer, wxUint32 len);
-    
-    bool SetSoundFormat(const wxSoundFormatBase& format);
-    
-    wxUint32 GetBestSize() const;
-    
-protected:
-    wxUint32 GetReadSize(wxUint32 len) const;
-    wxUint32 GetWriteSize(wxUint32 len) const;
-
-protected:
-    ConverterType m_function_out, m_function_in;
-
-    // Static temporary buffer
-    char *m_prebuffer;
-    wxUint32 m_prebuffer_size;
-    // Estimated best size to fit into the static buffer
-    wxUint32 m_best_size;
-    // Multiplier for IO buffer size
-    float m_multiplier_in, m_multiplier_out;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndesd.h b/contrib/include/wx/mmedia/sndesd.h
deleted file mode 100644
index 211c5e6c83..0000000000
--- a/contrib/include/wx/mmedia/sndesd.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndesd.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDESD_H
-#define _WX_SNDESD_H
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-
-//
-// ESD output class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundStreamESD : public wxSoundStream {
-public:
-    wxSoundStreamESD(const wxString& hostname = wxT("localhost"));
-    ~wxSoundStreamESD();
-    
-    wxSoundStream& Read(void *buffer, wxUint32 len);
-    wxSoundStream& Write(const void *buffer, wxUint32 len);
-    
-    bool SetSoundFormat(const wxSoundFormatBase& format);
-    
-    bool StartProduction(int evt);
-    bool StopProduction();
-    
-    // You should not call this.
-    void WakeUpEvt(int evt);
-
-    bool QueueFilled() const { return m_q_filled; }
-protected:
-    int m_fd_input, m_fd_output;      // ESD fds
-    int m_tag_input, m_tag_output;    // GLIB tags
-    bool m_esd_stop;                  // Stream started ?
-    bool m_esd_ok;                    // ESD detected
-    wxString m_hostname;              // ESD host
-    bool m_q_filled;                  // queue filled
-
-private:
-    void DetectBest(wxSoundFormatPcm *pcm);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndfile.h b/contrib/include/wx/mmedia/sndfile.h
deleted file mode 100644
index a3fed7ab42..0000000000
--- a/contrib/include/wx/mmedia/sndfile.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndfile.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDFILE_H
-#define _WX_SNDFILE_H
-
-#include "wx/defs.h"
-#include "wx/stream.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-
-#define wxSOUND_INFINITE_TIME ((wxUint32)-1)
-
-//
-// Codec router class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundRouterStream: public wxSoundStreamCodec {
- public:
-  wxSoundRouterStream(wxSoundStream& sndio);
-  ~wxSoundRouterStream();
-
-  wxSoundStream& Read(void *buffer, wxUint32 len);
-  wxSoundStream& Write(const void *buffer, wxUint32 len);
-
-  bool SetSoundFormat(const wxSoundFormatBase& format);
-
-  bool StartProduction(int evt);
-  bool StopProduction();
-
-  wxUint32 GetBestSize() const;
-
- protected:
-  wxSoundStream *m_router;
-};
-
-typedef enum {
- wxSOUND_FILE_STOPPED,
- wxSOUND_FILE_PAUSED,
- wxSOUND_FILE_PLAYING,
- wxSOUND_FILE_RECORDING
-} wxSoundFileState;
-
-//
-// Base class for file coders/decoders
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundFileStream: public wxSoundStream {
-public:
-    wxSoundFileStream(wxInputStream& stream, wxSoundStream& io_sound);
-    wxSoundFileStream(wxOutputStream& stream, wxSoundStream& io_sound);
-    ~wxSoundFileStream();
-    
-    // Usual sound file calls (Play, Stop, ...)
-    bool Play();
-    bool Record(wxUint32 time);
-    bool Stop();
-    bool Pause();
-    bool Resume();
-    
-    // Functions which return the current state
-    bool IsStopped() const { return m_state == wxSOUND_FILE_STOPPED; }
-    bool IsPaused() const { return m_state == wxSOUND_FILE_PAUSED; }
-    
-    // A user should not call these two functions.
-    // Several things must be done before calling them.
-    // Users should use Play(), ... 
-    bool StartProduction(int evt);
-    bool StopProduction();
-
-    // These three functions deals with the length, the position in the sound file.
-    // All the values are expressed in bytes. If you need the values expressed
-    // in terms of time, you have to use GetSoundFormat().GetTimeFromBytes(...)
-    wxUint32 GetLength();
-    wxUint32 GetPosition();
-    wxUint32 SetPosition(wxUint32 new_position);
-    
-    // These two functions use the sound format specified by GetSoundFormat().
-    // All samples must be encoded in that format. 
-    wxSoundStream& Read(void *buffer, wxUint32 len); 
-    wxSoundStream& Write(const void *buffer, wxUint32 len);
-    
-    // This function set the sound format of the file. !! It must be used only
-    // when you are in output mode (concerning the file) !! If you are in
-    // input mode (concerning the file) you can't use this function to modify
-    // the format of the samples returned by Read() !
-    // For this action, you must use wxSoundRouterStream applied to wxSoundFileStream. 
-    bool SetSoundFormat(const wxSoundFormatBase& format);
-    
-    // This function returns the Codec name. This is useful for those who want to build
-    // a player (But also in some other case).
-    virtual wxString GetCodecName() const;
-    
-    // You should use this function to test whether this file codec can read
-    // the stream you passed to it.
-    virtual bool CanRead() { return false; }
-    
-protected:
-    wxSoundRouterStream m_codec; 
-    wxSoundStream *m_sndio;
-    wxInputStream *m_input;
-    wxOutputStream *m_output;
-    
-    wxSoundFileState m_state, m_oldstate;
-    wxUint32 m_length, m_bytes_left;
-    bool m_prepared;
-    
-protected:
-    virtual bool PrepareToPlay() = 0; 
-    virtual bool PrepareToRecord(wxUint32 time) = 0;
-    virtual bool FinishRecording() = 0;
-    virtual bool RepositionStream(wxUint32 position) = 0;
-    void FinishPreparation(wxUint32 len);
-    
-    virtual wxUint32 GetData(void *buffer, wxUint32 len) = 0;
-    virtual wxUint32 PutData(const void *buffer, wxUint32 len) = 0;
-    
-    void OnSoundEvent(int evt);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndg72x.h b/contrib/include/wx/mmedia/sndg72x.h
deleted file mode 100644
index 4ff7f8d01b..0000000000
--- a/contrib/include/wx/mmedia/sndg72x.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndg72x.h
-// Purpose:
-// Date: 08/26/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDG72X_H
-#define _WX_SNDG72X_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndbase.h"
-
-typedef enum {
-  wxSOUND_G721,
-  wxSOUND_G723_24,
-  wxSOUND_G723_40
-} wxSoundG72XType;
-
-// This fixes a bug in Mingw95
-typedef struct g72x_state g72state;
-
-//
-// G72X format
-//
-class WXDLLIMPEXP_MMEDIA wxSoundFormatG72X: public wxSoundFormatBase {
- public:
-  wxSoundFormatG72X();
-  ~wxSoundFormatG72X();
-
-  void SetG72XType(wxSoundG72XType type);
-  wxSoundG72XType GetG72XType() const { return m_g72x_type; }
-
-  void SetSampleRate(wxUint32 srate);
-  wxUint32 GetSampleRate() const;
-
-  wxSoundFormatType GetType() const { return wxSOUND_G72X; }
-  wxSoundFormatBase *Clone() const;
-
-  wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
-  wxUint32 GetBytesFromTime(wxUint32 time) const;
-
-  bool operator !=(const wxSoundFormatBase& frmt2) const;
-
- protected:
-  wxUint32 m_srate;
-  wxSoundG72XType m_g72x_type;
-};
-
-//
-// ULAW converter class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
-class WXDLLIMPEXP_MMEDIA wxSoundStreamG72X: public wxSoundStreamCodec {
- public:
-  wxSoundStreamG72X(wxSoundStream& sndio);
-  ~wxSoundStreamG72X();
-
-  wxSoundStream& Read(void *buffer, wxUint32 len);
-  wxSoundStream& Write(const void *buffer, wxUint32 len);
-
-  bool SetSoundFormat(const wxSoundFormatBase& format);
-
- protected:
-  wxSoundRouterStream *m_router;
-  wxUint8 m_n_bits, m_current_mask, m_current_b_pos, m_current_byte;
-  wxUint8 *m_io_buffer;
-  g72state *m_state;
-
-  int (*m_coder)(int code, int in_code, struct g72x_state *state);
-  int (*m_decoder)(int code, int out_code, struct g72x_state *state);
-
- protected:
-  void PutBits(wxUint8 bits);
-  wxUint8 GetBits();
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndmsad.h b/contrib/include/wx/mmedia/sndmsad.h
deleted file mode 100644
index 3e6d1f66b4..0000000000
--- a/contrib/include/wx/mmedia/sndmsad.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndmsad(pcm).h
-// Purpose: MS ADPCM codec
-// Date: 25/02/2000
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 2000
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDMSAD_H
-#define _WX_SNDMSAD_H
-
-#include "wx/defs.h"
-#include "wx/dynarray.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndbase.h"
-
-WX_DEFINE_EXPORTED_ARRAY_INT(wxInt16, wxMSAdpcmCoeffs);
-
-//
-// MSADPCM format
-//
-class WXDLLIMPEXP_MMEDIA wxSoundFormatMSAdpcm: public wxSoundFormatBase {
-public:
-    wxSoundFormatMSAdpcm();
-    ~wxSoundFormatMSAdpcm();
-    
-    void SetSampleRate(wxUint32 srate);
-    wxUint32 GetSampleRate() const;
-    
-    void SetCoefs(wxInt16 **coefs, wxUint16 ncoefs, wxUint16 coefs_len);
-    void GetCoefs(wxInt16 **&coefs, wxUint16& ncoefs,
-                  wxUint16& coefs_len) const;
-
-    void SetBlockSize(wxUint16 block_size);
-    wxUint16 GetBlockSize() const;
-    
-    void SetChannels(wxUint16 channels);
-    wxUint16 GetChannels() const;
-    
-    wxSoundFormatType GetType() const { return wxSOUND_MSADPCM; }
-    wxSoundFormatBase *Clone() const;
-    
-    wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
-    wxUint32 GetBytesFromTime(wxUint32 time) const;
-    
-    bool operator !=(const wxSoundFormatBase& frmt2) const;
-
-protected:
-    wxUint32 m_srate, m_nchannels;
-    wxInt16 **m_coefs;
-    wxUint16 m_ncoefs, m_coefs_len;
-    wxUint16 m_block_size;
-};
-
-//
-// MS ADPCM converter class
-//
-class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
-class WXDLLIMPEXP_MMEDIA wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
-public:
-    wxSoundStreamMSAdpcm(wxSoundStream& sndio);
-    ~wxSoundStreamMSAdpcm();
-    
-    wxSoundStream& Read(void *buffer, wxUint32 len);
-    wxSoundStream& Write(const void *buffer, wxUint32 len);
-    
-    bool SetSoundFormat(const wxSoundFormatBase& format);
-
-    wxUint32 GetBestSize() const;
-
-protected:
-    wxSoundRouterStream *m_router;
-
-    typedef struct {
-        wxInt32 predictor;
-        wxInt16 samp1;
-        wxInt16 samp2;
-        wxInt16 coeff[2];
-        wxInt32 iDelta;
-    } AdpcmState;
-
-    AdpcmState m_state[1];
-    
-    bool     m_got_header;
-    bool     m_stereo;
-    wxInt16  **m_coefs;
-    wxUint16 m_block_size;
-    wxUint16 m_ncoefs;
-    wxUint16 m_next_block;
-    
-protected:
-    wxUint32 DecodeMonoADPCM(const void *in_buffer, void *out_buffer,
-                             wxUint32 in_len);
-    wxUint32 DecodeStereoADPCM(const void *in_buffer, void *out_buffer,
-                               wxUint32 in_len);
-    void Nibble(wxInt8 nyb,
-                AdpcmState *state,
-                wxInt16 **out_buffer);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndoss.h b/contrib/include/wx/mmedia/sndoss.h
deleted file mode 100644
index 1f0664a449..0000000000
--- a/contrib/include/wx/mmedia/sndoss.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndoss.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDOSS_H
-#define _WX_SNDOSS_H
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-
-//
-// OSS output class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundStreamOSS : public wxSoundStream {
- public:
-  wxSoundStreamOSS(const wxString& dev_name = wxT("/dev/dsp"));
-  ~wxSoundStreamOSS();
-
-  wxSoundStream& Read(void *buffer, wxUint32 len);
-  wxSoundStream& Write(const void *buffer, wxUint32 len);
-  wxUint32 GetBestSize() const;
-
-  bool SetSoundFormat(const wxSoundFormatBase& format);
-
-  bool StartProduction(int evt);
-  bool StopProduction();
-
-  bool QueueFilled() const;
-
-  // You should not call this.
-  void WakeUpEvt(int evt);
- protected:
-  // OSS device
-  int m_fd;
-  wxUint32 m_bufsize;
-  int m_tag;
-  bool m_oss_stop, m_oss_ok, m_q_filled;
-  wxString m_devname;
-
- private:
-  bool SetupFormat(wxSoundFormatPcm *pcm);
-  void DetectBest(wxSoundFormatPcm *pcm);
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndpcm.h b/contrib/include/wx/mmedia/sndpcm.h
deleted file mode 100644
index 9572aa5fb7..0000000000
--- a/contrib/include/wx/mmedia/sndpcm.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndpcm.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDPCM_H
-#define _WX_SNDPCM_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-
-//
-// PCM specification class
-//
-
-class wxSoundFormatPcm : public wxSoundFormatBase {
-public:
-  wxSoundFormatPcm(wxUint32 srate = 22500, wxUint8 bps = 8,
-                   wxUint16 channels = 2, bool sign = true,
-                   int order = wxLITTLE_ENDIAN); 
-  ~wxSoundFormatPcm();
-
-  void SetSampleRate(wxUint32 srate);
-  void SetBPS(wxUint8 bps);
-  void SetChannels(wxUint16 nchannels);
-  void SetOrder(int order);
-  void Signed(bool sign);
-
-  wxUint32 GetSampleRate() const { return m_srate; }
-  wxUint8 GetBPS() const { return m_bps; }
-  wxUint16 GetChannels() const { return m_nchan; }
-  int GetOrder() const { return m_order; }
-  bool Signed() const { return m_signed; }
-
-  wxSoundFormatType GetType() const { return wxSOUND_PCM; }
-  wxSoundFormatBase *Clone() const;
-
-  wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
-  wxUint32 GetBytesFromTime(wxUint32 time) const;
-
-  bool operator!=(const wxSoundFormatBase& frmt2) const;
-
-protected:
-  wxUint32 m_srate;
-  wxUint8 m_bps;
-  wxUint16 m_nchan;
-  int m_order;
-  bool m_signed;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndulaw.h b/contrib/include/wx/mmedia/sndulaw.h
deleted file mode 100644
index b0f7993abd..0000000000
--- a/contrib/include/wx/mmedia/sndulaw.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndulaw.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDULAW_H
-#define _WX_SNDULAW_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndbase.h"
-
-//
-// ULAW format
-//
-class WXDLLIMPEXP_MMEDIA wxSoundFormatUlaw: public wxSoundFormatBase {
-public:
-    wxSoundFormatUlaw();
-    ~wxSoundFormatUlaw();
-    
-    void SetSampleRate(wxUint32 srate);
-    wxUint32 GetSampleRate() const;
-    
-    void SetChannels(wxUint8 channels);
-    wxUint8 GetChannels() const;
-    
-    wxSoundFormatType GetType() const { return wxSOUND_ULAW; }
-    wxSoundFormatBase *Clone() const;
-    
-    wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
-    wxUint32 GetBytesFromTime(wxUint32 time) const;
-    
-    bool operator !=(const wxSoundFormatBase& frmt2) const;
-    
-protected:
-    wxUint32 m_srate;
-    wxUint8 m_channels;
-};
-
-//
-// ULAW converter class
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
-class WXDLLIMPEXP_MMEDIA wxSoundStreamUlaw: public wxSoundStreamCodec {
-public:
-    wxSoundStreamUlaw(wxSoundStream& sndio);
-    ~wxSoundStreamUlaw();
-    
-    wxSoundStream& Read(void *buffer, wxUint32 len);
-    wxSoundStream& Write(const void *buffer, wxUint32 len);
-    
-    bool SetSoundFormat(const wxSoundFormatBase& format);
-    
-    wxUint32 GetBestSize() const;
-    
-protected:
-    wxSoundRouterStream *m_router;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndwav.h b/contrib/include/wx/mmedia/sndwav.h
deleted file mode 100644
index 951a0a0697..0000000000
--- a/contrib/include/wx/mmedia/sndwav.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwav.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDWAV_H
-#define _WX_SNDWAV_H
-
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/stream.h"
-#include "wx/datstrm.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-
-//
-// WAVE codec
-//
-
-class WXDLLIMPEXP_MMEDIA wxSoundWave: public wxSoundFileStream {
-public:
-    wxSoundWave(wxInputStream& stream, wxSoundStream& io_sound);
-    wxSoundWave(wxOutputStream& stream, wxSoundStream& io_sound);
-    ~wxSoundWave();
-    
-    bool CanRead();
-    wxString GetCodecName() const;
-    
-protected:
-    bool PrepareToPlay(); 
-    bool PrepareToRecord(wxUint32 time);
-    bool FinishRecording();
-    bool RepositionStream(wxUint32 position);
-    
-    wxUint32 GetData(void *buffer, wxUint32 len);
-    wxUint32 PutData(const void *buffer, wxUint32 len);
-    
-    bool HandleOutputPCM(wxDataInputStream& data, wxUint32 len,
-                         wxUint16 channels, wxUint32 sample_fq,
-                         wxUint32 byte_p_sec, wxUint16 byte_p_spl,
-                         wxUint16 bits_p_spl);
-    bool HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
-                             wxUint16 channels, wxUint32 sample_fq,
-                             wxUint32 byte_p_sec, wxUint16 byte_p_spl,
-                             wxUint16 bits_p_spl);
-    bool HandleOutputG721(wxDataInputStream& data, wxUint32 len,
-                          wxUint16 channels, wxUint32 sample_fq,
-                          wxUint32 byte_p_sec, wxUint16 byte_p_spl,
-                          wxUint16 bits_p_spl);
-    wxSoundFormatBase *HandleInputPCM(wxDataOutputStream& data);
-    wxSoundFormatBase *HandleInputG72X(wxDataOutputStream& data);
-
-protected:
-    off_t m_base_offset;
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/sndwin.h b/contrib/include/wx/mmedia/sndwin.h
deleted file mode 100644
index 341f0b5253..0000000000
--- a/contrib/include/wx/mmedia/sndwin.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwin.h
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// License:    wxWindows license
-// --------------------------------------------------------------------------
-#ifndef _WX_SNDWIN_H
-#define _WX_SNDWIN_H
-
-#include "wx/defs.h"
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/sndbase.h"
-
-typedef struct _wxSoundInternal wxSoundInternal;
-typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
-
-// class WXDLLIMPEXP_MMEDIA wxSoundInternal;
-class WXDLLIMPEXP_MMEDIA wxSoundStreamWin : public wxSoundStream {
- public:
-  wxSoundStreamWin();
-  ~wxSoundStreamWin();
-
-  wxSoundStream& Write(const void *buffer, wxUint32 len);
-  wxSoundStream& Read(void *buffer, wxUint32 len); 
-
-  bool SetSoundFormat(const wxSoundFormatBase& base);
-
-  bool StartProduction(int evt);
-  bool StopProduction();
-
-  bool QueueFilled() const;
-
-  // Internal but defined as public
-  void NotifyDoneBuffer(wxUint32 dev_handle, int flag);
-
-  wxUint32 GetBestSize() const { return 4096; }
-
- protected:
-  wxSoundInternal *m_internal;
-  wxUint32 m_current_frag_in, m_current_frag_out;
-  wxUint32 m_input_frag_in, m_output_frag_out;
-  wxSoundInfoHeader **m_headers_play, **m_headers_rec;
-
-  bool m_production_started, m_queue_filled, m_waiting_for;
-
- protected:
-  void CreateSndWindow();
-  void DestroySndWindow();
-  bool OpenDevice(int mode);
-  void CloseDevice();
-
-  wxSoundInfoHeader *AllocHeader(int mode);
-  void FreeHeader(wxSoundInfoHeader *header, int mode);
-  bool AllocHeaders(int mode);
-  void FreeHeaders(int mode);
-
-  void WaitFor(wxSoundInfoHeader *info);
-  bool AddToQueue(wxSoundInfoHeader *info);
-  void ClearHeader(wxSoundInfoHeader *info);
-
-  wxSoundInfoHeader *NextFragmentOutput();
-  wxSoundInfoHeader *NextFragmentInput();
-};
-
-#endif
diff --git a/contrib/include/wx/mmedia/vidbase.h b/contrib/include/wx/mmedia/vidbase.h
deleted file mode 100644
index 990238fbb0..0000000000
--- a/contrib/include/wx/mmedia/vidbase.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// /////////////////////////////////////////////////////////////////////////////
-// Name:       vidbase.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS:        $Id$
-// License:    wxWindows license
-// /////////////////////////////////////////////////////////////////////////////
-/* Real -*- C++ -*- */
-#ifndef __VID_bdrv_H__
-#define __VID_bdrv_H__
-
-// ----------------------------------------------------------------------------
-// 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/defs.h"
-    #include "wx/stream.h"
-    #include "wx/string.h"
-    #include "wx/window.h"
-    #include "wx/frame.h"
-#endif
-
-#include "wx/mmedia/defs.h"
-
-// ----------------------------------------------------------------------------
-// wxMMedia2 (video) types
-
-typedef enum {
-  wxVIDEO_MSAVI,
-  wxVIDEO_MPEG,
-  wxVIDEO_QT,
-  wxVIDEO_GIF,
-  wxVIDEO_JMOV,
-  wxVIDEO_FLI,
-  wxVIDEO_IFF,
-  wxVIDEO_SGI,
-  wxVIDEO_MPEG2
-} wxVideoType;
-
-// ----------------------------------------------------------------------------
-// Classes definition
-
-class WXDLLIMPEXP_MMEDIA wxVideoBaseDriver : public wxObject {
-    DECLARE_ABSTRACT_CLASS(wxVideoBaseDriver)
-protected:
-    wxWindow *m_video_output;
-public:
-    // Ctors
-    wxVideoBaseDriver();
-    wxVideoBaseDriver(wxInputStream& str);
-    wxVideoBaseDriver(const wxString& filename);
-    // Dtor
-    virtual ~wxVideoBaseDriver();
-    
-    // Usual functions ... They all return false in case of errors.
-    virtual bool Play() = 0;
-    virtual bool Stop() = 0;
-    virtual bool Pause() = 0;
-    virtual bool Resume() = 0;
-    
-    // Size management
-    virtual bool SetSize(wxSize size) = 0;
-    virtual bool GetSize(wxSize& size) const = 0;
-    
-    // Test the capability of the driver to handle the specified type
-    virtual bool IsCapable(wxVideoType WXUNUSED(v_type)) const { return false; }
-
-    // Return the video codec name
-    virtual wxString GetMovieCodec() const = 0;
-    // Return the audio codec name
-    virtual wxString GetAudioCodec() const = 0;
-    // Return misc info about audio
-    virtual wxUint32 GetSampleRate() const = 0;
-    virtual wxUint8 GetChannels() const = 0;
-    virtual wxUint8 GetBPS() const = 0;
-    // Return frame rate
-    virtual double GetFrameRate() const = 0;
-    // Return number of frames
-    virtual wxUint32 GetNbFrames() const = 0;
-    
-    // Called when the movie finished
-    virtual void OnFinished() {}
-    
-    // Attaches the video output to a window. The video will be shown in that window.
-    virtual bool AttachOutput(wxWindow& output);
-    virtual void DetachOutput();
-    
-    // They return the state of the movie.
-    virtual bool IsPaused() const = 0;
-    virtual bool IsStopped() const = 0;
-};
-
-WXDLLIMPEXP_MMEDIA wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv);
-
-
-#endif
diff --git a/contrib/include/wx/mmedia/vidwin.h b/contrib/include/wx/mmedia/vidwin.h
deleted file mode 100644
index 155bed8b9c..0000000000
--- a/contrib/include/wx/mmedia/vidwin.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// ----------------------------------------------------------------------------
-// Name:       vidwin.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    February 1998
-// Updated:
-// Copyright:  (C) 1998, Guilhem Lavaux
-// License:    wxWindows license
-// ----------------------------------------------------------------------------
-
-#ifndef __VID_windows_H__
-#define __VID_windows_H__
-
-#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__)
-// versions of Open Watcom and MinGW tested against this source does not
-// deliver "digitalv.h" required in this feature
-
-// ----------------------------------------------------------------------------
-// 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/string.h"
-    #include "wx/stream.h"
-    #include "wx/window.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// wxMMedia2 headers
-
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/vidbase.h"
-
-// ----------------------------------------------------------------------------
-// System headers and private types
-
-#ifdef WXMMEDIA_INTERNAL
-#include <windows.h>
-#include <mmsystem.h>
-
-typedef struct VIDW_Internal {
-    MCIDEVICEID m_dev_id;
-} wxVIDWinternal;
-#endif
-
-// ----------------------------------------------------------------------------
-// Class definition
-
-class WXDLLIMPEXP_MMEDIA wxVideoWindows : public wxVideoBaseDriver {
-    DECLARE_DYNAMIC_CLASS(wxVideoWindows)
-protected:
-    struct VIDW_Internal *m_internal;
-    bool m_paused, m_stopped, m_remove_file;
-    wxString m_filename;
-    double m_frameRate;
-    wxUint8 m_bps;
-
-    void OpenFile();
-public:
-    wxVideoWindows(void);
-    wxVideoWindows(wxInputStream& str);
-    wxVideoWindows(const wxString& fname);
-    ~wxVideoWindows(void);
-
-    bool Play();
-    bool Stop();
-    bool Pause();
-    bool Resume();
-    
-    bool GetSize(wxSize& size) const;
-    bool SetSize(wxSize size);
-
-    // Return codec name for each stream.
-    wxString GetMovieCodec() const;
-    wxString GetAudioCodec() const;
-    // Return misc. info about audio
-    wxUint32 GetSampleRate() const;
-    wxUint8 GetChannels() const;
-    wxUint8 GetBPS() const;
-    // Return the frame rate of the video (in frames/second)
-    double GetFrameRate() const;
-    // Return the total number of frames in the movie
-    wxUint32 GetNbFrames() const;
-    
-    bool IsCapable(wxVideoType v_type) const;
-    
-    bool AttachOutput(wxWindow& output);
-    void DetachOutput(void);
-    
-    bool IsPaused() const;
-    bool IsStopped() const;
-};
-
-#endif
-
-#endif
diff --git a/contrib/include/wx/mmedia/vidxanm.h b/contrib/include/wx/mmedia/vidxanm.h
deleted file mode 100644
index 289d8446bc..0000000000
--- a/contrib/include/wx/mmedia/vidxanm.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// /////////////////////////////////////////////////////////////////////////////
-// Name:       vidxanm.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// License:    wxWindows license
-// /////////////////////////////////////////////////////////////////////////////
-/* Real -*- C++ -*- */
-#ifndef __VID_xanim_H__
-#define __VID_xanim_H__
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/process.h"
-
-// 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/defs.h"
-    #include "wx/string.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// System dependent headers
-
-#if defined(WXMMEDIA_INTERNAL) && (defined(__X__) || defined(__WXGTK__))
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#endif
-
-// ----------------------------------------------------------------------------
-// wxMMedia2 headers
-
-#include "wx/mmedia/defs.h"
-#include "wx/mmedia/vidbase.h"
-
-// ----------------------------------------------------------------------------
-// Internal types
-
-#ifdef WXMMEDIA_INTERNAL
-typedef struct wxXANIMinternal {
-    Display *xanim_dpy;
-    Window xanim_window;
-    Atom xanim_atom, xanim_ret;
-} wxXANIMinternal;
-
-#ifndef __XANIM_COMMAND__
-    #define __XANIM_COMMAND__ "/usr/X11R6/bin/xanim"
-#endif
-
-#endif
-
-// ----------------------------------------------------------------------------
-// Class definition
-
-class WXDLLIMPEXP_MMEDIA wxVideoXANIM : public wxVideoBaseDriver {
-    DECLARE_DYNAMIC_CLASS(wxVideoXANIM)
- protected:
-    // Remember the state of the subprocess
-    bool m_xanim_started, m_paused;
-    // Pure X11 variables
-    struct wxXANIMinternal *m_internal;
-    wxString m_filename;
-    wxProcess *m_xanim_detector;
-    // Remember to delete the temporary file when necessary
-    bool m_remove_file;
-    wxUint32 m_size[2];
-    wxUint32 m_sampleRate;
-    wxUint8 m_channels;
-    wxUint8 m_bps;
-    wxUint32 m_frames;
-    double m_frameRate;
-    wxString m_movieCodec, m_audioCodec;
-    
- public:
-    wxVideoXANIM();
-    wxVideoXANIM(wxInputStream& str);
-    wxVideoXANIM(const wxString& filename);
-    ~wxVideoXANIM();
-    
-    bool Play();
-    bool Pause();
-    bool Resume();
-    bool Stop();
-    
-    bool SetVolume(wxUint8 vol);
-    bool SetSize(wxSize size);
-    bool GetSize(wxSize& size) const;
-
-    // Return the video codec name
-    wxString GetMovieCodec() const;
-    // Return the audio codec name
-    wxString GetAudioCodec() const;
-    // Return misc info about audio
-    wxUint32 GetSampleRate() const;
-    wxUint8 GetChannels() const;
-    wxUint8 GetBPS() const;
-    // Return frame rate
-    double GetFrameRate() const;
-    // Return number of frames in the movie
-    wxUint32 GetNbFrames() const;
-    
-    bool IsCapable(wxVideoType v_type) const;
-    
-    bool AttachOutput(wxWindow& output);
-    void DetachOutput();
-    
-    bool IsPaused() const;
-    bool IsStopped() const;
-    
-    friend class wxVideoXANIMProcess;
-    
-protected:
-    // Start the subprocess with the right parameters
-    bool RestartXANIM();
-    // Send a command to the subprocess
-    bool SendCommand(const char *command,char **ret = NULL,
-                     wxUint32 *size = NULL);
-
-    // Collect informations from XAnim
-    bool CollectInfo();
-};
-
-#endif
diff --git a/contrib/include/wx/net/email.h b/contrib/include/wx/net/email.h
deleted file mode 100644
index fd7a7b1a41..0000000000
--- a/contrib/include/wx/net/email.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        email.h
-// Purpose:     wxEmail: portable email client class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_EMAIL_H_
-#define _WX_EMAIL_H_
-
-#include "wx/net/msg.h"
-
-/*
- * wxEmail
- * Miscellaneous email functions
- */
-
-class WXDLLIMPEXP_NETUTILS wxEmail
-{
-public:
-//// Ctor/dtor
-    wxEmail() {};
-
-//// Operations
-
-    // Send a message.
-    // Specify profile, or leave it to wxWidgets to find the current user name
-    static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString,
-        const wxString& sendMail = wxT("/usr/sbin/sendmail -t"));
-    
-protected:
-};
-
-
-#endif //_WX_EMAIL_H_
-
diff --git a/contrib/include/wx/net/msg.h b/contrib/include/wx/net/msg.h
deleted file mode 100644
index f337ac0f9f..0000000000
--- a/contrib/include/wx/net/msg.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        msg.h
-// Purpose:     wxMailMessage
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSG_H_
-#define _WX_MSG_H_
-
-#ifdef WXMAKINGDLL_NETUTILS
-    #define WXDLLIMPEXP_NETUTILS WXEXPORT
-    #define WXDLLIMPEXP_DATA_NETUTILS(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_NETUTILS WXIMPORT
-    #define WXDLLIMPEXP_DATA_NETUTILS(type) WXIMPORT type
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_NETUTILS
-    #define WXDLLIMPEXP_DATA_NETUTILS(type) type
-#endif
-
-
-/*
- * wxMailMessage
- * Encapsulates an email message
- */
-
-class WXDLLIMPEXP_NETUTILS wxMailMessage
-{
-public:
-
-    // A common usage
-    wxMailMessage(const wxString& subject, const wxString& to,
-        const wxString& body, const wxString& from = wxEmptyString,
-        const wxString& attachment = wxEmptyString,
-        const wxString& attachmentTitle = wxEmptyString)
-    {
-        m_to.Add(to);
-        m_subject = subject;
-        m_body = body;
-        m_from = from;
-        if (!attachment.IsEmpty())
-        {
-            m_attachments.Add(attachment);
-            m_attachmentTitles.Add(attachmentTitle);
-        }
-    }
-
-    wxMailMessage() {};
-
-//// Accessors
-
-    void AddTo(const wxString& to) { m_to.Add(to); }
-    void AddCc(const wxString& cc) { m_cc.Add(cc); }
-    void AddBcc(const wxString& bcc) { m_bcc.Add(bcc); }
-    void AddAttachment(const wxString& attach, const wxString& title = wxEmptyString)
-    { m_attachments.Add(attach); m_attachmentTitles.Add(title); }
-
-    void SetSubject(const wxString& subject) { m_subject = subject; }
-    void SetBody(const wxString& body) { m_body = body; }
-    void SetFrom(const wxString& from) { m_from = from; }
-
-public:
-    wxArrayString  m_to;               //The To: Recipients
-    wxString       m_from;             //The From: email address (optional)
-    wxArrayString  m_cc;               //The CC: Recipients
-    wxArrayString  m_bcc;              //The BCC Recipients
-    wxString       m_subject;         //The Subject of the message
-    wxString       m_body;            //The Body of the message
-    wxArrayString  m_attachments;      //Files to attach to the email
-    wxArrayString  m_attachmentTitles; //Titles to use for the email file attachments
-};
-
-#endif // _WX_MSG_H_
-
diff --git a/contrib/include/wx/net/smapi.h b/contrib/include/wx/net/smapi.h
deleted file mode 100644
index 0a86e7f7fe..0000000000
--- a/contrib/include/wx/net/smapi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        smapi.h
-// Purpose:     Simple MAPI classes
-// Author:      PJ Naughter <pjna@naughter.com>
-// Modified by: Julian Smart
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) PJ Naughter
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SMAPI_H_
-#define _WX_SMAPI_H_
-
-#include "wx/net/msg.h"
-
-class WXDLLIMPEXP_NETUTILS wxMapiData;
-
-//The class which encapsulates the MAPI connection
-class WXDLLIMPEXP_NETUTILS wxMapiSession
-{
-public:
-    //Constructors / Destructors
-    wxMapiSession();
-    ~wxMapiSession();
-    
-    //Logon / Logoff Methods
-    bool Logon(const wxString& sProfileName, const wxString& sPassword = wxEmptyString, wxWindow* pParentWnd = NULL);
-    bool LoggedOn() const;
-    bool Logoff();
-    
-    //Send a message
-    bool Send(wxMailMessage& message);
-    
-    //General MAPI support
-    bool MapiInstalled() const;
-    
-    //Error Handling
-    long GetLastError() const;
-    
-protected:
-    //Methods
-    void Initialise();
-    void Deinitialise(); 
-    bool Resolve(const wxString& sName, void* lppRecip1);
-
-    wxMapiData* m_data;
-    
-};
-
-
-#endif //_WX_SMAPI_H_
diff --git a/contrib/include/wx/net/web.h b/contrib/include/wx/net/web.h
deleted file mode 100644
index c4ed34ed3f..0000000000
--- a/contrib/include/wx/net/web.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        web.h
-// Purpose:     wxWeb: portable web browser-related class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WEB_H_
-#define _WX_WEB_H_
-
-/*
- * wxWeb
- * Miscellaneous web functions
- */
-
-class wxWeb
-{
-public:
-//// Ctor/dtor
-    wxWeb() {};
-
-//// Operations
-
-protected:
-};
-
-
-#endif //_WX_WEB_H_
-
diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
deleted file mode 100644
index c0db18d8f4..0000000000
--- a/contrib/include/wx/ogl/basic.h
+++ /dev/null
@@ -1,757 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        basic.h
-// Purpose:     Basic OGL classes and definitions
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_BASIC_H_
-#define _OGL_BASIC_H_
-
-#ifndef wxUSE_DEPRECATED
-#define wxUSE_DEPRECATED 0
-#endif
-
-#if wxUSE_DEPRECATED
-    #include "wx/deprecated/setup.h"
-#endif
-
-#ifndef wxUSE_PROLOGIO
-    #define wxUSE_PROLOGIO 0
-#endif
-
-#define OGL_VERSION     2.0
-
-#ifndef DEFAULT_MOUSE_TOLERANCE
-#define DEFAULT_MOUSE_TOLERANCE 3
-#endif
-
-// Key identifiers
-#define KEY_SHIFT 1
-#define KEY_CTRL  2
-
-// Arrow styles
-
-#define ARROW_NONE         0
-#define ARROW_END          1
-#define ARROW_BOTH         2
-#define ARROW_MIDDLE       3
-#define ARROW_START        4
-
-// Control point types
-// Rectangle and most other shapes
-#define CONTROL_POINT_VERTICAL   1
-#define CONTROL_POINT_HORIZONTAL 2
-#define CONTROL_POINT_DIAGONAL   3
-
-// Line
-#define CONTROL_POINT_ENDPOINT_TO 4
-#define CONTROL_POINT_ENDPOINT_FROM 5
-#define CONTROL_POINT_LINE       6
-
-// Types of formatting: can be combined in a bit list
-#define FORMAT_NONE           0
-                                // Left justification
-#define FORMAT_CENTRE_HORIZ   1
-                                // Centre horizontally
-#define FORMAT_CENTRE_VERT    2
-                                // Centre vertically
-#define FORMAT_SIZE_TO_CONTENTS 4
-                                // Resize shape to contents
-
-// Shadow mode
-#define SHADOW_NONE           0
-#define SHADOW_LEFT           1
-#define SHADOW_RIGHT          2
-
-/*
- * Declare types
- *
- */
-
-#define SHAPE_BASIC           wxTYPE_USER + 1
-#define SHAPE_RECTANGLE       wxTYPE_USER + 2
-#define SHAPE_ELLIPSE         wxTYPE_USER + 3
-#define SHAPE_POLYGON         wxTYPE_USER + 4
-#define SHAPE_CIRCLE          wxTYPE_USER + 5
-#define SHAPE_LINE            wxTYPE_USER + 6
-#define SHAPE_DIVIDED_RECTANGLE wxTYPE_USER + 8
-#define SHAPE_COMPOSITE       wxTYPE_USER + 9
-#define SHAPE_CONTROL_POINT   wxTYPE_USER + 10
-#define SHAPE_DRAWN           wxTYPE_USER + 11
-#define SHAPE_DIVISION        wxTYPE_USER + 12
-#define SHAPE_LABEL_OBJECT    wxTYPE_USER + 13
-#define SHAPE_BITMAP          wxTYPE_USER + 14
-#define SHAPE_DIVIDED_OBJECT_CONTROL_POINT   wxTYPE_USER + 15
-
-#define OBJECT_REGION         wxTYPE_USER + 20
-
-#define OP_CLICK_LEFT  1
-#define OP_CLICK_RIGHT 2
-#define OP_DRAG_LEFT 4
-#define OP_DRAG_RIGHT 8
-
-#define OP_ALL (OP_CLICK_LEFT | OP_CLICK_RIGHT | OP_DRAG_LEFT | OP_DRAG_RIGHT)
-
-// Attachment modes
-#define ATTACHMENT_MODE_NONE        0
-#define ATTACHMENT_MODE_EDGE        1
-#define ATTACHMENT_MODE_BRANCHING   2
-
-// Sub-modes for branching attachment mode
-#define BRANCHING_ATTACHMENT_NORMAL 1
-#define BRANCHING_ATTACHMENT_BLOB   2
-
-class wxShapeTextLine;
-class wxShapeCanvas;
-class wxLineShape;
-class wxControlPoint;
-class wxShapeRegion;
-class wxShape;
-
-#if wxUSE_PROLOGIO
-class WXDLLEXPORT wxExpr;
-class WXDLLEXPORT wxExprDatabase;
-#endif
-
-// Round up
-#define WXROUND(x) ( (long) (x + 0.5) )
-
-
-// logical function to use when drawing rubberband boxes, etc.
-#define OGLRBLF         wxINVERT
-
-
-
-class WXDLLIMPEXP_OGL wxShapeEvtHandler: public wxObject, public wxClientDataContainer
-{
- DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)
-
- public:
-  wxShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL);
-  virtual ~wxShapeEvtHandler();
-
-  inline void SetShape(wxShape *sh) { m_handlerShape = sh; }
-  inline wxShape *GetShape() const { return m_handlerShape; }
-
-  inline void SetPreviousHandler(wxShapeEvtHandler* handler) { m_previousHandler = handler; }
-  inline wxShapeEvtHandler* GetPreviousHandler() const { return m_previousHandler; }
-
-  // This is called when the _shape_ is deleted.
-  virtual void OnDelete();
-  virtual void OnDraw(wxDC& dc);
-  virtual void OnDrawContents(wxDC& dc);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = false);
-  virtual void OnMoveLinks(wxDC& dc);
-  virtual void OnErase(wxDC& dc);
-  virtual void OnEraseContents(wxDC& dc);
-  virtual void OnHighlight(wxDC& dc);
-  virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-
-  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-  virtual void OnDrawControlPoints(wxDC& dc);
-  virtual void OnEraseControlPoints(wxDC& dc);
-  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-
-  // Control points ('handles') redirect control to the actual shape, to make it easier
-  // to override sizing behaviour.
-  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-
-  virtual void OnBeginSize(double WXUNUSED(w), double WXUNUSED(h)) { }
-  virtual void OnEndSize(double WXUNUSED(w), double WXUNUSED(h)) { }
-
-  // Can override this to prevent or intercept line reordering.
-  virtual void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
-
-  // Creates a copy of this event handler.
-  wxShapeEvtHandler *CreateNewCopy();
-
-  // Does the copy - override for new event handlers which might store
-  // app-specific data.
-  virtual void CopyData(wxShapeEvtHandler& WXUNUSED(copy)) {};
-
- private:
-  wxShapeEvtHandler*    m_previousHandler;
-  wxShape*              m_handlerShape;
-};
-
-class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
-{
- DECLARE_ABSTRACT_CLASS(wxShape)
-
- public:
-
-  wxShape(wxShapeCanvas *can = NULL);
-  virtual ~wxShape();
-  virtual void GetBoundingBoxMax(double *width, double *height);
-  virtual void GetBoundingBoxMin(double *width, double *height) = 0;
-  virtual bool GetPerimeterPoint(double x1, double y1,
-                                 double x2, double y2,
-                                 double *x3, double *y3);
-  inline wxShapeCanvas *GetCanvas() { return m_canvas; }
-  void SetCanvas(wxShapeCanvas *the_canvas);
-  virtual void AddToCanvas(wxShapeCanvas *the_canvas, wxShape *addAfter = NULL);
-  virtual void InsertInCanvas(wxShapeCanvas *the_canvas);
-
-  virtual void RemoveFromCanvas(wxShapeCanvas *the_canvas);
-  inline double GetX() const { return m_xpos; }
-  inline double GetY() const { return m_ypos; }
-  inline void SetX(double x) { m_xpos = x; }
-  inline void SetY(double y) { m_ypos = y; }
-
-  inline wxShape *GetParent() const { return m_parent; }
-  inline void SetParent(wxShape *p) { m_parent = p; }
-  wxShape *GetTopAncestor();
-  inline wxList& GetChildren() { return m_children; }
-
-  virtual void OnDraw(wxDC& dc);
-  virtual void OnDrawContents(wxDC& dc);
-  virtual void OnMoveLinks(wxDC& dc);
-  virtual void Unlink() { };
-  void SetDrawHandles(bool drawH);
-  inline bool GetDrawHandles() { return m_drawHandles; }
-  virtual void OnErase(wxDC& dc);
-  virtual void OnEraseContents(wxDC& dc);
-  virtual void OnHighlight(wxDC& dc);
-  virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-  virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {}
-  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-  virtual void OnSize(double x, double y);
-  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-
-  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-  virtual void OnDrawControlPoints(wxDC& dc);
-  virtual void OnEraseControlPoints(wxDC& dc);
-
-  virtual void OnBeginSize(double WXUNUSED(w), double WXUNUSED(h)) { }
-  virtual void OnEndSize(double WXUNUSED(w), double WXUNUSED(h)) { }
-
-  // Control points ('handles') redirect control to the actual shape, to make it easier
-  // to override sizing behaviour.
-  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
-  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-
-  virtual void MakeControlPoints();
-  virtual void DeleteControlPoints(wxDC *dc = NULL);
-  virtual void ResetControlPoints();
-
-  inline wxShapeEvtHandler *GetEventHandler() { return m_eventHandler; }
-  inline void SetEventHandler(wxShapeEvtHandler *handler) { m_eventHandler = handler; }
-
-  // Mandatory control points, e.g. the divided line moving handles
-  // should appear even if a child of the 'selected' image
-  virtual void MakeMandatoryControlPoints();
-  virtual void ResetMandatoryControlPoints();
-
-  inline virtual bool Recompute() { return true; };
-  // Calculate size recursively, if size changes. Size might depend on children.
-  inline virtual void CalculateSize() { };
-  virtual void Select(bool select = true, wxDC* dc = NULL);
-  virtual void SetHighlight(bool hi = true, bool recurse = false);
-  inline virtual bool IsHighlighted() const { return m_highlighted; };
-  virtual bool Selected() const;
-  virtual bool AncestorSelected() const;
-  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = false);
-  int GetSensitivityFilter() const { return m_sensitivity; }
-  void SetDraggable(bool drag, bool recursive = false);
-  inline  void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; };
-  inline  void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; };
-  inline  bool GetFixedWidth() const { return m_fixedWidth; }
-  inline  bool GetFixedHeight() const { return m_fixedHeight; }
-  inline  void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; };
-  inline  bool GetSpaceAttachments() const { return m_spaceAttachments; };
-  void SetShadowMode(int mode, bool redraw = false);
-  inline int GetShadowMode() const { return m_shadowMode; }
-  virtual bool HitTest(double x, double y, int *attachment, double *distance);
-  inline void SetCentreResize(bool cr) { m_centreResize = cr; }
-  inline bool GetCentreResize() const { return m_centreResize; }
-  inline void SetMaintainAspectRatio(bool ar) { m_maintainAspectRatio = ar; }
-  inline bool GetMaintainAspectRatio() const { return m_maintainAspectRatio; }
-  inline wxList& GetLines() const { return (wxList&) m_lines; }
-  inline void SetDisableLabel(bool flag) { m_disableLabel = flag; }
-  inline bool GetDisableLabel() const { return m_disableLabel; }
-  inline void SetAttachmentMode(int mode) { m_attachmentMode = mode; }
-  inline int GetAttachmentMode() const { return m_attachmentMode; }
-  inline void SetId(long i) { m_id = i; }
-  inline long GetId() const { return m_id; }
-
-  void SetPen(const wxPen *pen);
-  void SetBrush(const wxBrush *brush);
-
-  virtual void Show(bool show);
-  virtual bool IsShown() const { return m_visible; }
-  virtual void Move(wxDC& dc, double x1, double y1, bool display = true);
-  virtual void Erase(wxDC& dc);
-  virtual void EraseContents(wxDC& dc);
-  virtual void Draw(wxDC& dc);
-  virtual void Flash();
-  virtual void MoveLinks(wxDC& dc);
-  virtual void DrawContents(wxDC& dc);  // E.g. for drawing text label
-  virtual void SetSize(double x, double y, bool recursive = true);
-  virtual void SetAttachmentSize(double x, double y);
-  void Attach(wxShapeCanvas *can);
-  void Detach();
-
-  inline virtual bool Constrain() { return false; } ;
-
-  void AddLine(wxLineShape *line, wxShape *other,
-               int attachFrom = 0, int attachTo = 0,
-               // The line ordering
-               int positionFrom = -1, int positionTo = -1);
-
-  // Return the zero-based position in m_lines of line.
-  int GetLinePosition(wxLineShape* line);
-
-  void AddText(const wxString& string);
-
-  inline wxPen *GetPen() const { return wx_const_cast(wxPen*, m_pen); }
-  inline wxBrush *GetBrush() const { return wx_const_cast(wxBrush*, m_brush); }
-
-  /*
-   * Region-specific functions (defaults to the default region
-   * for simple objects
-   */
-
-  // Set the default, single region size to be consistent
-  // with the object size
-  void SetDefaultRegionSize();
-  virtual void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
-  virtual void SetFormatMode(int mode, int regionId = 0);
-  virtual int GetFormatMode(int regionId = 0) const;
-  virtual void SetFont(wxFont *font, int regionId = 0);
-  virtual wxFont *GetFont(int regionId = 0) const;
-  virtual void SetTextColour(const wxString& colour, int regionId = 0);
-  virtual wxString GetTextColour(int regionId = 0) const;
-  virtual inline int GetNumberOfTextRegions() const { return m_regions.GetCount(); }
-  virtual void SetRegionName(const wxString& name, int regionId = 0);
-
-  // Get the name representing the region for this image alone.
-  // I.e. this image's region ids go from 0 to N-1.
-  // But the names might be "0.2.0", "0.2.1" etc. depending on position in composite.
-  // So the last digit represents the region Id, the others represent positions
-  // in composites.
-  virtual wxString GetRegionName(int regionId);
-
-  // Gets the region corresponding to the name, or -1 if not found.
-  virtual int GetRegionId(const wxString& name);
-
-  // Construct names for regions, unique even for children of a composite.
-  virtual void NameRegions(const wxString& parentName = wxEmptyString);
-
-  // Get list of regions
-  inline wxList& GetRegions() const { return (wxList&) m_regions; }
-
-  virtual void AddRegion(wxShapeRegion *region);
-
-  virtual void ClearRegions();
-
-  // Assign new ids to this image and children (if composite)
-  void AssignNewIds();
-
-  // Returns actual image (same as 'this' if non-composite) and region id
-  // for given region name.
-  virtual wxShape *FindRegion(const wxString& regionName, int *regionId);
-
-  // Finds all region names for this image (composite or simple).
-  // Supply empty string list.
-  virtual void FindRegionNames(wxStringList& list);
-
-  virtual void ClearText(int regionId = 0);
-  void RemoveLine(wxLineShape *line);
-
-#if wxUSE_PROLOGIO
-  // I/O
-  virtual void WriteAttributes(wxExpr *clause);
-  virtual void ReadAttributes(wxExpr *clause);
-
-  // In case the object has constraints it needs to read in in a different pass
-  inline virtual void ReadConstraints(wxExpr *WXUNUSED(clause), wxExprDatabase *WXUNUSED(database)) { };
-  virtual void WriteRegions(wxExpr *clause);
-  virtual void ReadRegions(wxExpr *clause);
-#endif
-
-  // Attachment code
-  virtual bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  virtual int GetNumberOfAttachments() const;
-  virtual bool AttachmentIsValid(int attachment) const;
-  virtual wxList& GetAttachments() { return m_attachmentPoints; }
-
-  // Only get the attachment position at the _edge_ of the shape, ignoring
-  // branching mode. This is used e.g. to indicate the edge of interest, not the point
-  // on the attachment branch.
-  virtual bool GetAttachmentPositionEdge(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-
-  // Assuming the attachment lies along a vertical or horizontal line,
-  // calculate the position on that point.
-  virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
-    int nth, int noArcs, wxLineShape* line);
-
-  // Returns true if pt1 <= pt2 in the sense that one point comes before another on an
-  // edge of the shape.
-  // attachmentPoint is the attachment point (= side) in question.
-  virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
-
-  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = false);
-  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = false);
-
-  virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
-                                       double x, double y);
-
-  // Reorders the lines coming into the node image at this attachment
-  // position, in the order in which they appear in linesToSort.
-  virtual void SortLines(int attachment, wxList& linesToSort);
-
-  // Apply an attachment ordering change
-  void ApplyAttachmentOrdering(wxList& ordering);
-
-  // Can override this to prevent or intercept line reordering.
-  virtual void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
-
-  //// New banching attachment code, 24/9/98
-
-  //
-  //             |________|
-  //                 | <- root
-  //                 | <- neck
-  // shoulder1 ->---------<- shoulder2
-  //             | | | | |<- stem
-  //                      <- branching attachment point N-1
-
-  // This function gets the root point at the given attachment.
-  virtual wxRealPoint GetBranchingAttachmentRoot(int attachment);
-
-  // This function gets information about where branching connections go (calls GetBranchingAttachmentRoot)
-  virtual bool GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
-    wxRealPoint& shoulder1, wxRealPoint& shoulder2);
-
-  // n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
-  // at this attachment point.
-  // attachmentPoint is where the arc meets the stem, and stemPoint is where the stem meets the
-  // shoulder.
-  virtual bool GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& attachmentPoint,
-    wxRealPoint& stemPoint);
-
-  // Get the number of lines at this attachment position.
-  virtual int GetAttachmentLineCount(int attachment) const;
-
-  // Draw the branches (not the actual arcs though)
-  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = false);
-  virtual void OnDrawBranches(wxDC& dc, bool erase = false);
-
-  // Branching attachment settings
-  inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; }
-  inline int GetBranchNeckLength() const { return m_branchNeckLength; }
-
-  inline void SetBranchStemLength(int len) { m_branchStemLength = len; }
-  inline int GetBranchStemLength() const { return m_branchStemLength; }
-
-  inline void SetBranchSpacing(int len) { m_branchSpacing = len; }
-  inline int GetBranchSpacing() const { return m_branchSpacing; }
-
-  // Further detail on branching style, e.g. blobs on interconnections
-  inline void SetBranchStyle(long style) { m_branchStyle = style; }
-  inline long GetBranchStyle() const { return m_branchStyle; }
-
-  // Rotate the standard attachment point from physical (0 is always North)
-  // to logical (0 -> 1 if rotated by 90 degrees)
-  virtual int PhysicalToLogicalAttachment(int physicalAttachment) const;
-
-  // Rotate the standard attachment point from logical
-  // to physical (0 is always North)
-  virtual int LogicalToPhysicalAttachment(int logicalAttachment) const;
-
-  // This is really to distinguish between lines and other images.
-  // For lines, want to pass drag to canvas, since lines tend to prevent
-  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return true; }
-
-  // Returns true if image is a descendant of this image
-  bool HasDescendant(wxShape *image);
-
-  // Creates a copy of this shape.
-  wxShape *CreateNewCopy(bool resetMapping = true, bool recompute = true);
-
-  // Does the copying for this object
-  virtual void Copy(wxShape& copy);
-
-  // Does the copying for this object, including copying event
-  // handler data if any. Calls the virtual Copy function.
-  void CopyWithHandler(wxShape& copy);
-
-  // Rotate about the given axis by the given amount in radians.
-  virtual void Rotate(double x, double y, double theta);
-  virtual double GetRotation() const { return m_rotation; }
-  virtual void SetRotation(double rotation) { m_rotation = rotation; }
-
-  void ClearAttachments();
-
-  // Recentres all the text regions for this object
-  void Recentre(wxDC& dc);
-
-  // Clears points from a list of wxRealPoints
-  void ClearPointList(wxList& list);
-
-  // Return pen or brush of the right colour for the background
-  wxPen GetBackgroundPen();
-  wxBrush GetBackgroundBrush();
-
-
- protected:
-  wxShapeEvtHandler*    m_eventHandler;
-  bool                  m_formatted;
-  double                m_xpos, m_ypos;
-  const wxPen*          m_pen;
-  const wxBrush*        m_brush;
-  wxFont*               m_font;
-  wxColour              m_textColour;
-  wxString              m_textColourName;
-  wxShapeCanvas*        m_canvas;
-  wxList                m_lines;
-  wxList                m_text;
-  wxList                m_controlPoints;
-  wxList                m_regions;
-  wxList                m_attachmentPoints;
-  bool                  m_visible;
-  bool                  m_disableLabel;
-  long                  m_id;
-  bool                  m_selected;
-  bool                  m_highlighted;      // Different from selected: user-defined highlighting,
-                                            // e.g. thick border.
-  double                m_rotation;
-  int                   m_sensitivity;
-  bool                  m_draggable;
-  int                   m_attachmentMode;   // 0 for no attachments, 1 if using normal attachments,
-                                            // 2 for branching attachments
-  bool                  m_spaceAttachments; // true if lines at one side should be spaced
-  bool                  m_fixedWidth;
-  bool                  m_fixedHeight;
-  bool                  m_centreResize;    // Default is to resize keeping the centre constant (true)
-  bool                  m_drawHandles;     // Don't draw handles if false, usually true
-  wxList                m_children;      // In case it's composite
-  wxShape*              m_parent;      // In case it's a child
-  int                   m_formatMode;
-  int                   m_shadowMode;
-  const wxBrush*        m_shadowBrush;
-  int                   m_shadowOffsetX;
-  int                   m_shadowOffsetY;
-  int                   m_textMarginX;    // Gap between text and border
-  int                   m_textMarginY;
-  wxString              m_regionName;
-  bool                  m_maintainAspectRatio;
-  int                   m_branchNeckLength;
-  int                   m_branchStemLength;
-  int                   m_branchSpacing;
-  long                  m_branchStyle;
-};
-
-class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
-{
- DECLARE_DYNAMIC_CLASS(wxPolygonShape)
- public:
-  wxPolygonShape();
-  ~wxPolygonShape();
-
-  // Takes a list of wxRealPoints; each point is an OFFSET from the centre.
-  // Deletes user's points in destructor.
-  virtual void Create(wxList *points);
-  virtual void ClearPoints();
-
-  void GetBoundingBoxMin(double *w, double *h);
-  void CalculateBoundingBox();
-  bool GetPerimeterPoint(double x1, double y1,
-                                 double x2, double y2,
-                                 double *x3, double *y3);
-  bool HitTest(double x, double y, int *attachment, double *distance);
-  void SetSize(double x, double y, bool recursive = true);
-  void OnDraw(wxDC& dc);
-  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-
-  // Control points ('handles') redirect control to the actual shape, to make it easier
-  // to override sizing behaviour.
-  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-
-  // A polygon should have a control point at each vertex,
-  // with the option of moving the control points individually
-  // to change the shape.
-  void MakeControlPoints();
-  void ResetControlPoints();
-
-  // If we've changed the shape, must make the original
-  // points match the working points
-  void UpdateOriginalPoints();
-
-  // Add a control point after the given point
-  virtual void AddPolygonPoint(int pos = 0);
-
-  // Delete a control point
-  virtual void DeletePolygonPoint(int pos = 0);
-
-  // Recalculates the centre of the polygon
-  virtual void CalculatePolygonCentre();
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  int GetNumberOfAttachments() const;
-  bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  bool AttachmentIsValid(int attachment) const;
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  inline wxList *GetPoints() { return m_points; }
-  inline wxList *GetOriginalPoints() { return m_originalPoints; }
-
-  // Rotate about the given axis by the given amount in radians
-  virtual void Rotate(double x, double y, double theta);
-
-  double GetOriginalWidth() const { return m_originalWidth; }
-  double GetOriginalHeight() const { return m_originalHeight; }
-
-  void SetOriginalWidth(double w) { m_originalWidth = w; }
-  void SetOriginalHeight(double h) { m_originalHeight = h; }
-
- private:
-  wxList*       m_points;
-  wxList*       m_originalPoints;
-  double        m_boundWidth;
-  double        m_boundHeight;
-  double        m_originalWidth;
-  double        m_originalHeight;
-};
-
-class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
-{
- DECLARE_DYNAMIC_CLASS(wxRectangleShape)
- public:
-  wxRectangleShape(double w = 0.0, double h = 0.0);
-  void GetBoundingBoxMin(double *w, double *h);
-  bool GetPerimeterPoint(double x1, double y1,
-                                 double x2, double y2,
-                                 double *x3, double *y3);
-  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = true);
-  void SetCornerRadius(double rad); // If > 0, rounded corners
-  double GetCornerRadius() const { return m_cornerRadius; }
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  int GetNumberOfAttachments() const;
-  bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  inline double GetWidth() const { return m_width; }
-  inline double GetHeight() const { return m_height; }
-  inline void SetWidth(double w) { m_width = w; }
-  inline void SetHeight(double h) { m_height = h; }
-
-protected:
-  double m_width;
-  double m_height;
-  double m_cornerRadius;
-};
-
-class WXDLLIMPEXP_OGL wxTextShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxTextShape)
- public:
-  wxTextShape(double width = 0.0, double height = 0.0);
-
-  void OnDraw(wxDC& dc);
-
-#if wxUSE_PROLOGIO
-    void WriteAttributes(wxExpr *clause);
-#endif
-
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-};
-
-class WXDLLIMPEXP_OGL wxEllipseShape: public wxShape
-{
- DECLARE_DYNAMIC_CLASS(wxEllipseShape)
- public:
-  wxEllipseShape(double w = 0.0, double h = 0.0);
-
-  void GetBoundingBoxMin(double *w, double *h);
-  bool GetPerimeterPoint(double x1, double y1,
-                                 double x2, double y2,
-                                 double *x3, double *y3);
-
-  void OnDraw(wxDC& dc);
-  void SetSize(double x, double y, bool recursive = true);
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  int GetNumberOfAttachments() const;
-  bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  inline double GetWidth() const { return m_width; }
-  inline double GetHeight() const { return m_height; }
-
-  inline void SetWidth(double w) { m_width = w; }
-  inline void SetHeight(double h) { m_height = h; }
-
-protected:
-  double m_width;
-  double m_height;
-};
-
-class WXDLLIMPEXP_OGL wxCircleShape: public wxEllipseShape
-{
- DECLARE_DYNAMIC_CLASS(wxCircleShape)
- public:
-  wxCircleShape(double w = 0.0);
-
-  bool GetPerimeterPoint(double x1, double y1,
-                                 double x2, double y2,
-                                 double *x3, double *y3);
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-};
-
-#endif
- // _OGL_BASIC_H_
diff --git a/contrib/include/wx/ogl/basicp.h b/contrib/include/wx/ogl/basicp.h
deleted file mode 100644
index 43fd2fb825..0000000000
--- a/contrib/include/wx/ogl/basicp.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        basicp.h
-// Purpose:     Private OGL classes and definitions
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_BASICP_H_
-#define _OGL_BASICP_H_
-
-#define CONTROL_POINT_SIZE       6
-
-class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
-public:
-   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = wxEmptyString);
-   ~wxShapeTextLine();
-
-   inline double GetX() const { return m_x; }
-   inline double GetY() const { return m_y; }
-
-   inline void SetX(double x) { m_x = x; }
-   inline void SetY(double y) { m_y = y; }
-
-   inline void SetText(const wxString& text) { m_line = text; }
-   inline wxString GetText() const { return m_line; }
-
-protected:
-   wxString     m_line;
-   double        m_x;
-   double        m_y;
-};
-
-class WXDLLIMPEXP_OGL wxShape;
-class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxControlPoint)
-
- friend class WXDLLIMPEXP_OGL wxShapeEvtHandler;
- friend class WXDLLIMPEXP_OGL wxShape;
-
- public:
-  wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0,
-    double the_yoffset = 0.0, int the_type = 0);
-  ~wxControlPoint();
-
-  void OnDraw(wxDC& dc);
-  void OnErase(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-
-  bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  int GetNumberOfAttachments() const;
-
-  inline void SetEraseObject(bool er) { m_eraseObject = er; }
-
-public:
-  int             m_type;
-  double          m_xoffset;
-  double          m_yoffset;
-  wxShape*        m_shape;
-  const wxCursor* m_oldCursor;
-  bool            m_eraseObject; // If true, erases object before dragging handle.
-
-/*
- * Store original top-left, bottom-right coordinates
- * in case we're doing non-vertical resizing.
- */
-  static double sm_controlPointDragStartX;
-  static double sm_controlPointDragStartY;
-  static double sm_controlPointDragStartWidth;
-  static double sm_controlPointDragStartHeight;
-  static double sm_controlPointDragEndWidth;
-  static double sm_controlPointDragEndHeight;
-  static double sm_controlPointDragPosX;
-  static double sm_controlPointDragPosY;
-};
-
-class WXDLLIMPEXP_OGL wxPolygonShape;
-class WXDLLIMPEXP_OGL wxPolygonControlPoint: public wxControlPoint
-{
- DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint)
-  friend class WXDLLIMPEXP_OGL wxPolygonShape;
- public:
-  wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL,
-    double the_xoffset = 0.0, double the_yoffset = 0.0);
-  ~wxPolygonControlPoint();
-
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-
-  // Calculate what new size would be, at end of resize
-  virtual void CalculateNewSize(double x, double y);
-
-  // Get new size
-  inline wxRealPoint GetNewSize() const { return m_newSize; };
-
-public:
-  wxRealPoint*      m_polygonVertex;
-  wxRealPoint       m_originalSize;
-  double             m_originalDistance;
-  wxRealPoint       m_newSize;
-};
-
-/*
- * Object regions.
- * Every shape has one or more text regions with various
- * properties. Not all of a region's properties will be used
- * by a shape.
- *
- */
-
-class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxShapeRegion)
-
- public:
-  // Constructor
-  wxShapeRegion();
-  // Copy constructor
-  wxShapeRegion(wxShapeRegion& region);
-  // Destructor
-  ~wxShapeRegion();
-
-  // Accessors
-  inline void SetText(const wxString& s)
-    { m_regionText = s; }
-  void SetFont(wxFont *f);
-  void SetMinSize(double w, double h);
-  void SetSize(double w, double h);
-  void SetPosition(double x, double y);
-  void SetProportions(double x, double y);
-  void SetFormatMode(int mode);
-  inline void SetName(const wxString& s) { m_regionName = s; };
-  void SetColour(const wxString& col); // Text colour
-
-  inline wxString GetText() const { return m_regionText; }
-  inline wxFont *GetFont() const { return m_font; }
-  inline void GetMinSize(double *x, double *y) const { *x = m_minWidth; *y = m_minHeight; }
-  inline void GetProportion(double *x, double *y) const { *x = m_regionProportionX; *y = m_regionProportionY; }
-  inline void GetSize(double *x, double *y) const { *x = m_width; *y = m_height; }
-  inline void GetPosition(double *xp, double *yp) const { *xp = m_x; *yp = m_y; }
-  inline int GetFormatMode() const { return m_formatMode; }
-  inline wxString GetName() const { return m_regionName; }
-  inline wxString GetColour() const { return m_textColour; }
-  wxColour GetActualColourObject();
-  inline wxList& GetFormattedText() { return m_formattedText; }
-  inline wxString GetPenColour() const { return m_penColour; }
-  inline int GetPenStyle() const { return m_penStyle; }
-  inline void SetPenStyle(int style) { m_penStyle = style; m_actualPenObject = NULL; }
-  void SetPenColour(const wxString& col);
-  wxPen *GetActualPen();
-  inline double GetWidth() const { return m_width; }
-  inline double GetHeight() const { return m_height; }
-
-  void ClearText();
-
-public:
-  wxString              m_regionText;
-  wxList                m_formattedText;   // List of wxShapeTextLines
-  wxFont*               m_font;
-  double                 m_minHeight;        // If zero, hide region.
-  double                 m_minWidth;        // If zero, hide region.
-  double                 m_width;
-  double                 m_height;
-  double                 m_x;
-  double                 m_y;
-
-  double                 m_regionProportionX; // Proportion of total object size;
-                                             // -1.0 indicates equal proportion
-  double                 m_regionProportionY; // Proportion of total object size;
-                                             // -1.0 indicates equal proportion
-
-  int                   m_formatMode;        // FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT | FORMAT_NONE
-  wxString              m_regionName;
-  wxString              m_textColour;
-  wxColour              m_actualColourObject; // For speed purposes
-
-  // New members for specifying divided rectangle division colour/style 30/6/94
-  wxString              m_penColour;
-  int                   m_penStyle;
-  wxPen*                m_actualPenObject;
-
-};
-
-/*
- * User-defined attachment point
- */
-
-class WXDLLIMPEXP_OGL wxAttachmentPoint: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)
-
-public:
-  inline wxAttachmentPoint()
-  {
-    m_id = 0; m_x = 0.0; m_y = 0.0;
-  }
-  inline wxAttachmentPoint(int id, double x, double y)
-  {
-    m_id = id; m_x = x; m_y = y;
-  }
-
-public:
-  int            m_id;           // Identifier
-  double         m_x;            // x offset from centre of object
-  double         m_y;            // y offset from centre of object
-};
-
-#endif
-  // _OGL_BASICP_H_
diff --git a/contrib/include/wx/ogl/bmpshape.h b/contrib/include/wx/ogl/bmpshape.h
deleted file mode 100644
index f16992e2cd..0000000000
--- a/contrib/include/wx/ogl/bmpshape.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bmpshape.h
-// Purpose:     wxBitmapShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_BITMAP_H_
-#define _OGL_BITMAP_H_
-
-
-class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxBitmapShape)
- public:
-  wxBitmapShape();
-  ~wxBitmapShape();
-
-  void OnDraw(wxDC& dc);
-
-#if wxUSE_PROLOGIO
-  // I/O
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  void SetSize(double w, double h, bool recursive = true);
-  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-  void SetBitmap(const wxBitmap& bm);
-  inline void SetFilename(const wxString& f) { m_filename = f; };
-  inline wxString GetFilename() const { return m_filename; }
-
-private:
-  wxBitmap      m_bitmap;
-  wxString      m_filename;
-};
-
-#endif
-  // _OGL_BITMAP_H_
-
-
diff --git a/contrib/include/wx/ogl/canvas.h b/contrib/include/wx/ogl/canvas.h
deleted file mode 100644
index 745e610e9f..0000000000
--- a/contrib/include/wx/ogl/canvas.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        canvas.h
-// Purpose:     wxShapeCanvas
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_CANVAS_H_
-#define _OGL_CANVAS_H_
-
-
-// Drag states
-#define NoDragging             0
-#define StartDraggingLeft      1
-#define ContinueDraggingLeft   2
-#define StartDraggingRight     3
-#define ContinueDraggingRight  4
-
-WXDLLIMPEXP_OGL extern const wxChar* wxShapeCanvasNameStr;
-
-// When drag_count reaches 0, process drag message
-
-class WXDLLIMPEXP_OGL wxDiagram;
-
-class WXDLLIMPEXP_OGL wxShapeCanvas: public wxScrolledWindow
-{
- DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
- public:
-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxBORDER | wxRETAINED,
-                const wxString& name = wxShapeCanvasNameStr);
-  ~wxShapeCanvas();
-
-  inline void SetDiagram(wxDiagram *diag) { m_shapeDiagram = diag; }
-  inline wxDiagram *GetDiagram() const { return m_shapeDiagram; }
-
-  virtual void OnLeftClick(double x, double y, int keys = 0);
-  virtual void OnRightClick(double x, double y, int keys = 0);
-
-  virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragLeft(double x, double y, int keys=0);
-  virtual void OnEndDragLeft(double x, double y, int keys=0);
-
-  virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragRight(double x, double y, int keys=0);
-  virtual void OnEndDragRight(double x, double y, int keys=0);
-
-  // Find object for mouse click, of given wxClassInfo (NULL for any type).
-  // If notImage is non-NULL, don't find an object that is equal to or a descendant of notImage
-  virtual wxShape *FindShape(double x, double y, int *attachment, wxClassInfo *info = NULL, wxShape *notImage = NULL);
-  wxShape *FindFirstSensitiveShape(double x, double y, int *new_attachment, int op);
-  wxShape *FindFirstSensitiveShape1(wxShape *image, int op);
-
-  // Redirect to wxDiagram object
-  virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
-  virtual void InsertShape(wxShape *object);
-  virtual void RemoveShape(wxShape *object);
-  virtual bool GetQuickEditMode();
-  virtual void Redraw(wxDC& dc);
-  void Snap(double *x, double *y);
-
-  // Events
-  void OnPaint(wxPaintEvent& event);
-  void OnMouseEvent(wxMouseEvent& event);
-
- protected:
-  wxDiagram*        m_shapeDiagram;
-  int               m_dragState;
-  double             m_oldDragX, m_oldDragY;     // Previous drag coordinates
-  double             m_firstDragX, m_firstDragY; // INITIAL drag coordinates
-  bool              m_checkTolerance;           // Whether to check drag tolerance
-  wxShape*          m_draggedShape;
-  int               m_draggedAttachment;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
- // _OGL_CANVAS_H_
diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h
deleted file mode 100644
index 68a2c400a2..0000000000
--- a/contrib/include/wx/ogl/composit.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        composit.h
-// Purpose:     wxCompositeShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_COMPOSIT_H_
-#define _OGL_COMPOSIT_H_
-
-
-class WXDLLIMPEXP_OGL wxDivisionShape;
-class WXDLLIMPEXP_OGL wxOGLConstraint;
-
-/*
- * A composite object is an invisible rectangle surrounding all children
- *
- */
-
-class WXDLLIMPEXP_OGL wxCompositeShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxCompositeShape)
-public:
-
-  wxCompositeShape();
-  ~wxCompositeShape();
-
-  void OnDraw(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-  void OnErase(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
-  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
-
-  void OnRightClick(double x, double y, int keys, int attachment = 0);
-
-  void SetSize(double w, double h, bool recursive = true);
-
-  // Returns true if it settled down
-  bool Recompute();
-
-  // New members
-  void AddChild(wxShape *child, wxShape *addAfter = NULL);
-  void RemoveChild(wxShape *child);
-
-  wxOGLConstraint *AddConstraint(wxOGLConstraint *constraint);
-  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxList& constrained);
-  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxShape *constrained);
-
-  void DeleteConstraint(wxOGLConstraint *constraint);
-
-  // Delete constraints that involve this child.
-  void DeleteConstraintsInvolvingChild(wxShape *child);
-
-  // Remove the image from any constraints involving it, but DON'T
-  // remove any constraints.
-  void RemoveChildFromConstraints(wxShape *child);
-
-  // Find constraint, also returning actual composite the constraint was in,
-  // in case it had to find it recursively.
-  wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);
-
-  // Returns true if something changed
-  bool Constrain();
-
-  // Make this composite into a container by creating one wxDivisionShape
-  void MakeContainer();
-
-  // Calculates size and position of composite object based on children
-  void CalculateSize();
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-  // In case the object has constraints it needs to read in in a different pass
-  void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
-#endif
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  virtual wxDivisionShape *OnCreateDivision();
-
-  // Finds the image used to visualize a container. This is any child
-  // of the composite that is not in the divisions list.
-  wxShape *FindContainerImage();
-
-  // Returns true if division is a descendant of this container
-  bool ContainsDivision(wxDivisionShape *division);
-
-  inline wxList& GetDivisions() const { return (wxList&) m_divisions; }
-  inline wxList& GetConstraints() const { return (wxList&) m_constraints; }
-
-protected:
-  double             m_oldX;
-  double             m_oldY;
-  wxList            m_constraints;
-  wxList            m_divisions; // In case it's a container
-};
-
-/*
- * A division object is a composite with special properties,
- * to be used for containment. It's a subdivision of a container.
- * A containing node image consists of a composite with a main child shape
- * such as rounded rectangle, plus a list of division objects.
- * It needs to be a composite because a division contains pieces
- * of diagram.
- * NOTE a container has at least one wxDivisionShape for consistency.
- * This can be subdivided, so it turns into two objects, then each of
- * these can be subdivided, etc.
- */
-#define DIVISION_SIDE_NONE      0
-#define DIVISION_SIDE_LEFT      1
-#define DIVISION_SIDE_TOP       2
-#define DIVISION_SIDE_RIGHT     3
-#define DIVISION_SIDE_BOTTOM    4
-
-class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
-{
- DECLARE_DYNAMIC_CLASS(wxDivisionShape)
- public:
-
-  wxDivisionShape();
-  ~wxDivisionShape();
-
-  void OnDraw(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = true);
-  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
-
-  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-
-  // Don't want this kind of composite to resize its subdiagrams, so
-  // override composite's SetSize.
-  void SetSize(double w, double h, bool recursive = true);
-
-  // Similarly for calculating size: it's fixed at whatever SetSize
-  // set it to, not in terms of children.
-  void CalculateSize();
-
-  void MakeControlPoints();
-  void ResetControlPoints();
-  void MakeMandatoryControlPoints();
-  void ResetMandatoryControlPoints();
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  // Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL)
-  bool Divide(int direction);
-
-  // Resize adjoining divisions at the given side. If test is true,
-  // just see whether it's possible for each adjoining region,
-  // returning false if it's not.
-  bool ResizeAdjoining(int side, double newPos, bool test);
-
-  // Adjust a side, returning false if it's not physically possible.
-  bool AdjustLeft(double left, bool test);
-  bool AdjustTop(double top, bool test);
-  bool AdjustRight(double right, bool test);
-  bool AdjustBottom(double bottom, bool test);
-
-  // Edit style of left or top side
-  void EditEdge(int side);
-
-  // Popup menu
-  void PopupMenu(double x, double y);
-
-  inline void SetLeftSide(wxDivisionShape *shape) { m_leftSide = shape; }
-  inline void SetTopSide(wxDivisionShape *shape) { m_topSide = shape; }
-  inline void SetRightSide(wxDivisionShape *shape) { m_rightSide = shape; }
-  inline void SetBottomSide(wxDivisionShape *shape) { m_bottomSide = shape; }
-  inline wxDivisionShape *GetLeftSide() const { return m_leftSide; }
-  inline wxDivisionShape *GetTopSide() const { return m_topSide; }
-  inline wxDivisionShape *GetRightSide() const { return m_rightSide; }
-  inline wxDivisionShape *GetBottomSide() const { return m_bottomSide; }
-
-  inline void SetHandleSide(int side) { m_handleSide = side; }
-  inline int GetHandleSide() const { return m_handleSide; }
-
-  inline void SetLeftSidePen(const wxPen *pen) { m_leftSidePen = pen; }
-  inline wxPen *GetLeftSidePen() const { return wx_const_cast(wxPen*, m_leftSidePen); }
-  inline void SetTopSidePen(const wxPen *pen) { m_topSidePen = pen; }
-  inline wxPen *GetTopSidePen() const { return wx_const_cast(wxPen*, m_topSidePen); }
-
-  void SetLeftSideColour(const wxString& colour);
-  void SetTopSideColour(const wxString& colour);
-  void SetLeftSideStyle(const wxString& style);
-  void SetTopSideStyle(const wxString& style);
-
-  inline wxString GetLeftSideColour() const { return m_leftSideColour; }
-  inline wxString GetTopSideColour() const { return m_topSideColour; }
-  inline wxString GetLeftSideStyle() const { return m_leftSideStyle; }
-  inline wxString GetTopSideStyle() const { return m_topSideStyle; }
-
- protected:
-  // Adjoining divisions. NULL indicates edge
-  // of container, and that side shouldn't be
-  // drawn.
-  wxDivisionShape*      m_leftSide;
-  wxDivisionShape*      m_rightSide;
-  wxDivisionShape*      m_topSide;
-  wxDivisionShape*      m_bottomSide;
-
-  int                   m_handleSide;       // Side at which handle is legal
-
-  const wxPen*          m_leftSidePen;
-  const wxPen*          m_topSidePen;
-  wxString              m_leftSideColour;
-  wxString              m_topSideColour;
-  wxString              m_leftSideStyle;
-  wxString              m_topSideStyle;
-};
-
-
-#define DIVISION_MENU_SPLIT_HORIZONTALLY    1
-#define DIVISION_MENU_SPLIT_VERTICALLY      2
-#define DIVISION_MENU_EDIT_LEFT_EDGE        3
-#define DIVISION_MENU_EDIT_TOP_EDGE         4
-#define DIVISION_MENU_EDIT_RIGHT_EDGE       5
-#define DIVISION_MENU_EDIT_BOTTOM_EDGE      6
-#define DIVISION_MENU_DELETE_ALL            7
-
-#endif
- // _OGL_COMPOSIT_H_
diff --git a/contrib/include/wx/ogl/constrnt.h b/contrib/include/wx/ogl/constrnt.h
deleted file mode 100644
index 98ea10e18e..0000000000
--- a/contrib/include/wx/ogl/constrnt.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        constrnt.h
-// Purpose:     OGL constraint definitions
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_CONSTRNT_H_
-#define _OGL_CONSTRNT_H_
-
-
-/*
- * OGL Constraints
- *
- */
-
-class WXDLLIMPEXP_OGL wxOGLConstraintType: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
-public:
-  wxOGLConstraintType(int type = 0, const wxString& name = wxEmptyString,
-                      const wxString& phrase = wxEmptyString);
-  ~wxOGLConstraintType();
-
-public:
-  int           m_type;     // E.g. gyCONSTRAINT_CENTRED_VERTICALLY
-  wxString      m_name;     // E.g. "Centre vertically"
-  wxString      m_phrase;   // E.g. "centred vertically with respect to", "left of"
-
-};
-
-extern wxList* wxOGLConstraintTypes;
-
-#define gyCONSTRAINT_CENTRED_VERTICALLY   1
-#define gyCONSTRAINT_CENTRED_HORIZONTALLY 2
-#define gyCONSTRAINT_CENTRED_BOTH         3
-#define gyCONSTRAINT_LEFT_OF              4
-#define gyCONSTRAINT_RIGHT_OF             5
-#define gyCONSTRAINT_ABOVE                6
-#define gyCONSTRAINT_BELOW                7
-#define gyCONSTRAINT_ALIGNED_TOP          8
-#define gyCONSTRAINT_ALIGNED_BOTTOM       9
-#define gyCONSTRAINT_ALIGNED_LEFT         10
-#define gyCONSTRAINT_ALIGNED_RIGHT        11
-
-// Like aligned, but with the objects centred on the respective edge
-// of the reference object.
-#define gyCONSTRAINT_MIDALIGNED_TOP       12
-#define gyCONSTRAINT_MIDALIGNED_BOTTOM    13
-#define gyCONSTRAINT_MIDALIGNED_LEFT      14
-#define gyCONSTRAINT_MIDALIGNED_RIGHT     15
-
-class WXDLLIMPEXP_OGL wxOGLConstraint: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
- public:
-  wxOGLConstraint() {
-     m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0;
-     m_constraintName = wxEmptyString; m_constraintId = 0;
-     m_constrainingObject = NULL; }
-  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
-  ~wxOGLConstraint();
-
-  // Returns true if anything changed
-  bool Evaluate();
-  inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
-  bool Equals(double a, double b);
-
-  double         m_xSpacing;
-  double         m_ySpacing;
-  int           m_constraintType;
-  wxString      m_constraintName;
-  long          m_constraintId;
-  wxShape*      m_constrainingObject;
-  wxList        m_constrainedObjects;
-
-};
-
-void OGLInitializeConstraintTypes();
-void OGLCleanUpConstraintTypes();
-
-#endif
- // _OGL_CONSTRNT_H_
diff --git a/contrib/include/wx/ogl/divided.h b/contrib/include/wx/ogl/divided.h
deleted file mode 100644
index 5148f615f6..0000000000
--- a/contrib/include/wx/ogl/divided.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        divided.h
-// Purpose:     wxDividedShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_DIVIDED_H_
-#define _OGL_DIVIDED_H_
-
-
-/*
- * Definition of a region
- *
- */
-
-/*
- * Box divided into horizontal regions
- *
- */
-
-extern wxFont *g_oglNormalFont;
-class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxDividedShape)
-
- public:
-  wxDividedShape(double w = 0.0, double h = 0.0);
-  ~wxDividedShape();
-
-  void OnDraw(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-
-  void SetSize(double w, double h, bool recursive = true);
-
-  void MakeControlPoints();
-  void ResetControlPoints();
-
-  void MakeMandatoryControlPoints();
-  void ResetMandatoryControlPoints();
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  void Copy(wxShape &copy);
-
-  // Set all region sizes according to proportions and
-  // this object total size
-  void SetRegionSizes();
-
-  // Edit region colours/styles
-  void EditRegions();
-
-  // Attachment points correspond to regions in the divided box
-  bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  bool AttachmentIsValid(int attachment) const;
-  int GetNumberOfAttachments() const;
-
-  // Invoke editor on CTRL-right click
-  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-};
-
-#endif
-    // _OGL_DIVIDED_H_
-
diff --git a/contrib/include/wx/ogl/drawn.h b/contrib/include/wx/ogl/drawn.h
deleted file mode 100644
index 0df56399a2..0000000000
--- a/contrib/include/wx/ogl/drawn.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        drawn.h
-// Purpose:     wxDrawnShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_DRAWN_H_
-#define _OGL_DRAWN_H_
-
-
-#define oglMETAFLAGS_OUTLINE         1
-#define oglMETAFLAGS_ATTACHMENTS     2
-
-class WXDLLIMPEXP_OGL wxDrawnShape;
-class WXDLLIMPEXP_OGL wxPseudoMetaFile: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)
- public:
-  wxPseudoMetaFile();
-  wxPseudoMetaFile(wxPseudoMetaFile& mf);
-  ~wxPseudoMetaFile();
-
-  void Draw(wxDC& dc, double xoffset, double yoffset);
-
-#if wxUSE_PROLOGIO
-  void WriteAttributes(wxExpr *clause, int whichAngle);
-  void ReadAttributes(wxExpr *clause, int whichAngle);
-#endif
-
-  void Clear();
-
-  void Copy(wxPseudoMetaFile& copy);
-
-  void Scale(double sx, double sy);
-  void ScaleTo(double w, double h); // Scale to fit size
-  void Translate(double x, double y);
-
-  // Rotate about the given axis by theta radians from the x axis.
-  void Rotate(double x, double y, double theta);
-
-  bool LoadFromMetaFile(const wxString& filename, double *width, double *height);
-
-  void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
-
-  // Calculate size from current operations
-  void CalculateSize(wxDrawnShape* shape);
-
-  inline wxList& GetOutlineColours() const { return (wxList&) m_outlineColours; }
-  inline wxList& GetFillColours() const { return (wxList&) m_fillColours; }
-  inline void SetRotateable(bool rot) { m_rotateable = rot; }
-  inline bool GetRotateable() const { return m_rotateable; }
-
-  inline void SetSize(double w, double h) { m_width = w; m_height = h; }
-
-  inline void SetFillBrush(const wxBrush* brush) { m_fillBrush = brush; }
-  inline wxBrush* GetFillBrush() const { return wx_const_cast(wxBrush*, m_fillBrush); }
-
-  inline void SetOutlinePen(const wxPen* pen) { m_outlinePen = pen; }
-  inline wxPen* GetOutlinePen() const { return wx_const_cast(wxPen*, m_outlinePen); }
-
-  inline void SetOutlineOp(int op) { m_outlineOp = op; }
-  inline int GetOutlineOp() const { return m_outlineOp; }
-
-  inline wxList& GetOps() const { return (wxList&) m_ops; }
-
-  // Is this a valid (non-empty) metafile?
-  inline bool IsValid() const { return (m_ops.GetCount() > 0); }
-
-public:
-  /// Set of functions for drawing into a pseudo metafile.
-  /// They use integers, but doubles are used internally for accuracy
-  /// when scaling.
-
-  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
-  virtual void DrawRectangle(const wxRect& rect);
-  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
-  virtual void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
-  virtual void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
-  virtual void DrawEllipse(const wxRect& rect);
-  virtual void DrawPoint(const wxPoint& pt);
-  virtual void DrawText(const wxString& text, const wxPoint& pt);
-  virtual void DrawLines(int n, wxPoint pts[]);
-  // flags:
-  // oglMETAFLAGS_OUTLINE: will be used for drawing the outline and
-  //                       also drawing lines/arrows at the circumference.
-  // oglMETAFLAGS_ATTACHMENTS: will be used for initialising attachment points at
-  //                       the vertices (perhaps a rare case...)
-  virtual void DrawPolygon(int n, wxPoint pts[], int flags = 0);
-  virtual void DrawSpline(int n, wxPoint pts[]);
-
-  virtual void SetClippingRect(const wxRect& rect);
-  virtual void DestroyClippingRect();
-
-  virtual void SetPen(const wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetBrush(const wxBrush* brush, bool isFill = false);  // pens/brushes etc.
-  virtual void SetFont(wxFont* font);
-  virtual void SetTextColour(const wxColour& colour);
-  virtual void SetBackgroundColour(const wxColour& colour);
-  virtual void SetBackgroundMode(int mode);
-
-public:
-  bool              m_rotateable;
-  double            m_width;
-  double            m_height;
-  wxList            m_ops; // List of drawing operations (see drawnp.h)
-  wxList            m_gdiObjects; // List of pens, brushes and fonts for this object.
-  int               m_outlineOp;  // The op representing the outline, if any
-
-  // Pen/brush specifying outline/fill colours
-  // to override operations.
-  const wxPen*      m_outlinePen;
-  const wxBrush*    m_fillBrush;
-  wxList            m_outlineColours; // List of the GDI operations that comprise the outline
-  wxList            m_fillColours; // List of the GDI operations that fill the shape
-  double             m_currentRotation;
-};
-
-#define oglDRAWN_ANGLE_0        0
-#define oglDRAWN_ANGLE_90       1
-#define oglDRAWN_ANGLE_180      2
-#define oglDRAWN_ANGLE_270      3
-
-class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape
-{
- DECLARE_DYNAMIC_CLASS(wxDrawnShape)
- public:
-  wxDrawnShape();
-  ~wxDrawnShape();
-
-  void OnDraw(wxDC& dc);
-
-#if wxUSE_PROLOGIO
-  // I/O
-  void WriteAttributes(wxExpr *clause);
-  void ReadAttributes(wxExpr *clause);
-#endif
-
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  void Scale(double sx, double sy);
-  void Translate(double x, double y);
-  // Rotate about the given axis by theta radians from the x axis.
-  void Rotate(double x, double y, double theta);
-
-  // Get current rotation
-  inline double GetRotation() const { return m_rotation; }
-
-  void SetSize(double w, double h, bool recursive = true);
-  bool LoadFromMetaFile(const wxString& filename);
-
-  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
-  inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }
-
-  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-
-  // Get the perimeter point using the special outline op, if there is one,
-  // otherwise use default wxRectangleShape scheme
-  bool GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3);
-
-  /// Set of functions for drawing into a pseudo metafile.
-  /// They use integers, but doubles are used internally for accuracy
-  /// when scaling.
-
-  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
-  virtual void DrawRectangle(const wxRect& rect);
-  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
-  virtual void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
-  virtual void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
-  virtual void DrawEllipse(const wxRect& rect);
-  virtual void DrawPoint(const wxPoint& pt);
-  virtual void DrawText(const wxString& text, const wxPoint& pt);
-  virtual void DrawLines(int n, wxPoint pts[]);
-  virtual void DrawPolygon(int n, wxPoint pts[], int flags = 0);
-  virtual void DrawSpline(int n, wxPoint pts[]);
-
-  virtual void SetClippingRect(const wxRect& rect);
-  virtual void DestroyClippingRect();
-
-  virtual void SetDrawnPen(const wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetDrawnBrush(const wxBrush* brush, bool isFill = false);  // pens/brushes etc.
-  virtual void SetDrawnFont(wxFont* font);
-  virtual void SetDrawnTextColour(const wxColour& colour);
-  virtual void SetDrawnBackgroundColour(const wxColour& colour);
-  virtual void SetDrawnBackgroundMode(int mode);
-
-  // Set the width/height according to the shapes in the metafile.
-  // Call this after drawing into the shape.
-  inline void CalculateSize() { m_metafiles[m_currentAngle].CalculateSize(this); }
-
-  inline void DrawAtAngle(int angle) { m_currentAngle = angle; };
-
-  inline int GetAngle() const { return m_currentAngle; }
-
-// Implementation
-protected:
-  // Which metafile do we use now? Based on current rotation and validity
-  // of metafiles.
-  int DetermineMetaFile(double rotation);
-
-private:
-  // One metafile for each 90 degree rotation (or just a single one).
-  wxPseudoMetaFile      m_metafiles[4];
-
-  // Don't save all wxDrawnShape metafiles to file: sometimes
-  // we take the metafile data from a symbol library.
-  bool                  m_saveToFile;
-
-  // Which angle are we using/drawing into?
-  int                   m_currentAngle;
-};
-
-#endif
-    // _DRAWN_H_
diff --git a/contrib/include/wx/ogl/drawnp.h b/contrib/include/wx/ogl/drawnp.h
deleted file mode 100644
index 9d6c3552a8..0000000000
--- a/contrib/include/wx/ogl/drawnp.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        drawnp.h
-// Purpose:     Private header for wxDrawnShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_DRAWNP_H_
-#define _OGL_DRAWNP_H_
-
-
-/*
- * Drawing operations
- *
- */
-
-#define  DRAWOP_SET_PEN             1
-#define  DRAWOP_SET_BRUSH           2
-#define  DRAWOP_SET_FONT            3
-#define  DRAWOP_SET_TEXT_COLOUR     4
-#define  DRAWOP_SET_BK_COLOUR       5
-#define  DRAWOP_SET_BK_MODE         6
-#define  DRAWOP_SET_CLIPPING_RECT   7
-#define  DRAWOP_DESTROY_CLIPPING_RECT 8
-
-/*
-#define  DRAWOP_CREATE_PEN          10
-#define  DRAWOP_CREATE_BRUSH        11
-#define  DRAWOP_CREATE_FONT         12
-*/
-
-#define  DRAWOP_DRAW_LINE           20
-#define  DRAWOP_DRAW_POLYLINE       21
-#define  DRAWOP_DRAW_POLYGON        22
-#define  DRAWOP_DRAW_RECT           23
-#define  DRAWOP_DRAW_ROUNDED_RECT   24
-#define  DRAWOP_DRAW_ELLIPSE        25
-#define  DRAWOP_DRAW_POINT          26
-#define  DRAWOP_DRAW_ARC            27
-#define  DRAWOP_DRAW_TEXT           28
-#define  DRAWOP_DRAW_SPLINE         29
-#define  DRAWOP_DRAW_ELLIPTIC_ARC   30
-
-/*
- * Base, virtual class
- *
- */
-
-class WXDLLIMPEXP_OGL wxDrawOp: public wxObject
-{
-public:
-  inline wxDrawOp(int theOp) { m_op = theOp; }
-  inline ~wxDrawOp() {}
-  inline virtual void Scale(double WXUNUSED(xScale), double WXUNUSED(yScale)) {};
-  inline virtual void Translate(double WXUNUSED(x), double WXUNUSED(y)) {};
-  inline virtual void Rotate(double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(theta), double WXUNUSED(sinTheta), double WXUNUSED(cosTheta)) {};
-  virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
-  virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
-#if wxUSE_PROLOGIO
-  virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
-  virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
-#endif
-  inline int GetOp() const { return m_op; }
-
-  // Draw an outline using the current operation. By default, return false (not drawn)
-  virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h),
-    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return false; }
-
-  // Get the perimeter point using this data
-  virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
-                                     double WXUNUSED(x2), double WXUNUSED(y2),
-                                     double *WXUNUSED(x3), double *WXUNUSED(y3),
-                                     double WXUNUSED(xOffset), double WXUNUSED(yOffset),
-                                     int WXUNUSED(attachmentMode))
-  { return false; }
-
-protected:
-  int           m_op;
-
-};
-
-/*
- * Set font, brush, text colour
- *
- */
-
-class WXDLLIMPEXP_OGL wxOpSetGDI: public wxDrawOp
-{
- public:
-  wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
-  void Do(wxDC& dc, double xoffset, double yoffset);
-  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
-  wxExpr *WriteExpr(wxPseudoMetaFile *image);
-  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif
-
-public:
-  int               m_mode;
-  int               m_gdiIndex;
-  wxPseudoMetaFile* m_image;
-  unsigned char     m_r;
-  unsigned char     m_g;
-  unsigned char     m_b;
-};
-
-/*
- * Set/destroy clipping
- *
- */
-
-class WXDLLIMPEXP_OGL wxOpSetClipping: public wxDrawOp
-{
-public:
-  wxOpSetClipping(int theOp, double theX1, double theY1, double theX2, double theY2);
-  void Do(wxDC& dc, double xoffset, double yoffset);
-  void Scale(double xScale, double yScale);
-  void Translate(double x, double y);
-  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
-  wxExpr *WriteExpr(wxPseudoMetaFile *image);
-  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif
-
-public:
-  double     m_x1;
-  double     m_y1;
-  double     m_x2;
-  double     m_y2;
-};
-
-/*
- * Draw line, rectangle, rounded rectangle, ellipse, point, arc, text
- *
- */
-
-class WXDLLIMPEXP_OGL wxOpDraw: public wxDrawOp
-{
- public:
-  wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double radius = 0.0, const wxString& s = wxEmptyString);
-  ~wxOpDraw();
-  void Do(wxDC& dc, double xoffset, double yoffset);
-  void Scale(double scaleX, double scaleY);
-  void Translate(double x, double y);
-  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
-  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
-  wxExpr *WriteExpr(wxPseudoMetaFile *image);
-  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif
-
-public:
-  double     m_x1;
-  double     m_y1;
-  double     m_x2;
-  double     m_y2;
-  double     m_x3;
-  double     m_y3;
-  double     m_radius;
-  wxString   m_textString;
-
-};
-
-/*
- * Draw polyline, spline, polygon
- *
- */
-
-class WXDLLIMPEXP_OGL wxOpPolyDraw: public wxDrawOp
-{
-public:
-  wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
-  ~wxOpPolyDraw();
-  void Do(wxDC& dc, double xoffset, double yoffset);
-  void Scale(double scaleX, double scaleY);
-  void Translate(double x, double y);
-  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
-  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
-#if wxUSE_PROLOGIO
-  wxExpr *WriteExpr(wxPseudoMetaFile *image);
-  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
-#endif
-
-  // Draw an outline using the current operation.
-  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
-    double oldW, double oldH);
-
-  // Get the perimeter point using this data
-  bool GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3,
-                                     double xOffset, double yOffset,
-                                     int attachmentMode);
-
-public:
-  wxRealPoint*  m_points;
-  int           m_noPoints;
-
-};
-
-#endif
- // _OGL_DRAWNP_H_
-
-
diff --git a/contrib/include/wx/ogl/lines.h b/contrib/include/wx/ogl/lines.h
deleted file mode 100644
index ff1f16f1f2..0000000000
--- a/contrib/include/wx/ogl/lines.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        lines.h
-// Purpose:     wxLineShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_LINES_H_
-#define _OGL_LINES_H_
-
-
-class WXDLLIMPEXP_OGL wxLabelShape;
-class WXDLLIMPEXP_OGL wxPseudoMetaFile;
-class WXDLLIMPEXP_OGL wxLineControlPoint;
-/*
- * Arcs with multiple arrowheads
- *
- */
-
-// Types of arrowhead
-// (i) Built-in
-#define ARROW_HOLLOW_CIRCLE   1
-#define ARROW_FILLED_CIRCLE   2
-#define ARROW_ARROW           3
-#define ARROW_SINGLE_OBLIQUE  4
-#define ARROW_DOUBLE_OBLIQUE  5
-// (ii) Custom
-#define ARROW_METAFILE        20
-
-// Position of arrow on line
-#define ARROW_POSITION_START  0
-#define ARROW_POSITION_END    1
-#define ARROW_POSITION_MIDDLE 2
-
-// Line alignment flags
-// Vertical by default
-#define LINE_ALIGNMENT_HORIZ              1
-#define LINE_ALIGNMENT_VERT               0
-#define LINE_ALIGNMENT_TO_NEXT_HANDLE     2
-#define LINE_ALIGNMENT_NONE               0
-
-class WXDLLIMPEXP_OGL wxArrowHead: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxArrowHead)
-
- public:
-  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = wxEmptyString, wxPseudoMetaFile *mf = NULL,
-            long arrowId = -1);
-  ~wxArrowHead();
-  wxArrowHead(wxArrowHead& toCopy);
-
-  inline WXTYPE _GetType() const { return m_arrowType; }
-  inline int GetPosition() const { return m_arrowEnd; }
-  inline void SetPosition(int pos) { m_arrowEnd = pos; }
-  inline double GetXOffset() const { return m_xOffset; }
-  inline double GetYOffset() const { return m_yOffset; }
-  inline double GetSpacing() const { return m_spacing; }
-  inline double GetSize() const { return m_arrowSize; }
-  inline wxString GetName() const { return m_arrowName; }
-  inline void SetXOffset(double x) { m_xOffset = x; }
-  inline void SetYOffset(double y) { m_yOffset = y; }
-  inline wxPseudoMetaFile *GetMetaFile() const { return m_metaFile; }
-  inline long GetId() const { return m_id; }
-  inline int GetArrowEnd() const { return m_arrowEnd; }
-  inline double GetArrowSize() const { return m_arrowSize; }
-  void SetSize(double size);
-  inline void SetSpacing(double sp) { m_spacing = sp; }
-
- protected:
-  WXTYPE            m_arrowType;
-  int               m_arrowEnd;         // Position on line
-  double             m_xOffset;          // Distance from arc start or end, w.r.t. point on arrowhead
-                                        // nearest start or end. If zero, use default spacing.
-  double             m_yOffset;          // vertical offset (w.r.t. a horizontal line). Normally zero.
-  double             m_spacing;          // Spacing from the last arrowhead
-  double             m_arrowSize;        // Length of arrowhead
-  wxString          m_arrowName;        // Name of arrow
-  bool              m_saveToFile;       // true if we want to save custom arrowheads to file.
-  wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
-  long              m_id;               // identifier
-};
-
-// Line object
-class WXDLLIMPEXP_OGL wxLabelShape;
-class WXDLLIMPEXP_OGL wxLineShape: public wxShape
-{
- DECLARE_DYNAMIC_CLASS(wxLineShape)
-
- public:
-  wxLineShape();
-  ~wxLineShape();
-
-  // Called when a connected object has moved, to move the link to
-  // correct position
-  // moveControlPoints must be disabled when a control point is being
-  // dragged.
-  void OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-  void OnDraw(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-  void OnDrawControlPoints(wxDC& dc);
-  void OnEraseControlPoints(wxDC& dc);
-  void OnErase(wxDC& dc);
-  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return false; }
-  virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
-  virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
-  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-  void GetBoundingBoxMin(double *w, double *h);
-  void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
-  virtual void SetEnds(double x1, double y1, double x2, double y2);
-  virtual void GetEnds(double *x1, double *y1, double *x2, double *y2);
-  inline virtual wxShape *GetFrom() { return m_from; }
-  inline virtual wxShape *GetTo() { return m_to; }
-  inline virtual int GetAttachmentFrom() { return m_attachmentFrom; }
-  inline virtual int GetAttachmentTo() { return m_attachmentTo; }
-
-  virtual void SetFrom(wxShape *object);
-  virtual void SetTo(wxShape *object);
-  virtual void DrawArrows(wxDC& dc);
-
-  // Finds the x, y points at the two ends of the line.
-  // This function can be used by e.g. line-routing routines to
-  // get the actual points on the two node images where the lines will be drawn
-  // to/from.
-  void FindLineEndPoints(double *fromX, double *fromY, double *toX, double *toY);
-
-  // Format one region at this position
-  void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
-
-  // Erase one region at this position
-  void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
-
-  // Get the reference point for a label. Region x and y
-  // are offsets from this.
-  // position is 0 (middle), 1 (start), 2 (end)
-  void GetLabelPosition(int position, double *x, double *y);
-
-  // Can override this to create a different class of label shape
-  virtual wxLabelShape* OnCreateLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-
-  // Straighten verticals and horizontals
-  virtual void Straighten(wxDC* dc = NULL);
-
-  // Not implemented
-  inline void SetMaintainStraightLines(bool flag) { m_maintainStraightLines = flag; }
-  inline bool GetMaintainStraightLines() const { return m_maintainStraightLines; }
-
-  // Make handle control points
-  void MakeControlPoints();
-  void ResetControlPoints();
-
-  // Make a given number of control points
-  virtual void MakeLineControlPoints(int n);
-  virtual wxNode *InsertLineControlPoint(wxDC* dc);
-  virtual bool DeleteLineControlPoint();
-  virtual void Initialise();
-  inline wxList *GetLineControlPoints() { return m_lineControlPoints; }
-
-  // Override dragging behaviour - don't want to be able to drag lines!
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-
-  // Control points ('handles') redirect control to the actual shape, to make it easier
-  // to override sizing behaviour.
-  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-
-  // Override select, to create/delete temporary label-moving objects
-  void Select(bool select = true, wxDC* dc = NULL);
-
-  // Set to spline (true) or line (false)
-  inline void SetSpline(bool spl) { m_isSpline = spl; }
-  inline bool IsSpline() const { return m_isSpline; }
-
-  void Unlink();
-  void SetAttachments(int from_attach, int to_attach);
-  inline void SetAttachmentFrom(int attach) { m_attachmentFrom = attach; }
-  inline void SetAttachmentTo(int attach) { m_attachmentTo = attach; }
-
-  bool HitTest(double x, double y, int *attachment, double *distance);
-
-#if wxUSE_PROLOGIO
-  // I/O
-  virtual void WriteAttributes(wxExpr *clause);
-  virtual void ReadAttributes(wxExpr *clause);
-#endif
-
-  virtual void FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming);
-
-  // Find which position we're talking about at this (x, y).
-  // Returns ARROW_POSITION_START, ARROW_POSITION_MIDDLE, ARROW_POSITION_END
-  int FindLinePosition(double x, double y);
-
-  // This is really to distinguish between lines and other images.
-  // For lines, want to pass drag to canvas, since lines tend to prevent
-  // dragging on a canvas (they get in the way.)
-  virtual bool Draggable() const { return false; }
-
-  // Does the copying for this object
-  void Copy(wxShape& copy);
-
-  // Add an arrowhead.
-  wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
-                        double arrowSize = 10.0, double xOffset = 0.0,
-                        const wxString& name = wxEmptyString,
-                        wxPseudoMetaFile *mf = NULL, long arrowId = -1);
-
-  // Add an arrowhead in the position indicated by the reference
-  // list of arrowheads, which contains all legal arrowheads for this
-  // line, in the correct order.
-  // E.g. reference list:      a b c d e
-  //      Current line list:   a d
-  // Add c, then line list is: a c d
-  // If no legal arrowhead position, return false.
-  // Assume reference list is for one end only, since it potentially defines
-  // the ordering for any one of the 3 positions. So we don't check
-  // the reference list for arrowhead position.
-  bool AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end);
-
-  // Delete arrowhead(s)
-  void ClearArrowsAtPosition(int end = -1);
-  bool ClearArrow(const wxString& name);
-  wxArrowHead *FindArrowHead(int position, const wxString& name);
-  wxArrowHead *FindArrowHead(long arrowId);
-  bool DeleteArrowHead(int position, const wxString& name);
-  bool DeleteArrowHead(long arrowId);
-  void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
-  inline void SetIgnoreOffsets(bool ignore) { m_ignoreArrowOffsets = ignore; }
-  inline wxList& GetArrows() const { return (wxList&) m_arcArrows; }
-
-  // Find horizontal width for drawing a line with
-  // arrows in minimum space. Assume arrows at
-  // END only
-  double FindMinimumWidth();
-
-  // Set alignment flags. ALIGNMENT NOT IMPLEMENTED.
-  void SetAlignmentOrientation(bool isEnd, bool isHoriz);
-  void SetAlignmentType(bool isEnd, int alignType);
-  bool GetAlignmentOrientation(bool isEnd);
-  int GetAlignmentType(bool isEnd);
-  int GetAlignmentStart() const { return m_alignmentStart; }
-  int GetAlignmentEnd() const { return m_alignmentEnd; }
-
-  // Find next control point in line after the start/end point
-  // (depending on whether the node object is at start or end)
-  wxRealPoint *GetNextControlPoint(wxShape *nodeObject);
-  inline bool IsEnd(wxShape *nodeObject) const { return (m_to == nodeObject); }
-
-private:
-  bool              m_erasing;              // flag to say whether we're erasing or drawing
-                                            // this line (really so metafiles can draw a
-                                            // blank rectangle)
-  bool              m_ignoreArrowOffsets;   // Don't always want to draw arrowhead offsets
-                                            // because they may not work on tool palettes (for example)
-  bool              m_isSpline;
-  bool              m_maintainStraightLines;
-
-protected:
-  // Temporary list of line segment orientations
-  // so we know what direction the line is supposed to be dog-legging
-  // in. The values are integer: 0 for vertical, 1 for horizontal.
-  wxList            m_lineOrientations;
-
-  // Temporary pointers for start, middle and end label editing objects
-  // (active only when the line is selected)
-  wxLabelShape*     m_labelObjects[3];
-
-  // These define the segmented line - not to be confused with temporary control
-  // points which appear when object is selected (although in this case they'll
-  // probably be the same)
-  wxList*           m_lineControlPoints;
-
-  double            m_arrowSpacing; // Separation between adjacent arrows
-
-  wxShape*          m_to;
-  wxShape*          m_from;
-
-  int               m_attachmentTo;   // Attachment point at one end
-  int               m_attachmentFrom; // Attachment point at other end
-
-  // Alignment flags
-  int               m_alignmentStart;
-  int               m_alignmentEnd;
-
-  wxList            m_arcArrows;
-
-};
-
-#endif
-    // _OGL_LINES_H_
diff --git a/contrib/include/wx/ogl/linesp.h b/contrib/include/wx/ogl/linesp.h
deleted file mode 100644
index 0a7d81499f..0000000000
--- a/contrib/include/wx/ogl/linesp.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        linesp.h
-// Purpose:     Lines private header file
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_LINESP_H_
-#define _OGL_LINESP_H_
-
-
-class WXDLLIMPEXP_OGL wxLineShape;
-class WXDLLIMPEXP_OGL wxLineControlPoint: public wxControlPoint
-{
-  DECLARE_DYNAMIC_CLASS(wxLineControlPoint)
-  friend class WXDLLIMPEXP_OGL wxLineShape;
- public:
-
-  wxLineControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0,
-     double x = 0.0, double y = 0.0, int the_type = 0);
-  ~wxLineControlPoint();
-
-  void OnDraw(wxDC& dc);
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-
-  // Obsolete (left-dragging now moves attachment point to new relative position OR new
-  // attachment id)
-#if 0
-  void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-#endif
-
-public:
-
-  int           m_type;
-  wxRealPoint*  m_point;  // Line point
-  wxRealPoint   m_originalPos;
-
-};
-
-/*
- * Temporary arc label object
- */
-
-class WXDLLIMPEXP_OGL wxLabelShape: public wxRectangleShape
-{
-  DECLARE_DYNAMIC_CLASS(wxLabelShape)
-
- public:
-  wxLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-  ~wxLabelShape();
-
-  void OnDraw(wxDC& dc);
-  void OnDrawContents(wxDC& dc);
-  void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-
-public:
-  wxLineShape*      m_lineShape;
-  wxShapeRegion*    m_shapeRegion;
-
-};
-
-/*
- * Get the point on the given line (x1, y1) (x2, y2)
- * distance 'length' along from the end,
- * returned values in x and y
- */
-
-void GetPointOnLine(double x1, double y1, double x2, double y2,
-                    double length, double *x, double *y);
-
-#endif
-    // _OGL_LINESP_H_
-
diff --git a/contrib/include/wx/ogl/mfutils.h b/contrib/include/wx/ogl/mfutils.h
deleted file mode 100644
index 1f61c129d8..0000000000
--- a/contrib/include/wx/ogl/mfutils.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mfutils.h
-// Purpose:     Metafile utilities: reading a placeable metafile independently
-//              of Windows.
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MFUTILS_H_
-#define _MFUTILS_H_
-
-
-#include "wx/metafile.h"
-
-#ifndef GetRValue
-#define GetRValue(rgb) ((unsigned char)(rgb))
-#define GetGValue(rgb) ((unsigned char)(((int)(rgb)) >> 8))
-#define GetBValue(rgb) ((unsigned char)((rgb)>>16))
-#endif
-
-/* Metafile Functions */
-// some compilers have them in their include files
-
-#ifndef META_SETBKCOLOR
-  #define META_SETBKCOLOR            0x0201
-#endif
-#ifndef META_SETBKMODE
-  #define META_SETBKMODE             0x0102
-#endif
-#ifndef META_SETMAPMODE
-  #define META_SETMAPMODE            0x0103
-#endif
-#ifndef META_SETROP2
-  #define META_SETROP2               0x0104
-#endif
-#ifndef META_SETRELABS
-  #define META_SETRELABS             0x0105
-#endif
-#ifndef META_SETPOLYFILLMODE
-  #define META_SETPOLYFILLMODE       0x0106
-#endif
-#ifndef META_SETSTRETCHBLTMODE
-  #define META_SETSTRETCHBLTMODE     0x0107
-#endif
-#ifndef META_SETTEXTCHAREXTRA
-  #define META_SETTEXTCHAREXTRA      0x0108
-#endif
-#ifndef META_SETTEXTCOLOR
-  #define META_SETTEXTCOLOR          0x0209
-#endif
-#ifndef META_SETTEXTJUSTIFICATION
-  #define META_SETTEXTJUSTIFICATION  0x020A
-#endif
-#ifndef META_SETWINDOWORG
-  #define META_SETWINDOWORG          0x020B
-#endif
-#ifndef META_SETWINDOWEXT
-  #define META_SETWINDOWEXT          0x020C
-#endif
-#ifndef META_SETVIEWPORTORG
-  #define META_SETVIEWPORTORG        0x020D
-#endif
-#ifndef META_SETVIEWPORTEXT
-  #define META_SETVIEWPORTEXT        0x020E
-#endif
-#ifndef META_OFFSETWINDOWORG
-  #define META_OFFSETWINDOWORG       0x020F
-#endif
-#ifndef META_SCALEWINDOWEXT
-  #define META_SCALEWINDOWEXT        0x0410
-#endif
-#ifndef META_OFFSETVIEWPORTORG
-  #define META_OFFSETVIEWPORTORG     0x0211
-#endif
-#ifndef META_SCALEVIEWPORTEXT
-  #define META_SCALEVIEWPORTEXT      0x0412
-#endif
-#ifndef META_LINETO
-  #define META_LINETO                0x0213
-#endif
-#ifndef META_MOVETO
-  #define META_MOVETO                0x0214
-#endif
-#ifndef META_EXCLUDECLIPRECT
-  #define META_EXCLUDECLIPRECT       0x0415
-#endif
-#ifndef META_INTERSECTCLIPRECT
-  #define META_INTERSECTCLIPRECT     0x0416
-#endif
-#ifndef META_ARC
-  #define META_ARC                   0x0817
-#endif
-#ifndef META_ELLIPSE
-  #define META_ELLIPSE               0x0418
-#endif
-#ifndef META_FLOODFILL
-  #define META_FLOODFILL             0x0419
-#endif
-#ifndef META_PIE
-  #define META_PIE                   0x081A
-#endif
-#ifndef META_RECTANGLE
-  #define META_RECTANGLE             0x041B
-#endif
-#ifndef META_ROUNDRECT
-  #define META_ROUNDRECT             0x061C
-#endif
-#ifndef META_PATBLT
-  #define META_PATBLT                0x061D
-#endif
-#ifndef META_SAVEDC
-  #define META_SAVEDC                0x001E
-#endif
-#ifndef META_SETPIXEL
-  #define META_SETPIXEL              0x041F
-#endif
-#ifndef META_OFFSETCLIPRGN
-  #define META_OFFSETCLIPRGN         0x0220
-#endif
-#ifndef META_TEXTOUT
-  #define META_TEXTOUT               0x0521
-#endif
-#ifndef META_BITBLT
-  #define META_BITBLT                0x0922
-#endif
-#ifndef META_STRETCHBLT
-  #define META_STRETCHBLT            0x0B23
-#endif
-#ifndef META_POLYGON
-  #define META_POLYGON               0x0324
-#endif
-#ifndef META_POLYLINE
-  #define META_POLYLINE              0x0325
-#endif
-#ifndef META_ESCAPE
-  #define META_ESCAPE                0x0626
-#endif
-#ifndef META_RESTOREDC
-  #define META_RESTOREDC             0x0127
-#endif
-#ifndef META_FILLREGION
-  #define META_FILLREGION            0x0228
-#endif
-#ifndef META_FRAMEREGION
-  #define META_FRAMEREGION           0x0429
-#endif
-#ifndef META_INVERTREGION
-  #define META_INVERTREGION          0x012A
-#endif
-#ifndef META_PAINTREGION
-  #define META_PAINTREGION           0x012B
-#endif
-#ifndef META_SELECTCLIPREGION
-  #define META_SELECTCLIPREGION      0x012C
-#endif
-#ifndef META_SELECTOBJECT
-  #define META_SELECTOBJECT          0x012D
-#endif
-#ifndef META_SETTEXTALIGN
-  #define META_SETTEXTALIGN          0x012E
-#endif
-#ifndef META_DRAWTEXT
-  #define META_DRAWTEXT              0x062F
-#endif
-
-#ifndef META_CHORD
-  #define META_CHORD                 0x0830
-#endif
-#ifndef META_SETMAPPERFLAGS
-  #define META_SETMAPPERFLAGS        0x0231
-#endif
-#ifndef META_EXTTEXTOUT
-  #define META_EXTTEXTOUT            0x0a32
-#endif
-#ifndef META_SETDIBTODEV
-  #define META_SETDIBTODEV           0x0d33
-#endif
-#ifndef META_SELECTPALETTE
-  #define META_SELECTPALETTE         0x0234
-#endif
-#ifndef META_REALIZEPALETTE
-  #define META_REALIZEPALETTE        0x0035
-#endif
-#ifndef META_ANIMATEPALETTE
-  #define META_ANIMATEPALETTE        0x0436
-#endif
-#ifndef META_SETPALENTRIES
-  #define META_SETPALENTRIES         0x0037
-#endif
-#ifndef META_POLYPOLYGON
-  #define META_POLYPOLYGON           0x0538
-#endif
-#ifndef META_RESIZEPALETTE
-  #define META_RESIZEPALETTE         0x0139
-#endif
-
-#ifndef META_DIBBITBLT
-  #define META_DIBBITBLT             0x0940
-#endif
-#ifndef META_DIBSTRETCHBLT
-  #define META_DIBSTRETCHBLT         0x0b41
-#endif
-#ifndef META_DIBCREATEPATTERNBRUSH
-  #define META_DIBCREATEPATTERNBRUSH 0x0142
-#endif
-#ifndef META_STRETCHDIB
-  #define META_STRETCHDIB            0x0f43
-#endif
-
-#ifndef META_EXTFLOODFILL
-  #define META_EXTFLOODFILL          0x0548
-#endif
-
-#ifndef META_RESETDC
-  #define META_RESETDC               0x014C
-#endif
-#ifndef META_STARTDOC
-  #define META_STARTDOC              0x014D
-#endif
-#ifndef META_STARTPAGE
-  #define META_STARTPAGE             0x004F
-#endif
-#ifndef META_ENDPAGE
-  #define META_ENDPAGE               0x0050
-#endif
-#ifndef META_ABORTDOC
-  #define META_ABORTDOC              0x0052
-#endif
-#ifndef META_ENDDOC
-  #define META_ENDDOC                0x005E
-#endif
-
-#ifndef META_DELETEOBJECT
-  #define META_DELETEOBJECT          0x01f0
-#endif
-
-#ifndef META_CREATEPALETTE
-  #define META_CREATEPALETTE         0x00f7
-#endif
-#ifndef META_CREATEBRUSH
-  #define META_CREATEBRUSH           0x00F8
-#endif
-#ifndef META_CREATEPATTERNBRUSH
-  #define META_CREATEPATTERNBRUSH    0x01F9
-#endif
-#ifndef META_CREATEPENINDIRECT
-  #define META_CREATEPENINDIRECT     0x02FA
-#endif
-#ifndef META_CREATEFONTINDIRECT
-  #define META_CREATEFONTINDIRECT    0x02FB
-#endif
-#ifndef META_CREATEBRUSHINDIRECT
-  #define META_CREATEBRUSHINDIRECT   0x02FC
-#endif
-#ifndef META_CREATEBITMAPINDIRECT
-  #define META_CREATEBITMAPINDIRECT  0x02FD
-#endif
-#ifndef META_CREATEBITMAP
-  #define META_CREATEBITMAP          0x06FE
-#endif
-#ifndef META_CREATEREGION
-  #define META_CREATEREGION          0x06FF
-#endif
-
-/* Background Modes */
-#ifndef TRANSPARENT
-  #define TRANSPARENT     1
-#endif
-#ifndef OPAQUE
-  #define OPAQUE          2
-#endif
-
-/* Pen Styles */
-#ifndef PS_SOLID
-  #define PS_SOLID        0
-#endif
-#ifndef PS_DASH
-  #define PS_DASH         1
-#endif
-#ifndef PS_DOT
-  #define PS_DOT          2
-#endif
-#ifndef PS_DASHDOT
-  #define PS_DASHDOT      3
-#endif
-#ifndef PS_DASHDOTDOT
-  #define PS_DASHDOTDOT   4
-#endif
-#ifndef PS_NULL
-  #define PS_NULL         5
-#endif
-#ifndef PS_INSIDEFRAME
-  #define PS_INSIDEFRAME  6
-#endif
-
-/* PitchAndFamily family values (high 4 bits) */
-#ifndef FF_DONTCARE
-  #define FF_DONTCARE         0x00
-#endif
-#ifndef FF_ROMAN
-  #define FF_ROMAN            0x10
-#endif
-#ifndef FF_SWISS
-  #define FF_SWISS            0x20
-#endif
-#ifndef FF_MODERN
-  #define FF_MODERN           0x30
-#endif
-#ifndef FF_SCRIPT
-  #define FF_SCRIPT           0x40
-#endif
-#ifndef FF_DECORATIVE
-  #define FF_DECORATIVE       0x50
-#endif
-
-/* Brush Styles */
-#ifndef BS_SOLID
-  #define BS_SOLID        0
-#endif
-#ifndef BS_NULL
-  #define BS_NULL         1
-#endif
-#ifndef BS_HOLLOW
-  #define BS_HOLLOW       BS_NULL
-#endif
-#ifndef BS_HATCHED
-  #define BS_HATCHED      2
-#endif
-#ifndef BS_PATTERN
-  #define BS_PATTERN      3
-#endif
-#ifndef BS_INDEXED
-  #define BS_INDEXED      4
-#endif
-#ifndef BS_DIBPATTERN
-  #define BS_DIBPATTERN   5
-#endif
-
-/* Hatch Styles */
-#ifndef HS_HORIZONTAL
-  #define HS_HORIZONTAL       0
-#endif
-#ifndef HS_VERTICAL
-  #define HS_VERTICAL         1
-#endif
-#ifndef HS_FDIAGONAL
-  #define HS_FDIAGONAL        2
-#endif
-#ifndef HS_BDIAGONAL
-  #define HS_BDIAGONAL        3
-#endif
-#ifndef HS_CROSS
-  #define HS_CROSS            4
-#endif
-#ifndef HS_DIAGCROSS
-  #define HS_DIAGCROSS        5
-#endif
-
-class WXDLLIMPEXP_OGL wxMetaRecord: public wxObject
-{
-  public:
-  int metaFunction;
-  long param1;
-  long param2;
-  long param3;
-  long param4;
-  long param5;
-  long param6;
-  long param7;
-  long param8;
-  wxChar *stringParam;
-  wxRealPoint *points;
-
-  wxMetaRecord(int fun)
-  {
-    metaFunction = fun; points = NULL; stringParam = NULL;
-    param1 = 0;
-  }
-  ~wxMetaRecord(void);
-};
-
-class WXDLLIMPEXP_OGL wxXMetaFile: public wxObject
-{
- public:
-  double lastX;
-  double lastY;
-  bool ok;
-
-  double left;
-  double top;
-  double right;
-  double bottom;
-
-  wxList metaRecords;
-  wxList gdiObjects; // List of wxMetaRecord objects created with Create...,
-                     // referenced by position in list by SelectObject
-  wxXMetaFile(const wxChar* file = NULL);
-  ~wxXMetaFile(void);
-
-  // After this is called, the metafile cannot be used for anything
-  // since it is now owned by the clipboard.
-  bool SetClipboard(int width = 0, int height = 0);
-
-  bool Play(wxDC *dc);
-  inline bool Ok(void) const { return ok; }
-  bool ReadFile(const wxChar *file);
-};
-
-#endif
- // _MFUTILS_H_
diff --git a/contrib/include/wx/ogl/misc.h b/contrib/include/wx/ogl/misc.h
deleted file mode 100644
index 37eec85595..0000000000
--- a/contrib/include/wx/ogl/misc.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        misc.h
-// Purpose:     Miscellaneous utilities for OGL
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_MISC_H_
-#define _OGL_MISC_H_
-
-
-// List to use when copying objects; may need to associate elements of new objects
-// with elements of old objects, e.g. when copying constraint.s
-extern wxList oglObjectCopyMapping;
-
-/*
- * TEXT FORMATTING FUNCTIONS
- *
- */
-
-// Centres the given list of wxShapeTextLine strings in the given box
-// (changing the positions in situ). Doesn't actually draw into the DC.
-WXDLLIMPEXP_OGL void oglCentreText(wxDC& dc, wxList *text, double m_xpos, double m_ypos,
-                double width, double height,
-                int formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
-
-// Given a string, returns a list of strings that fit within the given
-// width of box. Height is ignored.
-WXDLLIMPEXP_OGL wxStringList* oglFormatText(wxDC& dc, const wxString& text, double width, double height, int formatMode = 0);
-
-// Centres the list of wxShapeTextLine strings, doesn't clip.
-// Doesn't actually draw into the DC.
-WXDLLIMPEXP_OGL void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
-                              double m_xpos, double m_ypos, double width, double height);
-
-// Gets the maximum width and height of the given list of wxShapeTextLines.
-WXDLLIMPEXP_OGL void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
-                              double m_xpos, double m_ypos, double width, double height,
-                              double *actual_width, double *actual_height);
-
-// Actually draw the preformatted list of wxShapeTextLines.
-WXDLLIMPEXP_OGL void oglDrawFormattedText(wxDC& context, wxList *text_list,
-                       double m_xpos, double m_ypos, double width, double height,
-                       int formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
-
-// Give it a list of points, finds the centre.
-WXDLLIMPEXP_OGL void oglFindPolylineCentroid(wxList *points, double *x, double *y);
-
-WXDLLIMPEXP_OGL void oglCheckLineIntersection(double x1, double y1, double x2, double y2,
-                             double x3, double y3, double x4, double y4,
-                             double *ratio1, double *ratio2);
-
-WXDLLIMPEXP_OGL void oglFindEndForPolyline(double n, double xvec[], double yvec[],
-                           double x1, double y1, double x2, double y2, double *x3, double *y3);
-
-
-WXDLLIMPEXP_OGL void oglFindEndForBox(double width, double height,
-                      double x1, double y1,         // Centre of box (possibly)
-                      double x2, double y2,         // other end of line
-                      double *x3, double *y3);      // End on box edge
-
-WXDLLIMPEXP_OGL void oglFindEndForCircle(double radius,
-                         double x1, double y1,  // Centre of circle
-                         double x2, double y2,  // Other end of line
-                         double *x3, double *y3);
-
-WXDLLIMPEXP_OGL void oglGetArrowPoints(double x1, double y1, double x2, double y2,
-                      double length, double width,
-                      double *tip_x, double *tip_y,
-                      double *side1_x, double *side1_y,
-                      double *side2_x, double *side2_y);
-
-/*
- * Given an ellipse and endpoints of a line, returns the point at which
- * the line touches the ellipse in values x4, y4.
- * This function assumes that the centre of the ellipse is at x1, y1, and the
- * ellipse has a width of a1 and a height of b1. It also assumes you are
- * wanting to draw an arc FROM point x2, y2 TOWARDS point x3, y3.
- * This function calculates the x,y coordinates of the intersection point of
- * the arc with the ellipse.
- * Author: Ian Harrison
- */
-
-WXDLLIMPEXP_OGL void oglDrawArcToEllipse(double x1, double y1, double a1, double b1, double x2, double y2, double x3, double y3,
-  double *x4, double *y4);
-
-WXDLLIMPEXP_OGL bool oglRoughlyEqual(double val1, double val2, double tol = 0.00001);
-
-extern wxFont*          g_oglNormalFont;
-extern wxPen*           g_oglBlackPen;
-extern wxPen*           g_oglWhiteBackgroundPen;
-extern wxPen*           g_oglTransparentPen;
-extern wxBrush*         g_oglWhiteBackgroundBrush;
-extern wxPen*           g_oglBlackForegroundPen;
-
-WXDLLIMPEXP_OGL wxFont*          oglMatchFont(int point_size);
-
-WXDLLIMPEXP_OGL wxString         oglColourToHex(const wxColour& colour);
-WXDLLIMPEXP_OGL wxColour         oglHexToColour(const wxString& hex);
-WXDLLIMPEXP_OGL void             oglDecToHex(unsigned int dec, char *buf);
-WXDLLIMPEXP_OGL unsigned int     oglHexToDec(char* buf);
-
-
-#endif
- // _OGL_MISC_H_
diff --git a/contrib/include/wx/ogl/ogl.h b/contrib/include/wx/ogl/ogl.h
deleted file mode 100644
index 14ef4cb9fe..0000000000
--- a/contrib/include/wx/ogl/ogl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        ogl.h
-// Purpose:     OGL main include
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_OGL_H_
-#define _OGL_OGL_H_
-
-#ifdef WXMAKINGDLL_OGL
-    #define WXDLLIMPEXP_OGL WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_OGL WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_OGL
-#endif
-
-
-#include "wx/ogl/basic.h"      // Basic shapes
-#include "wx/ogl/basicp.h"
-#include "wx/ogl/lines.h"      // Lines and splines
-#include "wx/ogl/linesp.h"
-#include "wx/ogl/divided.h"    // Vertically-divided rectangle
-#include "wx/ogl/composit.h"   // Composite images
-#include "wx/ogl/canvas.h"     // wxShapeCanvas for displaying objects
-#include "wx/ogl/ogldiag.h"    // wxDiagram
-
-#include "wx/ogl/bmpshape.h"
-#include "wx/ogl/constrnt.h"
-#include "wx/ogl/drawn.h"
-#include "wx/ogl/drawnp.h"
-#include "wx/ogl/mfutils.h"
-#include "wx/ogl/misc.h"
-
-// TODO: replace with wxModule implementation
-extern WXDLLIMPEXP_OGL void wxOGLInitialize();
-extern WXDLLIMPEXP_OGL void wxOGLCleanUp();
-
-#endif
- // _OGL_OGL_H_
diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h
deleted file mode 100644
index ee0b249a4e..0000000000
--- a/contrib/include/wx/ogl/ogldiag.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        ogldiag.h
-// Purpose:     OGL - wxDiagram class
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGL_OGLDIAG_H_
-#define _OGL_OGLDIAG_H_
-
-#include "wx/ogl/basic.h"
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-
-class WXDLLIMPEXP_OGL wxDiagram: public wxObject
-{
- DECLARE_DYNAMIC_CLASS(wxDiagram)
-
-public:
-
-  wxDiagram();
-  virtual ~wxDiagram();
-
-  void SetCanvas(wxShapeCanvas *can);
-
-  inline wxShapeCanvas *GetCanvas() const { return m_diagramCanvas; }
-
-  virtual void Redraw(wxDC& dc);
-  virtual void Clear(wxDC& dc);
-  virtual void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
-
-  // Add object to end of object list (if addAfter is NULL)
-  // or just after addAfter.
-  virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
-
-  // Add object to front of object list
-  virtual void InsertShape(wxShape *object);
-
-  void SetSnapToGrid(bool snap);
-  void SetGridSpacing(double spacing);
-  inline double GetGridSpacing() const { return m_gridSpacing; }
-  inline bool GetSnapToGrid() const { return m_snapToGrid; }
-  void Snap(double *x, double *y);
-
-  inline void SetQuickEditMode(bool qem) { m_quickEditMode = qem; }
-  inline bool GetQuickEditMode() const { return m_quickEditMode; }
-
-  virtual void RemoveShape(wxShape *object);
-  virtual void RemoveAllShapes();
-  virtual void DeleteAllShapes();
-  virtual void ShowAll(bool show);
-
-  // Find a shape by its id
-  wxShape* FindShape(long id) const;
-
-  inline void SetMouseTolerance(int tol) { m_mouseTolerance = tol; }
-  inline int GetMouseTolerance() const { return m_mouseTolerance; }
-  inline wxList *GetShapeList() const { return m_shapeList; }
-  inline int GetCount() const { return m_shapeList->GetCount(); }
-
-  // Make sure all text that should be centred, is centred.
-  void RecentreAll(wxDC& dc);
-
-#if wxUSE_PROLOGIO
-  virtual bool SaveFile(const wxString& filename);
-  virtual bool LoadFile(const wxString& filename);
-
-  virtual void ReadNodes(wxExprDatabase& database);
-  virtual void ReadLines(wxExprDatabase& database);
-  virtual void ReadContainerGeometry(wxExprDatabase& database);
-
-  // Allow for modifying file
-  virtual bool OnDatabaseLoad(wxExprDatabase& db);
-  virtual bool OnDatabaseSave(wxExprDatabase& db);
-  virtual bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-  virtual bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-  virtual bool OnHeaderSave(wxExprDatabase& db, wxExpr& expr);
-  virtual bool OnHeaderLoad(wxExprDatabase& db, wxExpr& expr);
-#endif
-
-protected:
-  wxShapeCanvas*        m_diagramCanvas;
-  bool                  m_quickEditMode;
-  bool                  m_snapToGrid;
-  double                m_gridSpacing;
-  int                   m_mouseTolerance;
-  wxList*               m_shapeList;
-};
-
-class WXDLLIMPEXP_OGL wxLineCrossing: public wxObject
-{
-public:
-    wxLineCrossing() { m_lineShape1 = NULL; m_lineShape2 = NULL; }
-    wxRealPoint     m_pt1; // First line
-    wxRealPoint     m_pt2;
-    wxRealPoint     m_pt3; // Second line
-    wxRealPoint     m_pt4;
-    wxRealPoint     m_intersect;
-    wxLineShape*    m_lineShape1;
-    wxLineShape*    m_lineShape2;
-};
-
-class WXDLLIMPEXP_OGL wxLineCrossings: public wxObject
-{
-public:
-    wxLineCrossings();
-    ~wxLineCrossings();
-
-    void FindCrossings(wxDiagram& diagram);
-    void DrawCrossings(wxDiagram& diagram, wxDC& dc);
-    void ClearCrossings();
-
-public:
-    wxList  m_crossings;
-};
-
-#endif
- // _OGL_OGLDIAG_H_
diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
deleted file mode 100644
index b2d59d7e26..0000000000
--- a/contrib/include/wx/plot/plot.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        plot.h
-// Purpose:     wxPlotWindow
-// Author:      Robert Roebling
-// Modified by:
-// Created:     12/1/2000
-// Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PLOT_H_
-#define _WX_PLOT_H_
-
-#include "wx/defs.h"
-
-#include "wx/dynarray.h"
-#include "wx/event.h"
-#include "wx/pen.h"
-#include "wx/scrolwin.h"
-
-#ifdef WXMAKINGDLL_PLOT
-    #define WXDLLIMPEXP_PLOT WXEXPORT
-    #define WXDLLIMPEXP_DATA_PLOT(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_PLOT WXIMPORT
-    #define WXDLLIMPEXP_DATA_PLOT(type) WXIMPORT type
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_PLOT
-    #define WXDLLIMPEXP_DATA_PLOT(type) type
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotEvent;
-class WXDLLIMPEXP_PLOT wxPlotCurve;
-class WXDLLIMPEXP_PLOT wxPlotValues;
-class WXDLLIMPEXP_PLOT wxPlotArea;
-class WXDLLIMPEXP_PLOT wxPlotXAxisArea;
-class WXDLLIMPEXP_PLOT wxPlotYAxisArea;
-class WXDLLIMPEXP_PLOT wxPlotWindow;
-class WXDLLIMPEXP_CORE wxStaticText;
-
-//-----------------------------------------------------------------------------
-// consts
-//-----------------------------------------------------------------------------
-
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  941)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 921)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 922)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 923)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 924)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 925)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 926)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 927)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 928)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 929)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 930)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 931)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 932)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 933)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_X_LABEL_EDIT, 934)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_X_LABEL_EDIT, 935)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, 936)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_Y_LABEL_EDIT, 937)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 938)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 939)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 940)
-END_DECLARE_EVENT_TYPES()
-
-#define wxPLOT_X_AXIS          0x0004
-#define wxPLOT_Y_AXIS          0x0008
-#define wxPLOT_BUTTON_MOVE     0x0010
-#define wxPLOT_BUTTON_ZOOM     0x0020
-#define wxPLOT_BUTTON_ENLARGE  0x0040
-
-#define wxPLOT_BUTTON_ALL  (wxPLOT_BUTTON_MOVE|wxPLOT_BUTTON_ZOOM|wxPLOT_BUTTON_ENLARGE)
-#define wxPLOT_DEFAULT     (wxPLOT_X_AXIS|wxPLOT_Y_AXIS | wxPLOT_BUTTON_ALL)
-
-//-----------------------------------------------------------------------------
-// wxPlotEvent
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotEvent: public wxNotifyEvent
-{
-public:
-    wxPlotEvent( wxEventType commandType = wxEVT_NULL, int id = 0 );
-
-    wxPlotCurve *GetCurve()
-        { return m_curve; }
-    void SetCurve( wxPlotCurve *curve )
-        { m_curve = curve; }
-
-    double GetZoom()
-        { return m_zoom; }
-    void SetZoom( double zoom )
-        { m_zoom = zoom; }
-
-    wxInt32 GetPosition()
-        { return m_position; }
-    void SetPosition( wxInt32 pos )
-        { m_position = pos; }
-
-private:
-    wxPlotCurve   *m_curve;
-    double         m_zoom;
-    wxInt32        m_position;
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotCurve
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotCurve: public wxObject
-{
-public:
-    wxPlotCurve( int offsetY, double startY, double endY );
-
-    virtual wxInt32 GetStartX() = 0;
-    virtual wxInt32 GetEndX() = 0;
-
-    virtual double GetY( wxInt32 x ) = 0;
-
-    void SetStartY( double startY )
-        { m_startY = startY; }
-    double GetStartY() const
-        { return m_startY; }
-    void SetEndY( double endY )
-        { m_endY = endY; }
-    double GetEndY() const
-        { return m_endY; }
-    void SetOffsetY( int offsetY )
-       { m_offsetY = offsetY; }
-    int GetOffsetY() const
-       { return m_offsetY; }
-
-    void SetPenNormal( const wxPen &pen )
-       { m_penNormal = pen; }
-    void SetPenSelected( const wxPen &pen )
-       { m_penSelected = pen; }
-
-    const wxPen& GetPenNormal() const
-       { return m_penNormal; }
-    const wxPen& GetPenSelected() const
-       { return m_penSelected; }
-
-private:
-    int     m_offsetY;
-    double  m_startY;
-    double  m_endY;
-    wxPen   m_penNormal;
-    wxPen   m_penSelected;
-
-    DECLARE_ABSTRACT_CLASS(wxPlotCurve)
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotOnOffCurve
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotOnOff
-{
-public:
-    wxPlotOnOff() { }
-
-    wxInt32   m_on;
-    wxInt32   m_off;
-    void     *m_clientData;
-};
-
-WX_DECLARE_OBJARRAY_WITH_DECL(wxPlotOnOff, wxArrayPlotOnOff,
-                              class WXDLLIMPEXP_PLOT);
-
-class WXDLLIMPEXP_PLOT wxPlotOnOffCurve: public wxObject
-{
-public:
-    wxPlotOnOffCurve( int offsetY );
-
-    wxInt32 GetStartX()
-        { return m_minX; }
-    wxInt32 GetEndX()
-        { return m_maxX; }
-
-    void SetOffsetY( int offsetY )
-       { m_offsetY = offsetY; }
-    int GetOffsetY()
-       { return m_offsetY; }
-
-    void Add( wxInt32 on, wxInt32 off, void *clientData = NULL );
-    size_t GetCount();
-
-    wxInt32 GetOn( size_t index );
-    wxInt32 GetOff( size_t index );
-    void* GetClientData( size_t index );
-    wxPlotOnOff *GetAt( size_t index );
-
-    virtual void DrawOnLine( wxDC &dc, wxCoord y, wxCoord start, wxCoord end, void *clientData );
-    virtual void DrawOffLine( wxDC &dc, wxCoord y, wxCoord start, wxCoord end );
-
-private:
-    int               m_offsetY;
-    wxInt32           m_minX;
-    wxInt32           m_maxX;
-
-    wxArrayPlotOnOff   m_marks;
-
-    DECLARE_CLASS(wxPlotOnOffCurve)
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotArea
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotArea: public wxWindow
-{
-public:
-    wxPlotArea() {}
-    wxPlotArea( wxPlotWindow *parent );
-
-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-
-    void DrawCurve( wxDC *dc, wxPlotCurve *curve, int from = -1, int to = -1 );
-    void DrawOnOffCurve( wxDC *dc, wxPlotOnOffCurve *curve, int from = -1, int to = -1 );
-    void DeleteCurve( wxPlotCurve *curve, int from = -1, int to = -1 );
-
-    virtual void ScrollWindow( int dx, int dy, const wxRect *rect );
-
-private:
-    wxPlotWindow     *m_owner;
-    bool              m_zooming;
-
-    DECLARE_CLASS(wxPlotArea)
-    DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotXAxisArea
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotXAxisArea: public wxWindow
-{
-public:
-    wxPlotXAxisArea() {}
-    wxPlotXAxisArea( wxPlotWindow *parent );
-
-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-
-private:
-    wxPlotWindow   *m_owner;
-
-    DECLARE_CLASS(wxPlotXAxisArea)
-    DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotYAxisArea
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotYAxisArea: public wxWindow
-{
-public:
-    wxPlotYAxisArea() {}
-    wxPlotYAxisArea( wxPlotWindow *parent );
-
-    void OnPaint( wxPaintEvent &event );
-    void OnMouse( wxMouseEvent &event );
-
-private:
-    wxPlotWindow   *m_owner;
-
-    DECLARE_CLASS(wxPlotYAxisArea)
-    DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxPlotWindow
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_PLOT wxPlotWindow: public wxScrolledWindow
-{
-public:
-    wxPlotWindow() {}
-    wxPlotWindow(wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int flags = wxPLOT_DEFAULT);
-    ~wxPlotWindow();
-
-    // curve accessors
-    // ---------------
-
-    void Add( wxPlotCurve *curve );
-    void Delete( wxPlotCurve* curve );
-
-    size_t GetCount();
-    wxPlotCurve *GetAt( size_t n );
-
-    void SetCurrentCurve( wxPlotCurve* current );
-    wxPlotCurve *GetCurrentCurve();
-
-    // mark list accessors
-    // -------------------
-
-    void Add( wxPlotOnOffCurve *curve );
-    void Delete( wxPlotOnOffCurve* curve );
-
-    size_t GetOnOffCurveCount();
-    wxPlotOnOffCurve *GetOnOffCurveAt( size_t n );
-
-    // vertical representation
-    // -----------------------
-
-    void Move( wxPlotCurve* curve, int pixels_up );
-    void Enlarge( wxPlotCurve *curve, double factor );
-
-    // horizontal representation
-    // -------------------------
-
-    void SetUnitsPerValue( double upv );
-    double GetUnitsPerValue()
-        { return m_xUnitsPerValue; }
-
-    void SetZoom( double zoom );
-    double GetZoom()
-        { return m_xZoom; }
-
-    // options
-    // -------
-
-    void SetScrollOnThumbRelease( bool scrollOnThumbRelease = true )
-        { m_scrollOnThumbRelease = scrollOnThumbRelease; }
-    bool GetScrollOnThumbRelease()
-        { return m_scrollOnThumbRelease; }
-
-    void SetEnlargeAroundWindowCentre( bool enlargeAroundWindowCentre = true )
-        { m_enlargeAroundWindowCentre = enlargeAroundWindowCentre; }
-    bool GetEnlargeAroundWindowCentre()
-        { return m_enlargeAroundWindowCentre; }
-
-    // events (may be overridden)
-    // --------------------------
-
-    void OnMoveUp( wxCommandEvent& event );
-    void OnMoveDown( wxCommandEvent& event );
-
-    void OnEnlarge( wxCommandEvent& event );
-    void OnShrink( wxCommandEvent& event );
-    void OnZoomIn( wxCommandEvent& event );
-    void OnZoomOut( wxCommandEvent& event );
-
-    void OnScroll2( wxScrollWinEvent& event );
-
-    // utilities
-    // ---------
-
-    void RedrawEverything();
-    void RedrawXAxis();
-    void RedrawYAxis();
-
-    void ResetScrollbar();
-
-    void AddChartTitle( const wxString&, wxFont = *wxNORMAL_FONT, wxColour = *wxBLACK );
-
-private:
-    friend class wxPlotArea;
-    friend class wxPlotXAxisArea;
-    friend class wxPlotYAxisArea;
-
-    double             m_xUnitsPerValue;
-    double             m_xZoom;
-
-    wxList             m_curves;
-    wxList             m_onOffCurves;
-
-    wxPlotArea        *m_area;
-    wxPlotXAxisArea   *m_xaxis;
-    wxPlotYAxisArea   *m_yaxis;
-    wxPlotCurve       *m_current;
-
-    bool               m_scrollOnThumbRelease;
-    bool               m_enlargeAroundWindowCentre;
-
-    wxString           m_title;
-    wxFont             m_titleFont;
-    wxColour           m_titleColour;
-    wxStaticText*      m_titleStaticText;
-    wxBoxSizer*        m_plotAndTitleSizer;
-
-    void DrawChartTitle();
-
-    DECLARE_CLASS(wxPlotWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// plot event macros
-// ----------------------------------------------------------------------------
-
-typedef void (wxEvtHandler::*wxPlotEventFunction)(wxPlotEvent&);
-
-#if WXWIN_COMPATIBILITY_EVENT_TYPES
-
-#define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_CLICKED(id, fn) { wxEVT_PLOT_CLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_DOUBLECLICKED(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_ZOOM_IN(id, fn) { wxEVT_PLOT_ZOOM_IN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_ZOOM_OUT(id, fn) { wxEVT_PLOT_ZOOM_OUT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CREATING(id, fn) { wxEVT_PLOT_AREA_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CREATED(id, fn) { wxEVT_PLOT_AREA_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-#define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
-
-#else
-
-#define EVT_PLOT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_CLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_DOUBLECLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_DOUBLECLICKED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_ZOOM_IN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_IN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_ZOOM_OUT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_ZOOM_OUT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_VALUE_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CREATING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CREATED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CREATED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_AREA_SEL_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_X_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_Y_LABEL_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_BEGIN_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_PLOT_END_TITLE_EDIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_PLOT_END_TITLE_EDIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction)  wxStaticCastEvent( wxPlotEventFunction, & fn ), (wxObject *) NULL ),
-
-#endif
-
-#endif
-   // _WX_PLOT_H_
diff --git a/contrib/include/wx/plot/plot_dwn.bmp b/contrib/include/wx/plot/plot_dwn.bmp
deleted file mode 100644
index 3d2c04fe5d..0000000000
Binary files a/contrib/include/wx/plot/plot_dwn.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_dwn.xpm b/contrib/include/wx/plot/plot_dwn.xpm
deleted file mode 100644
index 51a59d3f16..0000000000
--- a/contrib/include/wx/plot/plot_dwn.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *plot_dwn_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 18 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@@@@@@@@@@",
-".@.@.@@@@@@@@@@@@@@@",
-"@@.@@@@@@@@  @@@@@@@",
-"@@.@@@@++++o +++@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@@@+ +@@@@@@@",
-"@@.@@@@@@@@+@@@@@@@@",
-"@@.@@....@@@@@@@@@@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@@O...O@@@",
-"@@.@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/plot_enl.bmp b/contrib/include/wx/plot/plot_enl.bmp
deleted file mode 100644
index 840f2958e1..0000000000
Binary files a/contrib/include/wx/plot/plot_enl.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_enl.xpm b/contrib/include/wx/plot/plot_enl.xpm
deleted file mode 100644
index 7e48e2c138..0000000000
--- a/contrib/include/wx/plot/plot_enl.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *plot_enl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 20 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@+@@@@@@@@",
-".@.@.@@@@@+ +@@@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@++++o +++@@@@",
-"@@.@@....@@  @@@@@@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@@O...O@@@",
-"@@.@@@@@@@@  @@@@@@@",
-"@@.@@@@++++o +++@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@@@+ +@@@@@@@",
-"@@@@@@@@@@@+@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/plot_shr.bmp b/contrib/include/wx/plot/plot_shr.bmp
deleted file mode 100644
index 7b4f3cfccb..0000000000
Binary files a/contrib/include/wx/plot/plot_shr.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_shr.xpm b/contrib/include/wx/plot/plot_shr.xpm
deleted file mode 100644
index 0918938095..0000000000
--- a/contrib/include/wx/plot/plot_shr.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *plot_shr_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 20 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@  @@@@@@@",
-".@.@.@@++++o +++@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@@@+ +@@@@@@@",
-"@@.@@....@@+@@@@@@@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@+O...O@@@",
-"@@.@@@@@@@+ +@@@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@++++o +++@@@@",
-"@@.@@@@@@@@  @@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/plot_up.bmp b/contrib/include/wx/plot/plot_up.bmp
deleted file mode 100644
index 96b0be6ef7..0000000000
Binary files a/contrib/include/wx/plot/plot_up.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_up.xpm b/contrib/include/wx/plot/plot_up.xpm
deleted file mode 100644
index cafdb0b07b..0000000000
--- a/contrib/include/wx/plot/plot_up.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *plot_up_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 18 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@@@@@@@@@@",
-".@.@.@@@@@@@@@@@@@@@",
-"@@.@@@@@@@@+@@@@@@@@",
-"@@.@@@@@@@+ +@@@@@@@",
-"@@.@@@@@@+ o +@@@@@@",
-"@@.@@@@@+ ooo +@@@@@",
-"@@.@@@@@   o   @@@@@",
-"@@.@@@@++++o +++@@@@",
-"@@.@@@@@@@@  @@@@@@@",
-"@@.@@....@@@@@@@@@@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@@O...O@@@",
-"@@.@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/plot_zin.bmp b/contrib/include/wx/plot/plot_zin.bmp
deleted file mode 100644
index 6df6ffeff2..0000000000
Binary files a/contrib/include/wx/plot/plot_zin.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_zin.xpm b/contrib/include/wx/plot/plot_zin.xpm
deleted file mode 100644
index 27aabe85df..0000000000
--- a/contrib/include/wx/plot/plot_zin.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *plot_zin_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 18 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@@@@@@@@@@",
-".@.@.@@@@+@@@@+@@@@@",
-"@@.@@@@+ +@@@@+ +@@@",
-"@@.@@@+  +@@@@+  +@@",
-"@@.@@+ o +@@@@+ o +@",
-"@@.@+ oooo @@ oooo +",
-"@@.@@+ o   @@   o +@",
-"@@.@@@+  +@@@@+  +@@",
-"@@.@@@@+ +@@@@+ +@@@",
-"@@.@@....+@@@@+@@@@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@@O...O@@@",
-"@@.@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/plot_zot.bmp b/contrib/include/wx/plot/plot_zot.bmp
deleted file mode 100644
index dbe24799d0..0000000000
Binary files a/contrib/include/wx/plot/plot_zot.bmp and /dev/null differ
diff --git a/contrib/include/wx/plot/plot_zot.xpm b/contrib/include/wx/plot/plot_zot.xpm
deleted file mode 100644
index d3a34d141f..0000000000
--- a/contrib/include/wx/plot/plot_zot.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char *plot_zot_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 18 8 1",
-"  c Gray0",
-". c #000084",
-"X c Blue",
-"o c Green",
-"O c #848484",
-"+ c #c6c6c6",
-"@ c None",
-"# c Gray100",
-/* pixels */
-"@@.@@@@@@@@@@@@@@@@@",
-"@...@@@@@@@@@@@@@@@@",
-".@.@.@+@@@@@@@@@@+@@",
-"@@.@@@+ +@@@@@@+ +@@",
-"@@.@@@+  +@@@@+  +@@",
-"@@.@@@+ o +@@+ o +@@",
-"@@.@@ oooo ++ oooo @",
-"@@.@@   o +@@+ o   @",
-"@@.@@@+  +@@@@+  +@@",
-"@@.@@@+ +@@@@@@+ +@@",
-"@@.@@....@@@@@@@@+@@",
-"@@.@.O@@@.O@@@@@@@@@",
-"@@.O.@@@@@.@@@@@@@.@",
-"@@..@@@@@@@.@@@@@.O@",
-"@@.@@@@@@@@O.@@@.O@@",
-"@@.@@@@@@@@@O...O@@@",
-"@@.@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-};
diff --git a/contrib/include/wx/plot/wxplot.rc b/contrib/include/wx/plot/wxplot.rc
deleted file mode 100644
index e53398c433..0000000000
--- a/contrib/include/wx/plot/wxplot.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-// For /plot.cpp
-plot_up_bmp             BITMAP  "wx/plot/plot_up.bmp"
-plot_dwn_bmp            BITMAP  "wx/plot/plot_dwn.bmp"
-plot_enl_bmp            BITMAP  "wx/plot/plot_enl.bmp"
-plot_shr_bmp            BITMAP  "wx/plot/plot_shr.bmp"
-plot_zin_bmp            BITMAP  "wx/plot/plot_zin.bmp"
-plot_zot_bmp            BITMAP  "wx/plot/plot_zot.bmp"
diff --git a/contrib/samples/applet/about.html b/contrib/samples/applet/about.html
deleted file mode 100644
index bd24a4363c..0000000000
--- a/contrib/samples/applet/about.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head><title>Scitech Display Doctor</title></head>
-<body>
-
-<BODY BGCOLOR="#FFFFFF" >
-<center><IMG SRC="biglogo.bmp"></center>
-<hr>
-</body>
-</html>
-
diff --git a/contrib/samples/applet/applet.cpp b/contrib/samples/applet/applet.cpp
deleted file mode 100644
index 16fb1fb66c..0000000000
--- a/contrib/samples/applet/applet.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet sample program
-*
-****************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/wx.h"
-#include "wx/applet/window.h"
-#include "applet.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-// Define the event tables for handling application frame events
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(Minimal_Quit,      MyFrame::OnQuit)
-    EVT_MENU(Minimal_About,     MyFrame::OnAbout)
-    EVT_MENU(Minimal_Back,      MyFrame::OnBack)
-    EVT_MENU(Minimal_Forward,   MyFrame::OnForward)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWindows to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-/*------------------------- Implementation --------------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-title   - Title for the frame window
-pos     - Position to place to frame window
-size    - Size of the frame window
-
-REMARKS:
-Application frame window constructor
-****************************************************************************/
-MyFrame::MyFrame(
-    const wxString& title,
-    const wxPoint& pos,
-    const wxSize& size)
-    : wxFrame(NULL, -1, title, pos, size)
-{
-    // Create a menu bar
-    wxMenu *menuFile = new wxMenu;
-    wxMenu *menuNav = new wxMenu;
-    menuFile->Append(Minimal_Quit, "E&xit");
-    menuNav->Append(Minimal_Back, "Go &back");
-    menuNav->Append(Minimal_Forward, "Go &forward");
-
-    // Now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuNav, "&Navigate");
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-    CreateStatusBar(2);
-
-    // Create the HTML window
-    html = new wxHtmlAppletWindow(this);
-    html->SetRelatedFrame(this, "wxApplet Demo: '%s'");
-    html->SetRelatedStatusBar(1);
-    html->LoadPage("index.html");
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Exit' menu item
-****************************************************************************/
-void MyFrame::OnQuit(
-    wxCommandEvent&)
-{
-    // TRUE is to force the frame to close
-    Close(TRUE);
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'About' menu item
-****************************************************************************/
-void MyFrame::OnAbout(
-    wxCommandEvent&)
-{
-    // TODO: Bring up and about html page!
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Go back' menu item
-****************************************************************************/
-void MyFrame::OnBack(
-    wxCommandEvent&)
-{
-    if (!html -> HistoryBack())
-        wxMessageBox("You reached prehistory era!");
-}
-
-/****************************************************************************
-REMARKS:
-Event handler for the 'Go forward' menu item
-****************************************************************************/
-void MyFrame::OnForward(
-    wxCommandEvent&)
-{
-    if (!html -> HistoryForward())
-        wxMessageBox("No more items in history!");
-}
-
-/****************************************************************************
-REMARKS:
-`Main program' equivalent: the program execution "starts" here
-****************************************************************************/
-bool MyApp::OnInit()
-{
-    // Create the main application window
-    MyFrame *frame = new MyFrame("wxApplet testing application",
-        wxPoint(50, 50), wxSize(640, 480));
-
-    // Show it and tell the application that it's our main window
-    frame->Show(TRUE);
-    SetTopWindow(frame);
-
-    // Success: wxApp::OnRun() will be called to run the application
-    return TRUE;
-}
-
diff --git a/contrib/samples/applet/applet.h b/contrib/samples/applet/applet.h
deleted file mode 100644
index cd5cd9a1d3..0000000000
--- a/contrib/samples/applet/applet.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet sample program header file
-*
-****************************************************************************/
-
-#ifndef __SAMPLE_H
-
-/*------------------------------ Constants --------------------------------*/
-
-enum {
-    // Menu items
-    Minimal_Quit = 1,
-    Minimal_About,
-    Minimal_Back,
-    Minimal_Forward,
-
-    // Controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
-    };
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Define a new application type, each program should derive a class from wxApp
-****************************************************************************/
-class MyApp : public wxApp {
-public:
-    // Initialise the application on startup
-    virtual bool OnInit();
-    };
-
-/****************************************************************************
-REMARKS:
-Define a new frame type: this is going to be our main frame
-****************************************************************************/
-class MyFrame : public wxFrame {
-private:
-    DECLARE_EVENT_TABLE()       // Declare event table
-    wxHtmlAppletWindow *html;   // Pointer to the html applet window
-
-public:
-            // Constructor
-            MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-
-            // Event handlers
-            void OnQuit(wxCommandEvent& event);
-            void OnAbout(wxCommandEvent& event);
-            void OnBack(wxCommandEvent& event);
-            void OnForward(wxCommandEvent& event);
-    };
-
-#endif  // __SAMPLE_H
-
diff --git a/contrib/samples/applet/applet.rc b/contrib/samples/applet/applet.rc
deleted file mode 100644
index 82bdf07561..0000000000
--- a/contrib/samples/applet/applet.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/applet/combobox.cpp b/contrib/samples/applet/combobox.cpp
deleted file mode 100644
index 4214c41c0f..0000000000
--- a/contrib/samples/applet/combobox.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Combobox wrapper. This file implements the custom
-*               combo boxes used for this sample program.
-*
-****************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/wx.h"
-#include "combobox.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-ComboBox::ComboBox(
-    wxWindow *parent,
-    int listid,
-    int textid)
-    : m_Parent(parent), m_ListBoxId(listid), m_TextCtrlId(textid)
-{
-    m_ListBox  = wxDynamicCast(m_Parent->FindWindow(listid),wxListBox);
-    m_TextCtrl = wxDynamicCast(m_Parent->FindWindow(textid),wxTextCtrl);
-}
-
-int ComboBox::GetListBoxId()
-{
-    return m_ListBoxId;
-}
-
-int ComboBox::GetSelection()
-{
-    return m_ListBox->GetSelection();
-}
-
-wxString ComboBox::GetStringSelection()
-{
-    return m_ListBox->GetStringSelection();
-}
-
-bool ComboBox::SetStringSelection(const wxString& s, bool select)
-{
-    select = TRUE;
-    select = m_ListBox->SetStringSelection(s, select);
-    m_TextCtrl->SetValue(GetStringSelection());
-    return select;
-}
-
-void ComboBox::Select(int n)
-{
-    m_ListBox->Select(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Deselect(int n)
-{
-    m_ListBox->Deselect(n);
-}
-
-void ComboBox::Insert(const wxString& item, int pos)
-{
-    m_ListBox->Insert(item,pos);
-}
-
-void ComboBox::Insert(const wxString& item, int pos, void *clientData)
-{
-    m_ListBox->Insert(item, pos, clientData);
-}
-
-void ComboBox::Insert(const wxString& item, int pos, wxClientData *clientData)
-{
-    m_ListBox->Insert(item, pos, clientData);
-}
-
-void ComboBox::InsertItems(int nItems, const wxString *items, int pos)
-{
-    m_ListBox->InsertItems(nItems, items, pos);
-}
-
-void ComboBox::InsertItems(const wxArrayString& items, int pos)
-{
-    m_ListBox->InsertItems(items, pos);
-}
-
-void ComboBox::Set(int n, const wxString* items, void **clientData)
-{
-    m_ListBox->Set(n, items, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Set(const wxArrayString& items, void **clientData)
-{
-    m_ListBox->Set(items, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-int ComboBox::FindString(const wxString &s)
-{
-    return (m_ListBox->FindString(s));
-}
-
-void ComboBox::SetFirstItem(int n)
-{
-    m_ListBox->SetFirstItem(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::SetFirstItem(const wxString &s)
-{
-    m_ListBox->SetFirstItem(s);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString &item)
-{
-    m_ListBox->Append(item);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString& item, void *clientData)
-{
-    m_ListBox->Append(item, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Append(const wxString& item, wxClientData *clientData)
-{
-    m_ListBox->Append(item, clientData);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Clear()
-{
-    m_ListBox->Clear();
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::Delete(int n)
-{
-    m_ListBox->Delete(n);
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
-void ComboBox::OnChange(wxCommandEvent &)
-{
-    m_TextCtrl->SetValue(GetStringSelection());
-}
-
diff --git a/contrib/samples/applet/combobox.h b/contrib/samples/applet/combobox.h
deleted file mode 100644
index 3592cae3fe..0000000000
--- a/contrib/samples/applet/combobox.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Combobox wrapper. This header file defines the custom
-*               combo boxes used for this sample program.
-*
-****************************************************************************/
-
-#ifndef __COMBOBOX_H
-#define __COMBOBOX_H
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Defines a Custom ComboBox. This combobox is a portable implementation of
-the msw combobox control. It is made of the wxWindows textctrl primitive and
-the listbox primitive. This object does not create or display the controls,
-it provides the relationship and underlying behavior layer for the primitives
-allready created via wxDesigner.
-****************************************************************************/
-class ComboBox {
-private:
-    int         m_ListBoxId;
-    int         m_TextCtrlId;
-    wxWindow    *m_Parent;
-    wxListBox   *m_ListBox;
-    wxTextCtrl  *m_TextCtrl;
-
-public:
-            // Constructor
-            ComboBox(wxWindow *parent, int,int);
-
-            // Returns the id of the listbox: listBoxId.
-            int GetListBoxId();
-
-            // Inserts: Used to insert items into the listbox
-            void Insert(const wxString& item, int pos);
-            void Insert(const wxString& item, int pos, void *clientData);
-            void Insert(const wxString& item, int pos, wxClientData *clientData);
-            void InsertItems(int nItems, const wxString *items, int pos);
-            void InsertItems(const wxArrayString& items, int pos);
-
-            // Sets: Used to set items in the combo box
-            void Set(int n, const wxString* items, void **clientData );
-            void Set(const wxArrayString& items, void **clientData);
-            int FindString(const wxString &s);
-
-            // Selections: Used to get/de/select items in the listbox
-            void Select(int n);
-            void Deselect(int n);
-            int GetSelection();
-            wxString GetStringSelection();
-            bool SetStringSelection(const wxString& s, bool select);
-
-            // Set the specified item at the first visible item or scroll to max
-            // range.
-            void SetFirstItem(int n);
-            void SetFirstItem(const wxString& s);
-
-            // Append items to the listbox
-            void Append(const wxString& item);
-            void Append(const wxString& item, void *clientData);
-            void Append(const wxString& item, wxClientData *clientData);
-
-            // Deleting items from the list box
-            void Clear();
-            void Delete(int n);
-
-            // OnChange event function (called from SDD dialog box code, see: dialog.h) Mimic
-            // msw combobox behavior: Click on listbox item it shows in textbox.
-            void OnChange(wxCommandEvent &event);
-    };
-
-#endif  // __COMBOBOX_H
-
diff --git a/contrib/samples/applet/dialogs.wdr b/contrib/samples/applet/dialogs.wdr
deleted file mode 100644
index 275276f2ff..0000000000
Binary files a/contrib/samples/applet/dialogs.wdr and /dev/null differ
diff --git a/contrib/samples/applet/dialogs_wdr.cpp b/contrib/samples/applet/dialogs_wdr.cpp
deleted file mode 100644
index e3efc40e9f..0000000000
--- a/contrib/samples/applet/dialogs_wdr.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//------------------------------------------------------------------------------
-// Source code generated by wxDesigner from file: dialogs.wdr
-// Do not modify this file, all changes will be lost!
-//------------------------------------------------------------------------------
-
-// For compilers that support precompilation
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// Include private header
-#include "dialogs_wdr.h"
-
-
-// Implement window functions
-
-wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit, bool set_sizer )
-{
-    wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
-
-    wxSizer *item1 = new wxFlexGridSizer( 2, 0, 0 );
-
-    wxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item3 = new wxStaticText( parent, ID_TEXT_MANUFACTURER, "Manufacturer:", wxDefaultPosition, wxSize(180,-1), 0 );
-    item3->SetForegroundColour( *wxBLACK );
-    item3->SetBackgroundColour( *wxWHITE );
-    item2->Add( item3, 0, wxALIGN_CENTRE, 5 );
-
-    item2->Add( 10, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item5 = new wxStaticText( parent, ID_TEXT_MODEL, "Model:", wxDefaultPosition, wxSize(250,-1), 0 );
-    item5->SetForegroundColour( *wxBLACK );
-    item5->SetBackgroundColour( *wxWHITE );
-    item4->Add( item5, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxTextCtrl *item7 = new wxTextCtrl( parent, ID_TEXTCTRL_MFTR, "", wxDefaultPosition, wxSize(190,-1), wxTE_READONLY );
-    item7->SetForegroundColour( *wxBLACK );
-    item7->SetBackgroundColour( *wxWHITE );
-    item6->Add( item7, 0, wxALIGN_CENTRE, 5 );
-
-    item6->Add( 15, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item6, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item8 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxTextCtrl *item9 = new wxTextCtrl( parent, ID_TEXTCTRL_MDL, "", wxDefaultPosition, wxSize(260,-1), wxTE_READONLY );
-    item8->Add( item9, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item8, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item10 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxString *strs11 = (wxString*) NULL;
-    wxListBox *item11 = new wxListBox( parent, ID_LISTBOX_MFTR, wxDefaultPosition, wxSize(190,150), 0, strs11, wxLB_SORT|wxLB_ALWAYS_SB );
-    item10->Add( item11, 0, wxALIGN_CENTRE, 5 );
-
-    item10->Add( 15, 20, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item10, 0, wxALIGN_CENTRE, 5 );
-
-    wxSizer *item12 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxString *strs13 = (wxString*) NULL;
-    wxListBox *item13 = new wxListBox( parent, ID_LISTBOX_MDL, wxDefaultPosition, wxSize(260,150), 0, strs13, wxLB_SORT|wxLB_NEEDED_SB );
-    item13->SetForegroundColour( *wxBLACK );
-    item13->SetBackgroundColour( *wxWHITE );
-    item12->Add( item13, 0, wxALIGN_CENTRE, 5 );
-
-    item1->Add( item12, 0, wxALIGN_CENTRE, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTRE, 15 );
-
-    if (set_sizer)
-    {
-        parent->SetAutoLayout( TRUE );
-        parent->SetSizer( item0 );
-        if (call_fit)
-        {
-            item0->Fit( parent );
-            item0->SetSizeHints( parent );
-        }
-    }
-    
-    return item0;
-}
-
-// Implement bitmap functions
-
-
-// End of generated file
diff --git a/contrib/samples/applet/dialogs_wdr.h b/contrib/samples/applet/dialogs_wdr.h
deleted file mode 100644
index 45a13e7cbe..0000000000
--- a/contrib/samples/applet/dialogs_wdr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-// Header generated by wxDesigner from file: dialogs.wdr
-// Do not modify this file, all changes will be lost!
-//------------------------------------------------------------------------------
-
-#ifndef __WDR_dialogs_H__
-#define __WDR_dialogs_H__
-
-// Include wxWindows' headers
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-#include "wx/statline.h"
-#include "wx/spinbutt.h"
-#include "wx/spinctrl.h"
-#include "wx/splitter.h"
-#include "wx/listctrl.h"
-#include "wx/treectrl.h"
-#include "wx/notebook.h"
-
-// Declare window functions
-
-#define ID_TEXT_MANUFACTURER 10000
-#define ID_TEXT_MODEL 10001
-#define ID_TEXTCTRL_MFTR 10
-#define ID_TEXTCTRL_MDL 20
-#define ID_LISTBOX_MFTR 11
-#define ID_LISTBOX_MDL 21
-wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit = true, bool set_sizer = true );
-
-// Declare bitmap functions
-
-#endif
-
-// End of generated file
diff --git a/contrib/samples/applet/index.html b/contrib/samples/applet/index.html
deleted file mode 100644
index fcadda705e..0000000000
--- a/contrib/samples/applet/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head><title>Widgets demo</title></head>
-<body text="#000000" bgcolor="#D0D0D0">
-
-<h3>wxHtmlWidgetCell demonstration</h3>
-
-There is an embedded window somewhere around. Enjoy it.
-
-<A HREF="about.html">About...</A>
-
-<insert "wxChipsetName">
-
-<hr>
-<center>
-<embed applet="MonitorApplet" width=100 height=100>
-</center>
-<hr>
-
-</body>
-</html>
-
diff --git a/contrib/samples/applet/monitorapplet.cpp b/contrib/samples/applet/monitorapplet.cpp
deleted file mode 100644
index 12964d3f17..0000000000
--- a/contrib/samples/applet/monitorapplet.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet class implementation
-*
-****************************************************************************/
-
-// For compilers that support precompilation
-#include "wx/wxprec.h"
-
-// Include private headers
-#include "wx/wx.h"
-#include "monitorapplet.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(MonitorApplet, wxApplet)
-
-// Event handler table.
-BEGIN_EVENT_TABLE(MonitorApplet, wxApplet)
-    EVT_LISTBOX(ID_LISTBOX_MFTR,        MonitorApplet::OnChange)
-    EVT_LISTBOX(ID_LISTBOX_MDL,         MonitorApplet::OnChange)
-END_EVENT_TABLE()
-
-// Include database of known monitors. Normally this would come from a
-// real database on disk, but for this simple example we hard code all
-// the values into a table.
-#include "monitors.c"
-
-/*------------------------- Implementation --------------------------------*/
-
-/****************************************************************************
-REMARKS:
-Constructor called during dynamic creation. Simple initialise all
-internal values for the class so that it can be properly created later
-via the virtual Create member function.
-****************************************************************************/
-MonitorApplet::MonitorApplet()
-{
-    m_Mfr = NULL;
-    m_Model = NULL;
-    m_Data = NULL;
-}
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the MonitorApplet class.
-****************************************************************************/
-bool MonitorApplet::Create(
-    wxHtmlAppletWindow *parent,
-    const wxSize& size,
-    long style)
-{
-    bool ret = wxApplet::Create(parent, size, style);
-    if (ret) {
-        // Read our cookie or create it if it does not exist
-        if ((m_Data = (MonitorData*)parent->FindCookie(MONITOR_COOKIE_NAME)) == NULL) {
-            m_Data = new MonitorData;
-            memset(&m_Data->m_Monitor,0,sizeof(m_Data->m_Monitor));
-            parent->RegisterCookie(MONITOR_COOKIE_NAME,m_Data);
-            }
-
-        // Create all the controls and initialise them
-        MonitorDialogFunc(this,true,true);
-        if ((m_Mfr = new ComboBox(this , ID_LISTBOX_MFTR, ID_TEXTCTRL_MFTR)) == NULL)
-            return false;
-        if ((m_Model = new ComboBox(this , ID_LISTBOX_MDL, ID_TEXTCTRL_MDL)) == NULL)
-            return false;
-        ReadMfrList();
-        ReadModelList(true);
-        }
-    return ret;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the MonitorApplet class.
-****************************************************************************/
-MonitorApplet::~MonitorApplet()
-{
-    delete m_Mfr;
-    delete m_Model;
-}
-
-/****************************************************************************
-REMARKS:
-Save the current state for the applet to our cookie
-****************************************************************************/
-void MonitorApplet::SaveCurrentState()
-{
-    // Read currently selected strings into cookie
-    strcpy(m_Data->m_Monitor.m_Mfr,m_Mfr->GetStringSelection());
-    strcpy(m_Data->m_Monitor.m_Model,m_Model->GetStringSelection());
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via an HTML link
-****************************************************************************/
-void MonitorApplet::OnLinkClicked(
-    const wxHtmlLinkInfo&)
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via the history forward command
-****************************************************************************/
-void MonitorApplet::OnHistoryForward()
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles user navigation away from the applet via the history back command
-****************************************************************************/
-void MonitorApplet::OnHistoryBack()
-{
-    SaveCurrentState();
-}
-
-/****************************************************************************
-REMARKS:
-Handles inter applet communication messages
-****************************************************************************/
-void MonitorApplet::OnMessage(
-    wxEvent& msg)
-{
-    msg.Skip(true);
-}
-
-/****************************************************************************
-REMARKS:
-****************************************************************************/
-void MonitorApplet::OnChange(
-    wxCommandEvent &evt)
-{
-    if (evt.GetId() == m_Mfr->GetListBoxId()) {
-        m_Mfr->OnChange(evt);
-        ReadModelList(true);
-        }
-    else if (evt.GetId() == m_Model->GetListBoxId()) {
-        m_Model->OnChange(evt);
-        }
-}
-
-/****************************************************************************
-REMARKS:
-Updates the manufacturer list for the dialog box from the database.
-****************************************************************************/
-void MonitorApplet::ReadMfrList()
-{
-    char            buf[80] = "";
-    int             i,selected = 0;
-    MonitorEntry    *m;
-
-    m_Mfr->Clear();
-    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
-        if (wxStricmp(buf,m->m_Mfr) != 0) {
-            m_Mfr->Append(m->m_Mfr);
-            if (wxStricmp(m_Data->m_Monitor.m_Mfr,m->m_Mfr) == 0)
-                selected = i;
-            strcpy(buf,m->m_Mfr);
-            i++;
-            }
-        }
-    m_Mfr->Select(selected);
-}
-
-/****************************************************************************
-REMARKS:
-Updates the model list for the dialog box for the currently selected
-manufacturer type.
-****************************************************************************/
-void MonitorApplet::ReadModelList(
-    bool selectCurrent)
-{
-    int             i,selected = 0;
-    MonitorEntry    *m;
-    wxString        mfrStr;
-
-    mfrStr = m_Mfr->GetStringSelection();
-    m_Model->Clear();
-    for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) {
-        if (wxStricmp(mfrStr,m->m_Mfr) == 0) {
-            m_Model->Append(m->m_Model);
-            if (selectCurrent && wxStricmp(m_Data->m_Monitor.m_Model,m->m_Model) == 0)
-                selected = i;
-            i++;
-            }
-        }
-    m_Model->Select(selected);
-}
-
diff --git a/contrib/samples/applet/monitorapplet.h b/contrib/samples/applet/monitorapplet.h
deleted file mode 100644
index 0ab778ab4a..0000000000
--- a/contrib/samples/applet/monitorapplet.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Header file for the MonitorApplet class
-*
-****************************************************************************/
-
-#ifndef __WX_MONITORAPPLET_H
-#define __WX_MONITORAPPLET_H
-
-#include "wx/applet/applet.h"
-#include "combobox.h"
-#include "dialogs_wdr.h"
-
-/*--------------------------- Class Definitions ---------------------------*/
-
-/****************************************************************************
-REMARKS:
-Structure defining the simple monitor database records.
-****************************************************************************/
-struct MonitorEntry {
-    char    m_Mfr[60];
-    char    m_Model[60];
-    };
-
-/****************************************************************************
-REMARKS:
-Defines our wxMonitorData cookie object that is stored to maintain state
-information for this MonitorApplet.
-****************************************************************************/
-class MonitorData : public wxObject {
-public:
-    MonitorEntry    m_Monitor;
-    };
-
-// Name used to track the monitor data cookie
-#define MONITOR_COOKIE_NAME "MonitorData"
-
-/****************************************************************************
-REMARKS:
-Defines our wxMonitor applet class
-****************************************************************************/
-class MonitorApplet : public wxApplet {
-private:
-    DECLARE_DYNAMIC_CLASS(MonitorApplet);
-    DECLARE_EVENT_TABLE();
-
-protected:
-    ComboBox            *m_Mfr;
-    ComboBox            *m_Model;
-    MonitorData         *m_Data;
-    static MonitorEntry m_Monitors[];
-
-            // Flush the current state to a cookie
-            void SaveCurrentState();
-
-public:
-            // Constructor (called during dynamic creation)
-            MonitorApplet();
-
-            // Psuedo virtual constructor
-    virtual bool Create(
-                wxHtmlAppletWindow *parent,
-                const wxSize& size,
-                long style);
-
-            // Virtual destructor
-    virtual ~MonitorApplet();
-
-            // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-
-            // Handle HTML navigation forward command in applet
-    virtual void OnHistoryForward();
-
-            // Handle HTML navigation back command in applet
-    virtual void OnHistoryBack();
-
-            // Handle messages from the wxAppletManager and other applets
-    virtual void OnMessage(wxEvent& msg);
-
-            // Update the model and menufacturer lists
-            void ReadMfrList();
-            void ReadModelList(bool selectCurrent);
-
-            // Event handlers
-            void OnChange(wxCommandEvent &event);
-    };
-
-#endif // __WX_MONITORAPPLET_H
-
diff --git a/contrib/samples/applet/monitors.c b/contrib/samples/applet/monitors.c
deleted file mode 100644
index 1d7c793fda..0000000000
--- a/contrib/samples/applet/monitors.c
+++ /dev/null
@@ -1,3572 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Small database of known monitor names
-*
-****************************************************************************/
-
-MonitorEntry MonitorApplet::m_Monitors[] = {
-    {"(Fixed frequency monitor types)","Fixed Frequency  800x600"},
-    {"(Fixed frequency monitor types)","Fixed Frequency 1024x768"},
-    {"(Fixed frequency monitor types)","Fixed Frequency 1152x864"},
-    {"(Fixed frequency monitor types)","Fixed Frequency 1280x1024"},
-    {"(Standard monitor types)","Laptop Display Panel ( 640x480)"},
-    {"(Standard monitor types)","Laptop Display Panel ( 800x600)"},
-    {"(Standard monitor types)","Laptop Display Panel (1024x768)"},
-    {"(Standard monitor types)","Plug and Play Monitor (VESA DDC)"},
-    {"(Standard monitor types)","Standard VGA 640x480"},
-    {"(Standard monitor types)","Super VGA  800x600"},
-    {"(Standard monitor types)","Super VGA 1024x768"},
-    {"(Standard monitor types)","Super VGA 1280x1024"},
-    {"(Standard monitor types)","Super VGA 1600x1200"},
-    {"Aamazing Technologies, Inc.","Aamazing CM-8426"},
-    {"Aamazing Technologies, Inc.","Aamazing MS-8431"},
-    {"Acer","Acer 11D"},
-    {"Acer","Acer 1455"},
-    {"Acer","Acer 1555"},
-    {"Acer","Acer 211c"},
-    {"Acer","Acer 33D"},
-    {"Acer","Acer 33DL"},
-    {"Acer","Acer 34e"},
-    {"Acer","Acer 34T"},
-    {"Acer","Acer 34TL"},
-    {"Acer","Acer 35c"},
-    {"Acer","Acer 54e"},
-    {"Acer","Acer 54es"},
-    {"Acer","Acer 55"},
-    {"Acer","Acer 55c"},
-    {"Acer","Acer 55e"},
-    {"Acer","Acer 55L"},
-    {"Acer","Acer 56c"},
-    {"Acer","Acer 56e"},
-    {"Acer","Acer 56i"},
-    {"Acer","Acer 56is"},
-    {"Acer","Acer 56j"},
-    {"Acer","Acer 56L"},
-    {"Acer","Acer 57c"},
-    {"Acer","Acer 57e"},
-    {"Acer","Acer 57i"},
-    {"Acer","Acer 58c"},
-    {"Acer","Acer 76c"},
-    {"Acer","Acer 76e"},
-    {"Acer","Acer 76i"},
-    {"Acer","Acer 76ie"},
-    {"Acer","Acer 76j"},
-    {"Acer","Acer 76N"},
-    {"Acer","Acer 76sl"},
-    {"Acer","Acer 77c"},
-    {"Acer","Acer 77e"},
-    {"Acer","Acer 78c"},
-    {"Acer","Acer 78i"},
-    {"Acer","Acer 78ie"},
-    {"Acer","Acer 79g"},
-    {"Acer","Acer 98i"},
-    {"Acer","Acer 99c"},
-    {"Acer","Acer 99sl"},
-    {"Acer","Acer F51"},
-    {"Acer","Acer FP350"},
-    {"Acer","Acer FP501"},
-    {"Acer","Acer FP503"},
-    {"Acer","Acer FP550"},
-    {"Acer","Acer FP551"},
-    {"Acer","Acer FP551-0"},
-    {"Acer","Acer FP555"},
-    {"Acer","Acer FP558"},
-    {"Acer","Acer FP750"},
-    {"Acer","Acer FP855"},
-    {"Acer","Acer G772"},
-    {"Acer","Acer G781"},
-    {"Acer","Acer G991"},
-    {"Acer","Acer P791"},
-    {"Acer","Acer P911"},
-    {"Acer","Acer V981"},
-    {"Acer","AcerView 11D"},
-    {"Acer","AcerView 15P"},
-    {"Acer","AcerView 211c"},
-    {"Acer","AcerView 33"},
-    {"Acer","AcerView 33D"},
-    {"Acer","AcerView 33DL"},
-    {"Acer","AcerView 34e"},
-    {"Acer","AcerView 34T"},
-    {"Acer","AcerView 34TL"},
-    {"Acer","AcerView 35"},
-    {"Acer","AcerView 35c"},
-    {"Acer","AcerView 54e"},
-    {"Acer","AcerView 54es"},
-    {"Acer","AcerView 55"},
-    {"Acer","AcerView 55c"},
-    {"Acer","AcerView 55e"},
-    {"Acer","AcerView 55L"},
-    {"Acer","AcerView 56c"},
-    {"Acer","AcerView 56e"},
-    {"Acer","AcerView 56i"},
-    {"Acer","AcerView 56is"},
-    {"Acer","AcerView 56j"},
-    {"Acer","AcerView 56L"},
-    {"Acer","AcerView 57i"},
-    {"Acer","AcerView 7015"},
-    {"Acer","AcerView 7133s"},
-    {"Acer","AcerView 7134e"},
-    {"Acer","AcerView 7134s"},
-    {"Acer","AcerView 7154e"},
-    {"Acer","AcerView 7154s"},
-    {"Acer","AcerView 7156e"},
-    {"Acer","AcerView 7156i"},
-    {"Acer","AcerView 7156is"},
-    {"Acer","AcerView 7156s"},
-    {"Acer","AcerView 7176ie"},
-    {"Acer","AcerView 7176is"},
-    {"Acer","AcerView 7178ie"},
-    {"Acer","AcerView 76c"},
-    {"Acer","AcerView 76e"},
-    {"Acer","AcerView 76i"},
-    {"Acer","AcerView 76ie"},
-    {"Acer","AcerView 76j"},
-    {"Acer","AcerView 76N"},
-    {"Acer","AcerView 76sl"},
-    {"Acer","AcerView 77c"},
-    {"Acer","AcerView 77e"},
-    {"Acer","AcerView 78c"},
-    {"Acer","AcerView 78i"},
-    {"Acer","AcerView 78ie"},
-    {"Acer","AcerView 79g"},
-    {"Acer","AcerView 98i"},
-    {"Acer","AcerView 99c"},
-    {"Acer","AcerView 99sl"},
-    {"Acer","AcerView F31"},
-    {"Acer","AcerView F31e"},
-    {"Acer","AcerView F50p"},
-    {"Acer","AcerView F51"},
-    {"Acer","Aspire 33s"},
-    {"Acer","Aspire 34Ts"},
-    {"Acer","Aspire 54s"},
-    {"Acer","Aspire 55s"},
-    {"Acer","Aspire 56s"},
-    {"Acer","Aspire 76is"},
-    {"Acer","Aspire 77is"},
-    {"Acer","Aspire 77s"},
-    {"Action Systems, Inc.","Action Monitor CA-1454"},
-    {"Action Systems, Inc.","Action Monitor CA-1570"},
-    {"Action Systems, Inc.","Action Monitor CH-1999"},
-    {"Action Systems, Inc.","Action Monitor CK-1566"},
-    {"Action Systems, Inc.","Action Monitor CK-4148"},
-    {"Action Systems, Inc.","Action Monitor CK-4158"},
-    {"Action Systems, Inc.","Action Monitor CL-1566"},
-    {"Action Systems, Inc.","Action Monitor CL-1570"},
-    {"Action Systems, Inc.","Action Monitor CL-1766"},
-    {"Action Systems, Inc.","Action Monitor CL-1770"},
-    {"Action Systems, Inc.","Action Monitor CL-1792"},
-    {"Action Systems, Inc.","Action Monitor CL-1999"},
-    {"Action Systems, Inc.","Action Monitor CX-1566"},
-    {"Action Systems, Inc.","Action Monitor CX-4158"},
-    {"Action Systems, Inc.","AXION LCD Monitor LA-1560U"},
-    {"Actix Systems, Inc.","Actix Systems CX1557"},
-    {"Adara Technology, Inc.","Adara Technology AML-1402"},
-    {"Adara Technology, Inc.","Adara Technology AML-2001"},
-    {"ADI Corporation.","ADI Duo"},
-    {"ADI Corporation.","ADI MicroScan 17"},
-    {"ADI Corporation.","ADI MicroScan 17X"},
-    {"ADI Corporation.","ADI MicroScan 17X+"},
-    {"ADI Corporation.","ADI MicroScan 3V"},
-    {"ADI Corporation.","ADI MicroScan 4P/4P+"},
-    {"ADI Corporation.","ADI MicroScan 4V"},
-    {"ADI Corporation.","ADI MicroScan 5G"},
-    {"ADI Corporation.","ADI MicroScan 5L"},
-    {"ADI Corporation.","ADI MicroScan 5P/5P+"},
-    {"ADI Corporation.","ADI MicroScan 5T"},
-    {"ADI Corporation.","ADI MicroScan 5V"},
-    {"ADI Corporation.","ADI MicroScan 5V+"},
-    {"ADI Corporation.","ADI MicroScan 6G"},
-    {"ADI Corporation.","ADI MicroScan 6L"},
-    {"ADI Corporation.","ADI MicroScan 6P"},
-    {"ADI Corporation.","ADI MicroScan G55"},
-    {"ADI Corporation.","ADI MicroScan G56"},
-    {"ADI Corporation.","ADI MicroScan G60"},
-    {"ADI Corporation.","ADI MicroScan G66"},
-    {"ADI Corporation.","ADI MicroScan G70"},
-    {"ADI Corporation.","ADI MicroScan P40"},
-    {"ADI Corporation.","ADI MicroScan P50"},
-    {"ADI Corporation.","ADI MicroScan P55"},
-    {"ADI Corporation.","ADI ProVista 14"},
-    {"ADI Corporation.","ADI ProVista E30"},
-    {"ADI Corporation.","ADI ProVista E33"},
-    {"ADI Corporation.","ADI ProVista E35"},
-    {"ADI Corporation.","ADI ProVista E40"},
-    {"ADI Corporation.","ADI ProVista E44"},
-    {"ADI Corporation.","ADI ProVista E55"},
-    {"ADI Corporation.","ADI ProVista E66"},
-    {"ADI Corporation.","ADI ProVista V30"},
-    {"ADI Systems, Inc.","ADI DMC-2304"},
-    {"ADI Systems, Inc.","ADI Duo"},
-    {"ADI Systems, Inc.","ADI MicroScan 17"},
-    {"ADI Systems, Inc.","ADI MicroScan 17X"},
-    {"ADI Systems, Inc.","ADI MicroScan 17X+"},
-    {"ADI Systems, Inc.","ADI MicroScan 2E"},
-    {"ADI Systems, Inc.","ADI MicroScan 3E"},
-    {"ADI Systems, Inc.","ADI MicroScan 3E+"},
-    {"ADI Systems, Inc.","ADI MicroScan 3V"},
-    {"ADI Systems, Inc.","ADI MicroScan 4A"},
-    {"ADI Systems, Inc.","ADI MicroScan 4G"},
-    {"ADI Systems, Inc.","ADI MicroScan 4GP"},
-    {"ADI Systems, Inc.","ADI MicroScan 4P/4P+"},
-    {"ADI Systems, Inc.","ADI MicroScan 4V"},
-    {"ADI Systems, Inc.","ADI MicroScan 5AP"},
-    {"ADI Systems, Inc.","ADI MicroScan 5EP"},
-    {"ADI Systems, Inc.","ADI MicroScan 5G"},
-    {"ADI Systems, Inc.","ADI MicroScan 5L"},
-    {"ADI Systems, Inc.","ADI MicroScan 5P/5P+"},
-    {"ADI Systems, Inc.","ADI MicroScan 5T"},
-    {"ADI Systems, Inc.","ADI MicroScan 5V"},
-    {"ADI Systems, Inc.","ADI MicroScan 5V+"},
-    {"ADI Systems, Inc.","ADI MicroScan 6G"},
-    {"ADI Systems, Inc.","ADI MicroScan 6L"},
-    {"ADI Systems, Inc.","ADI MicroScan 6P"},
-    {"ADI Systems, Inc.","ADI MicroScan G55"},
-    {"ADI Systems, Inc.","ADI MicroScan G56"},
-    {"ADI Systems, Inc.","ADI MicroScan G60"},
-    {"ADI Systems, Inc.","ADI MicroScan G66"},
-    {"ADI Systems, Inc.","ADI MicroScan G70"},
-    {"ADI Systems, Inc.","ADI MicroScan P40"},
-    {"ADI Systems, Inc.","ADI MicroScan P50"},
-    {"ADI Systems, Inc.","ADI MicroScan P55"},
-    {"ADI Systems, Inc.","ADI ProVista 14"},
-    {"ADI Systems, Inc.","ADI ProVista E30"},
-    {"ADI Systems, Inc.","ADI ProVista E33"},
-    {"ADI Systems, Inc.","ADI ProVista E35"},
-    {"ADI Systems, Inc.","ADI ProVista E40"},
-    {"ADI Systems, Inc.","ADI ProVista E44"},
-    {"ADI Systems, Inc.","ADI ProVista E55"},
-    {"ADI Systems, Inc.","ADI ProVista E66"},
-    {"Alpha","Alpha Data ACM-17"},
-    {"Alpha","Alpha Data ACM-215"},
-    {"Alpha","Alpha Data ACM-217"},
-    {"Alpha","Alpha Data ACM-217S"},
-    {"Alpha","Alpha Data ACM-317"},
-    {"AOC International (Europe) Gmbh","AOC Spectrum 7Vlr,7VlrA,7Vlr+ & 7VlrA+"},
-    {"AOC International (Europe) Gmbh","AOC Spectrum 9Glr,9GlrA,9Glrs & 9GlrsA"},
-    {"AOC International (U.S.A.), Ltd.","AOC CM-324"},
-    {"AOC International (U.S.A.), Ltd.","AOC CM-325"},
-    {"AOC International (U.S.A.), Ltd.","AOC CM-326"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 4V,4VA,4Vlr & 4VlrA, 4Vn, 4VnA"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 5Glr"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 5Nlr"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 5Vlr & 5VlrA"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 7DlrA"},
-    {"AOC International (U.S.A.), Ltd.","AOC SPECTRUM 7Nlr"},
-    {"Apple Computer, Inc.","AppleVision 850/850AV"},
-    {"AST","AST Sabre"},
-    {"AST","ASTVision 20H"},
-    {"AST","ASTVision 4I"},
-    {"AST","ASTVision 4L"},
-    {"AST","ASTVision 4N"},
-    {"AST","ASTVision 4V"},
-    {"AST","ASTVision 5E"},
-    {"AST","ASTVision 5L"},
-    {"AST","ASTVision 5U"},
-    {"AST","ASTVision 5V"},
-    {"AST","ASTVision 7H"},
-    {"AST","ASTVision 7L"},
-    {"AST","ASTVision 7P"},
-    {"AST","ASTVision 7U"},
-    {"AT&T","AT&T 14 in. Color Economy"},
-    {"AT&T","AT&T 14 in. Color Value"},
-    {"AT&T","AT&T 14 in. Color Value - Low Radiation"},
-    {"AT&T","AT&T 14 in. Mono"},
-    {"AT&T","AT&T 15 in. Color"},
-    {"AT&T","AT&T 17 in. Color Professional"},
-    {"AT&T","AT&T 17 in. Color Value"},
-    {"AT&T","AT&T CRT-365"},
-    {"AT&T","AT&T CRT-395"},
-    {"Bridge Information Co.,Ltd","Bridge BM17C"},
-    {"Bus Computer Systems","Bus Computer Systems Bus_VGA"},
-    {"Carabel","Carabel Data System AV-14CRT"},
-    {"Carabel","Carabel Data System AV-17CRT"},
-    {"Carabel","Carabel Data System AV-21CRT"},
-    {"Carroll Touch","Carroll Touch CT1381A"},
-    {"Colorgraphic Communications Corp.","Colorgraphic EG2040"},
-    {"COMPAQ","COMPAQ 1024"},
-    {"COMPAQ","COMPAQ 140"},
-    {"COMPAQ","COMPAQ 150"},
-    {"COMPAQ","COMPAQ 151FS"},
-    {"COMPAQ","COMPAQ 171FS"},
-    {"COMPAQ","COMPAQ 172"},
-    {"COMPAQ","COMPAQ Advanced Graphics"},
-    {"COMPAQ","COMPAQ Internal VGA Panel"},
-    {"COMPAQ","COMPAQ P110 Color Monitor"},
-    {"COMPAQ","COMPAQ P1100 Color Monitor"},
-    {"COMPAQ","COMPAQ P1610 Color Monitor"},
-    {"COMPAQ","COMPAQ P50 Color Monitor"},
-    {"COMPAQ","COMPAQ P70 Color Monitor"},
-    {"COMPAQ","COMPAQ P700 Color Monitor"},
-    {"COMPAQ","COMPAQ P75 Color Monitor"},
-    {"COMPAQ","COMPAQ P900 Color Monitor"},
-    {"COMPAQ","COMPAQ Presario 140"},
-    {"COMPAQ","COMPAQ Presario 150"},
-    {"COMPAQ","COMPAQ Presario Integrated Monitor"},
-    {"COMPAQ","COMPAQ Presario MV400 Color Monitor"},
-    {"COMPAQ","COMPAQ Presario MV500 Color Monitor"},
-    {"COMPAQ","COMPAQ Presario MV700 Color Monitor"},
-    {"COMPAQ","COMPAQ QVision 150"},
-    {"COMPAQ","COMPAQ QVision 170"},
-    {"COMPAQ","COMPAQ QVision 172"},
-    {"COMPAQ","COMPAQ QVision 200"},
-    {"COMPAQ","COMPAQ QVision 210"},
-    {"COMPAQ","COMPAQ S410c Color Monitor"},
-    {"COMPAQ","COMPAQ S500 Color Monitor"},
-    {"COMPAQ","COMPAQ S510 Color Monitor"},
-    {"COMPAQ","COMPAQ S700 Color Monitor"},
-    {"COMPAQ","COMPAQ S710 Color Monitor"},
-    {"COMPAQ","COMPAQ S900 Color Monitor"},
-    {"COMPAQ","COMPAQ S910 Color Monitor"},
-    {"COMPAQ","COMPAQ SVGA"},
-    {"COMPAQ","COMPAQ TFT450 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT500 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT5000 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT5000S Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT5004/TFT5005 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT5010 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT7000 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT8000 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT8010 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ TFT8020 Flat Panel Monitor"},
-    {"COMPAQ","COMPAQ V1000 Color Monitor"},
-    {"COMPAQ","COMPAQ V40 Color Monitor"},
-    {"COMPAQ","COMPAQ V45 Color Monitor"},
-    {"COMPAQ","COMPAQ V450 Color Monitor"},
-    {"COMPAQ","COMPAQ V50 Color Monitor"},
-    {"COMPAQ","COMPAQ V500 Color Monitor"},
-    {"COMPAQ","COMPAQ V55 Color Monitor"},
-    {"COMPAQ","COMPAQ V70 Color Monitor"},
-    {"COMPAQ","COMPAQ V700 Color Monitor"},
-    {"COMPAQ","COMPAQ V75 Color Monitor"},
-    {"COMPAQ","COMPAQ V90 Color Monitor"},
-    {"COMPAQ","COMPAQ V900 Color Monitor"},
-    {"COMPAQ","COMPAQ VGA"},
-    {"Compeq USA/Focus Technology","Compeq CT-1458"},
-    {"Compeq USA/Focus Technology","Compeq CT-1958"},
-    {"Computer Technology Link","CTL 700TF"},
-    {"Computer Technology Link","CTL 910TF"},
-    {"Conrac Display Products","Conrac 7126"},
-    {"Conrac Display Products","Conrac 7211"},
-    {"Conrac Display Products","Conrac 7214"},
-    {"Conrac Display Products","Conrac 7241"},
-    {"Conrac Display Products","Conrac 7250"},
-    {"Conrac Display Products","Conrac 7351"},
-    {"Conrac Display Products","Conrac 7550"},
-    {"Conrac Display Products","Conrac 9250"},
-    {"Cordata Technologies, Inc.","Cordata CMC-141M"},
-    {"Cordata Technologies, Inc.","Cordata CMC-1500BF"},
-    {"Cordata Technologies, Inc.","Cordata CMC-1500M"},
-    {"Cordata Technologies, Inc.","Cordata CMC-1500TF"},
-    {"Cordata Technologies, Inc.","Cordata CMC-1700M"},
-    {"Cordata Technologies, Inc.","Cordata CMC-2100H"},
-    {"Cordata Technologies, Inc.","Cordata CMC-2100M"},
-    {"CTL - Computer Technology Link","CTL 4n"},
-    {"CTL - Computer Technology Link","CTL 5fln"},
-    {"CTL - Computer Technology Link","CTL 5Ln"},
-    {"CTL - Computer Technology Link","CTL 5xln"},
-    {"CTL - Computer Technology Link","CTL 5xn"},
-    {"CTL - Computer Technology Link","CTL 7dln/7sln"},
-    {"CTL - Computer Technology Link","CTL 7fln"},
-    {"CTL - Computer Technology Link","CTL 7Ln"},
-    {"CTL - Computer Technology Link","CTL 900VX"},
-    {"CTL - Computer Technology Link","CTL 9ln"},
-    {"CTX - Chuntex Electronic","CTX 1451"},
-    {"CTX - Chuntex Electronic","CTX 1451ES"},
-    {"CTX - Chuntex Electronic","CTX 1451GM"},
-    {"CTX - Chuntex Electronic","CTX 1462GM"},
-    {"CTX - Chuntex Electronic","CTX 15-Group 65KHz/100Hz Monitor"},
-    {"CTX - Chuntex Electronic","CTX 1551"},
-    {"CTX - Chuntex Electronic","CTX 1562"},
-    {"CTX - Chuntex Electronic","CTX 1562ES"},
-    {"CTX - Chuntex Electronic","CTX 1562GM"},
-    {"CTX - Chuntex Electronic","CTX 1565"},
-    {"CTX - Chuntex Electronic","CTX 1565GM"},
-    {"CTX - Chuntex Electronic","CTX 1569"},
-    {"CTX - Chuntex Electronic","CTX 1765"},
-    {"CTX - Chuntex Electronic","CTX 1765GM"},
-    {"CTX - Chuntex Electronic","CTX 1785"},
-    {"CTX - Chuntex Electronic","CTX 1785GM"},
-    {"CTX - Chuntex Electronic","CTX 19D-Group 107KHz/160Hz Monitor"},
-    {"CTX - Chuntex Electronic","CTX 2085"},
-    {"CTX - Chuntex Electronic","CTX 2185"},
-    {"CTX - Chuntex Electronic","CTX 960D Class Monitor"},
-    {"CTX - Chuntex Electronic","CTX 960T Class Monitor"},
-    {"CTX - Chuntex Electronic","CTX CPS-1460"},
-    {"CTX - Chuntex Electronic","CTX CPS-1560"},
-    {"CTX - Chuntex Electronic","CTX CPS-1750"},
-    {"CTX - Chuntex Electronic","CTX CPS-1760"},
-    {"CTX - Chuntex Electronic","CTX CPS-2160"},
-    {"CTX - Chuntex Electronic","CTX CPS-2180"},
-    {"CTX - Chuntex Electronic","CTX CVP-5439"},
-    {"CTX - Chuntex Electronic","CTX CVP-5468"},
-    {"CTX - Chuntex Electronic","CTX CVP-5468NI"},
-    {"CTX - Chuntex Electronic","CTX CVP-5468NL"},
-    {"CTX - Chuntex Electronic","CTX CVS-3436"},
-    {"CTX - Chuntex Electronic","CTX CVS-3450"},
-    {"CTX - Chuntex Electronic","CTX EX1200 series"},
-    {"CTX - Chuntex Electronic","CTX EX1300"},
-    {"CTX - Chuntex Electronic","CTX EX1300 series"},
-    {"CTX - Chuntex Electronic","CTX EX700"},
-    {"CTX - Chuntex Electronic","CTX EX800"},
-    {"CTX - Chuntex Electronic","CTX EX900"},
-    {"CTX - Chuntex Electronic","CTX EX960 series"},
-    {"CTX - Chuntex Electronic","CTX MS600"},
-    {"CTX - Chuntex Electronic","CTX Multiscan 3436"},
-    {"CTX - Chuntex Electronic","CTX PR1200 series"},
-    {"CTX - Chuntex Electronic","CTX PR1250 series"},
-    {"CTX - Chuntex Electronic","CTX PR1300 series"},
-    {"CTX - Chuntex Electronic","CTX PR1350 series"},
-    {"CTX - Chuntex Electronic","CTX PR1400 series"},
-    {"CTX - Chuntex Electronic","CTX PR1400F"},
-    {"CTX - Chuntex Electronic","CTX PR1450 series"},
-    {"CTX - Chuntex Electronic","CTX PR500 series"},
-    {"CTX - Chuntex Electronic","CTX PR700 series"},
-    {"CTX - Chuntex Electronic","CTX PR705F series"},
-    {"CTX - Chuntex Electronic","CTX PR710 series"},
-    {"CTX - Chuntex Electronic","CTX PR710, PR711 series"},
-    {"CTX - Chuntex Electronic","CTX PR711F series"},
-    {"CTX - Chuntex Electronic","CTX PR715 series"},
-    {"CTX - Chuntex Electronic","CTX PR950 series"},
-    {"CTX - Chuntex Electronic","CTX PR955 series"},
-    {"CTX - Chuntex Electronic","CTX PR960F series"},
-    {"CTX - Chuntex Electronic","CTX TopView 150"},
-    {"CTX - Chuntex Electronic","CTX TopView 150-A"},
-    {"CTX - Chuntex Electronic","CTX VL400, PL4"},
-    {"CTX - Chuntex Electronic","CTX VL410"},
-    {"CTX - Chuntex Electronic","CTX VL500 series, MS500 series"},
-    {"CTX - Chuntex Electronic","CTX VL510 series, PL5 series"},
-    {"CTX - Chuntex Electronic","CTX VL700"},
-    {"CTX - Chuntex Electronic","CTX VL700 series, MS700 series, PL7 series"},
-    {"CTX - Chuntex Electronic","CTX VL705"},
-    {"CTX - Chuntex Electronic","CTX VL710 series"},
-    {"CTX - Chuntex Electronic","CTX VL710 series, EX710 series"},
-    {"CTX - Chuntex Electronic","CTX VL950 series, EX950 series, PL9 series"},
-    {"CyberVision, Inc.","CyberVision C112"},
-    {"CyberVision, Inc.","CyberVision C40"},
-    {"CyberVision, Inc.","CyberVision C50"},
-    {"CyberVision, Inc.","CyberVision C52"},
-    {"CyberVision, Inc.","CyberVision C70"},
-    {"CyberVision, Inc.","CyberVision C72"},
-    {"CyberVision, Inc.","CyberVision C92"},
-    {"CyberVision, Inc.","CyberVision ds115"},
-    {"CyberVision, Inc.","CyberVision ds69"},
-    {"CyberVision, Inc.","CyberVision ds6915x"},
-    {"CyberVision, Inc.","CyberVision ds69T"},
-    {"CyberVision, Inc.","CyberVision ds86"},
-    {"CyberVision, Inc.","CyberVision ds86D"},
-    {"CyberVision, Inc.","CyberVision ds95"},
-    {"Daewoo","Daewoo 1509B"},
-    {"Daewoo","Daewoo 1705B"},
-    {"Daewoo","Daewoo 431X"},
-    {"Daewoo","Daewoo 511B"},
-    {"Daewoo","Daewoo 512B"},
-    {"Daewoo","Daewoo 518B"},
-    {"Daewoo","Daewoo 518X"},
-    {"Daewoo","Daewoo 519B"},
-    {"Daewoo","Daewoo 707B"},
-    {"Daewoo","Daewoo 710B"},
-    {"Daewoo","Daewoo 710C"},
-    {"Daewoo","Daewoo 901D"},
-    {"Daewoo","Daewoo CMC-1423B1"},
-    {"Daewoo","Daewoo CMC-1427X1"},
-    {"Daewoo","Daewoo CMC-1502B1"},
-    {"Daewoo","Daewoo CMC-1505X"},
-    {"Daewoo","Daewoo CMC-1507X1"},
-    {"Daewoo","Daewoo CMC-1703B"},
-    {"Daewoo","Daewoo CMC-1704C"},
-    {"Daewoo Electronics Co., Ltd..","Daewoo 103F"},
-    {"Darius Technology, Ltd.","Darius Technology TSM-1431"},
-    {"DAYTEK","DAYTEK  DT-1530"},
-    {"DAYTEK","DAYTEK  DT-1531D"},
-    {"DAYTEK","DAYTEK  DT-1536D"},
-    {"DAYTEK","DAYTEK  DT-1536DB"},
-    {"DAYTEK","DAYTEK  DT-1569D"},
-    {"DAYTEK","DAYTEK  DT-1726D"},
-    {"DAYTEK","DAYTEK  DT-1728D"},
-    {"DAYTEK","DAYTEK  DT-1731D"},
-    {"DAYTEK","DAYTEK  DT-1731DB"},
-    {"DAYTEK","DAYTEK  DT-1770"},
-    {"DAYTEK","DAYTEK  DT-1926D"},
-    {"DAYTEK","DAYTEK  DT-1995D"},
-    {"DAYTEK","DAYTEK  DT-1995T"},
-    {"DAYTEK","DAYTEK  DT-57A"},
-    {"DAYTEK","DAYTEK  DT-95A"},
-    {"DAYTEK","DAYTEK  TM-1554D"},
-    {"DAYTEK","DAYTEK  TM-1569D"},
-    {"DAYTEK","DAYTEK  TM-1769D"},
-    {"DAYTEK","DAYTEK  TM-1770D"},
-    {"DAYTEK","DAYTEK  TM-1995D"},
-    {"DAYTEK","DAYTEK DT-1436"},
-    {"DAYTEK","DAYTEK DT-1436A"},
-    {"DAYTEK","DAYTEK DT-1436AM4"},
-    {"DAYTEK","DAYTEK DT-1436D"},
-    {"DAYTEK","DAYTEK DT-1436DM2"},
-    {"DAYTEK","DAYTEK DT-1436M2"},
-    {"DAYTEK","DAYTEK DT-14SN"},
-    {"DAYTEK","DAYTEK DT-14SNI"},
-    {"DAYTEK","DAYTEK DT-14SNIE"},
-    {"DAYTEK","DAYTEK DT-14ST39"},
-    {"DAYTEK","DAYTEK DT-14SV2"},
-    {"DAYTEK","DAYTEK DT-14SV3"},
-    {"DAYTEK","DAYTEK DT-14VN"},
-    {"DAYTEK","DAYTEK DT-14WN4"},
-    {"DAYTEK","DAYTEK DT-14XV"},
-    {"DAYTEK","DAYTEK DT-14XV MPR-II"},
-    {"DAYTEK","DAYTEK DT-14XVB"},
-    {"DAYTEK","DAYTEK DT-1530"},
-    {"DAYTEK","DAYTEK DT-1531"},
-    {"DAYTEK","DAYTEK DT-1531D"},
-    {"DAYTEK","DAYTEK DT-1531DB"},
-    {"DAYTEK","DAYTEK DT-1536"},
-    {"DAYTEK","DAYTEK DT-1536A"},
-    {"DAYTEK","DAYTEK DT-1536D"},
-    {"DAYTEK","DAYTEK DT-1726D"},
-    {"DAYTEK","DAYTEK DT-1730"},
-    {"DAYTEK","DAYTEK DT-1731"},
-    {"DAYTEK","DAYTEK DT-1731D"},
-    {"DAYTEK","DAYTEK DT-1731DB"},
-    {"Dell Computer Corp.","Dell 1024i"},
-    {"Dell Computer Corp.","Dell 1024i-P/1024i-Color"},
-    {"Dell Computer Corp.","Dell 1401FP"},
-    {"Dell Computer Corp.","Dell 1500FP"},
-    {"Dell Computer Corp.","Dell 1501FP(Analog)"},
-    {"Dell Computer Corp.","Dell 1501FP(Digital)"},
-    {"Dell Computer Corp.","Dell 1569"},
-    {"Dell Computer Corp.","Dell 1700FP"},
-    {"Dell Computer Corp.","Dell 1726T-HS/D1025HT"},
-    {"Dell Computer Corp.","Dell 800M"},
-    {"Dell Computer Corp.","Dell 828fi"},
-    {"Dell Computer Corp.","Dell D1025HE"},
-    {"Dell Computer Corp.","Dell D1025HTX"},
-    {"Dell Computer Corp.","Dell D1025TM"},
-    {"Dell Computer Corp.","Dell D1028L"},
-    {"Dell Computer Corp.","Dell D1226H"},
-    {"Dell Computer Corp.","Dell D1428L"},
-    {"Dell Computer Corp.","Dell D1626HT"},
-    {"Dell Computer Corp.","Dell D2026T"},
-    {"Dell Computer Corp.","Dell D2128-TCO"},
-    {"Dell Computer Corp.","Dell D825HR"},
-    {"Dell Computer Corp.","Dell D825HT"},
-    {"Dell Computer Corp.","Dell D825TM"},
-    {"Dell Computer Corp.","Dell D828L"},
-    {"Dell Computer Corp.","Dell E550"},
-    {"Dell Computer Corp.","Dell E550mm/E550mmw"},
-    {"Dell Computer Corp.","Dell E770p"},
-    {"Dell Computer Corp.","Dell E770s"},
-    {"Dell Computer Corp.","Dell Eizo 9080i"},
-    {"Dell Computer Corp.","Dell ES-17"},
-    {"Dell Computer Corp.","Dell GPD-16C"},
-    {"Dell Computer Corp.","Dell GPD-19C"},
-    {"Dell Computer Corp.","Dell Hewitt"},
-    {"Dell Computer Corp.","Dell M1110"},
-    {"Dell Computer Corp.","Dell M570"},
-    {"Dell Computer Corp.","Dell M770"},
-    {"Dell Computer Corp.","Dell M780"},
-    {"Dell Computer Corp.","Dell M990"},
-    {"Dell Computer Corp.","Dell P1110"},
-    {"Dell Computer Corp.","Dell P1690"},
-    {"Dell Computer Corp.","Dell P780"},
-    {"Dell Computer Corp.","Dell P790"},
-    {"Dell Computer Corp.","Dell P990"},
-    {"Dell Computer Corp.","Dell P991"},
-    {"Dell Computer Corp.","Dell Super VGA"},
-    {"Dell Computer Corp.","Dell Super VGA Colour"},
-    {"Dell Computer Corp.","Dell Super VGA DL 1428 I/L"},
-    {"Dell Computer Corp.","Dell Super VGA Jostens"},
-    {"Dell Computer Corp.","Dell TFT 1400FP"},
-    {"Dell Computer Corp.","Dell UGA DL 1460 NI"},
-    {"Dell Computer Corp.","Dell Ultrascan 14C"},
-    {"Dell Computer Corp.","Dell Ultrascan 14C-E"},
-    {"Dell Computer Corp.","Dell Ultrascan 14C-EN"},
-    {"Dell Computer Corp.","Dell Ultrascan 14ES"},
-    {"Dell Computer Corp.","Dell Ultrascan 14LR"},
-    {"Dell Computer Corp.","Dell Ultrascan 14XE"},
-    {"Dell Computer Corp.","Dell Ultrascan 15ES/15ES-P"},
-    {"Dell Computer Corp.","Dell Ultrascan 15FS-N/15FS-EN"},
-    {"Dell Computer Corp.","Dell Ultrascan 15FS/15FS-E"},
-    {"Dell Computer Corp.","Dell Ultrascan 15LR"},
-    {"Dell Computer Corp.","Dell Ultrascan 15TE"},
-    {"Dell Computer Corp.","Dell Ultrascan 17ES"},
-    {"Dell Computer Corp.","Dell Ultrascan 17FS-ELR"},
-    {"Dell Computer Corp.","Dell Ultrascan 17FS-EN"},
-    {"Dell Computer Corp.","Dell Ultrascan 17FS-LR"},
-    {"Dell Computer Corp.","Dell Ultrascan 17FS-N"},
-    {"Dell Computer Corp.","Dell Ultrascan 21FS"},
-    {"Dell Computer Corp.","Dell Ultrascan 21TE"},
-    {"Dell Computer Corp.","Dell Ultrascan V17X"},
-    {"Dell Computer Corp.","Dell V15X"},
-    {"Dell Computer Corp.","Dell V17X"},
-    {"Dell Computer Corp.","Dell VC15 Colour"},
-    {"Dell Computer Corp.","Dell VGA 800"},
-    {"Dell Computer Corp.","Dell VGA Color/Color Plus"},
-    {"Dell Computer Corp.","Dell VGA Monochrome"},
-    {"Dell Computer Corp.","Dell Vi14X"},
-    {"Dell Computer Corp.","Dell VS14/15"},
-    {"Dell Computer Corp.","Dell VS17"},
-    {"Dell Computer Corp.","Dell VS17X"},
-    {"Delta Electronics, Inc.","Delta DA-1565"},
-    {"Delta Electronics, Inc.","Delta DA-570"},
-    {"Delta Electronics, Inc.","Delta DA-995"},
-    {"Delta Electronics, Inc.","Delta DB-1765"},
-    {"Delta Electronics, Inc.","Delta DB-770"},
-    {"Delta Electronics, Inc.","Delta DC-770"},
-    {"Delta Electronics, Inc.","Delta DE-570"},
-    {"Digital Equipment Corp.","Digital 14 in. Color (FR-PCXBV-PF)"},
-    {"Digital Equipment Corp.","Digital 14 in. Color (FR-PCXBV-SA)"},
-    {"Digital Equipment Corp.","Digital 14 in. Color (FR-PCXCV-GE)"},
-    {"Digital Equipment Corp.","Digital 14 in. Color (FR-PCXCV-RA)"},
-    {"Digital Equipment Corp.","Digital 14 in. Color Monitor (FR-PCXCV-C*)"},
-    {"Digital Equipment Corp.","Digital 14 in. Monochrome (FR-PC7XV-KA)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXBV-PC)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXBV-RA)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXBV-RD)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXBV-RL)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXBV-SC)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color (FR-PCXCV-AC)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color Monitor (FR-PCXBV-E*)"},
-    {"Digital Equipment Corp.","Digital 15 in. Color Monitor (FR-PCXCV-D*)"},
-    {"Digital Equipment Corp.","Digital 17 in. Color (FR-PCXAV-EC)"},
-    {"Digital Equipment Corp.","Digital 17 in. Color (FR-PCXAV-YZ)"},
-    {"Digital Equipment Corp.","Digital 17 in. Color (FR-PCXBV-KA)"},
-    {"Digital Equipment Corp.","Digital 17 in. Color Monitor (FR-PCXBV-F*)"},
-    {"Digital Equipment Corp.","Digital 19 in. Color (FR-PCXAV-CY)"},
-    {"Digital Equipment Corp.","Digital 19 in. Color (FR-PCXAV-CZ)"},
-    {"Digital Equipment Corp.","Digital 19 in. Color (FR-PCXAV-TZ)"},
-    {"Digital Equipment Corp.","Digital 21 in. Color (FR-PCXAV-HA)"},
-    {"Digital Equipment Corp.","Digital 21 in. Color (FR-PCXAV-WZ)"},
-    {"Digital Equipment Corp.","Digital 24 in. Color (FR-PCXAV-AZ)"},
-    {"Digital Equipment Corp.","FR-PCXAV-VY"},
-    {"Digital Equipment Corp.","FR-PCXAV-VZ"},
-    {"Digital Equipment Corp.","FR-PCXAV-WY"},
-    {"Digital Equipment Corp.","FR-PCXAV-YY"},
-    {"EIZO","EIZO 9060S"},
-    {"EIZO","EIZO 9065S"},
-    {"EIZO","EIZO 9070S"},
-    {"EIZO","EIZO 9080i"},
-    {"EIZO","EIZO 9400i"},
-    {"EIZO","EIZO 9500"},
-    {"EIZO","EIZO F35"},
-    {"EIZO","EIZO F55"},
-    {"EIZO","EIZO F55S"},
-    {"EIZO","EIZO F56"},
-    {"EIZO","EIZO F57"},
-    {"EIZO","EIZO F67"},
-    {"EIZO","EIZO F77"},
-    {"EIZO","EIZO F77S"},
-    {"EIZO","EIZO F78"},
-    {"EIZO","EIZO FlexScan 6500"},
-    {"EIZO","EIZO FlexScan 6600"},
-    {"EIZO","EIZO FlexScan E151L"},
-    {"EIZO","EIZO FlexScan E54F"},
-    {"EIZO","EIZO FlexScan E76F"},
-    {"EIZO","EIZO FlexScan F340iW"},
-    {"EIZO","EIZO FlexScan F351"},
-    {"EIZO","EIZO FlexScan F550iW"},
-    {"EIZO","EIZO FlexScan F552"},
-    {"EIZO","EIZO FlexScan F553"},
-    {"EIZO","EIZO FlexScan F560iW"},
-    {"EIZO","EIZO FlexScan F563"},
-    {"EIZO","EIZO FlexScan F57"},
-    {"EIZO","EIZO FlexScan F750i"},
-    {"EIZO","EIZO FlexScan F760iW"},
-    {"EIZO","EIZO FlexScan F764"},
-    {"EIZO","EIZO FlexScan F77S"},
-    {"EIZO","EIZO FlexScan F780iW"},
-    {"EIZO","EIZO FlexScan F784"},
-    {"EIZO","EIZO FlexScan L34"},
-    {"EIZO","EIZO FlexScan T560i"},
-    {"EIZO","EIZO FlexScan T562"},
-    {"EIZO","EIZO FlexScan T563"},
-    {"EIZO","EIZO FlexScan T660i"},
-    {"EIZO","EIZO FlexScan T662"},
-    {"EIZO","EIZO FX-B5"},
-    {"EIZO","EIZO FX-C5"},
-    {"EIZO","EIZO FX-C5S"},
-    {"EIZO","EIZO FX-C6"},
-    {"EIZO","EIZO FX-C7"},
-    {"EIZO","EIZO FX-D7"},
-    {"EIZO","EIZO FX-E7"},
-    {"EIZO","EIZO FX-E7S"},
-    {"EIZO","EIZO FX-E8"},
-    {"EIZO","EIZO L23"},
-    {"EIZO","EIZO L34"},
-    {"EIZO","EIZO L360"},
-    {"EIZO","EIZO L66"},
-    {"EIZO","EIZO NANAO FlexScan FX-C7"},
-    {"EIZO","EIZO NANAO FlexScan FX-E7S"},
-    {"EIZO","EIZO T57"},
-    {"EIZO","EIZO T57S"},
-    {"EIZO","EIZO T67"},
-    {"EIZO","EIZO T67S"},
-    {"EIZO","EIZO T68"},
-    {"EIZO","EIZO T77"},
-    {"EIZO","EIZO T960"},
-    {"EIZO","EIZO TX-C7"},
-    {"EIZO","EIZO TX-C7S"},
-    {"EIZO","EIZO TX-D7"},
-    {"EIZO","EIZO TX-D7S"},
-    {"EIZO NANAO","F520"},
-    {"EIZO NANAO","F980"},
-    {"EIZO NANAO","L350"},
-    {"EIZO NANAO","L680"},
-    {"EIZO NANAO","T550"},
-    {"EIZO NANAO","T760"},
-    {"EIZO NANAO","T961"},
-    {"Elecom","Elecom HRM-14E"},
-    {"Elecom","Elecom HRM-15"},
-    {"Elecom","Elecom HRM-17"},
-    {"Elecom","Elecom HRM-17E"},
-    {"Elecom","Elecom HRM-L15"},
-    {"Elecom","Elecom HRM-L17"},
-    {"Elecom","Elecom LRM-T17"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1401"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1501"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1502"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1503"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1700"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1701"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 1702"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 2101"},
-    {"ELITEGROUP Computer Systems","ECS VERTOS 2102"},
-    {"Elsa AG","Elsa Ecomo Office"},
-    {"Envision Peripherals, Inc.","AOC Spectrum 7Glr & 7GlrA"},
-    {"Envision Peripherals, Inc.","AOC Spectrum 7Vlr,7VlrA,7Vlr+ & 7VlrA+"},
-    {"Envision Peripherals, Inc.","AOC Spectrum 9Glr,9GlrA,9Glrs & 9GlrsA"},
-    {"Envision Peripherals, Inc.","EPI ENVISION EN-S1770 & EN-S1770A"},
-    {"Envision Peripherals, Inc.","EPI ENVISION EN-S1785 & EN-S1785A"},
-    {"Envision Peripherals, Inc.","EPI ENVISION EN-S1995A,EN-S1995A,EN-S1995S & EN-S1995SA"},
-    {"Envision Perpherals Inc.","AOC LCD MONITOR LM-500"},
-    {"EPSON","Endeavor ED-1428A"},
-    {"EPSON","Endeavor ED-1528A"},
-    {"EPSON","Endeavor ED-1728A"},
-    {"EPSON","Endeavor EV-1428A"},
-    {"EPSON","Endeavor VT-75"},
-    {"EPSON","Epson CG1428I"},
-    {"EPSON","Epson CG1428N"},
-    {"EPSON","Epson CG1439I"},
-    {"EPSON","Epson CG1528N"},
-    {"EPSON","Epson CG1728N"},
-    {"EPSON","EPSON CR-7600"},
-    {"EPSON","EPSON CR-7700"},
-    {"EPSON","EPSON CRV-1700"},
-    {"EPSON","EPSON VCR-5000"},
-    {"Everex Systems, Inc.","Everex Eversync_SVGA"},
-    {"Falco Data Products, Inc.","Falco Data Products, Inc. FMS"},
-    {"Fora, Inc.","Fora, Inc. MON-7C5"},
-    {"Forefront Technology Corp.","Forefront Technology MTS-9608S"},
-    {"Fujikama O.A. Distribution","Fujikama PVGA-1024A"},
-    {"Fujitsu","Fujitsu 1554G+"},
-    {"Fujitsu","Fujitsu DESKPOWER-C"},
-    {"Fujitsu","FUJITSU e150f"},
-    {"Fujitsu","FUJITSU e155"},
-    {"Fujitsu","FUJITSU e177"},
-    {"Fujitsu","Fujitsu FMV-DP831"},
-    {"Fujitsu","Fujitsu FMV-DP841"},
-    {"Fujitsu","Fujitsu FMV-DP842"},
-    {"Fujitsu","Fujitsu FMV-DP842A"},
-    {"Fujitsu","Fujitsu FMV-DP843"},
-    {"Fujitsu","Fujitsu FMV-DP84X1"},
-    {"Fujitsu","Fujitsu FMV-DP84Z"},
-    {"Fujitsu","Fujitsu FMV-DP84Z2"},
-    {"Fujitsu","Fujitsu FMV-DP84Z3"},
-    {"Fujitsu","Fujitsu FMV-DP871"},
-    {"Fujitsu","Fujitsu FMV-DP872"},
-    {"Fujitsu","Fujitsu FMV-DP971"},
-    {"Fujitsu","Fujitsu FMV-DP972"},
-    {"Fujitsu","Fujitsu FMV-DP972A"},
-    {"Fujitsu","Fujitsu FMV-DP973"},
-    {"Fujitsu","Fujitsu FMV-DP974"},
-    {"Fujitsu","Fujitsu FMV-DP97X2"},
-    {"Fujitsu","Fujitsu FMV-DP97X3"},
-    {"Fujitsu","Fujitsu FMV-DP97Z"},
-    {"Fujitsu","Fujitsu FMV-DP991"},
-    {"Fujitsu","Fujitsu FMV-DP992"},
-    {"Fujitsu","Fujitsu FMV-DPS841"},
-    {"Fujitsu","Fujitsu FMV-DPS971"},
-    {"Fujitsu","FUJITSU x150f"},
-    {"Fujitsu","FUJITSU x151f"},
-    {"Fujitsu","FUJITSU x176"},
-    {"Fujitsu","FUJITSU x177"},
-    {"Fujitsu","FUJITSU x177a"},
-    {"Fujitsu","FUJITSU x180f"},
-    {"FUJITSU COMPUTER GMBH","FUJITSU 15 inch CS550"},
-    {"FUJITSU COMPUTER GMBH","FUJITSU 17 inch C771"},
-    {"FUJITSU COMPUTER GMBH","FUJITSU LCD 15.1 inch PT-500"},
-    {"Fujitsu ICL","Fujitsu 1568G1"},
-    {"Fujitsu ICL","Fujitsu 1769G"},
-    {"Fujitsu ICL","Fujitsu e155"},
-    {"Fujitsu ICL","FUJITSU e175"},
-    {"FUJITSU ICL","FUJITSU e176"},
-    {"Fujitsu ICL","FUJITSU e213"},
-    {"Fujitsu ICL","FUJITSU ErgoPro e154"},
-    {"Fujitsu ICL","Fujitsu ErgoPro e174"},
-    {"Fujitsu ICL","Fujitsu ErgoPro x153"},
-    {"FUJITSU ICL","FUJITSU ErgoPro x174"},
-    {"FUJITSU ICL","FUJITSU ErgoPro x174a"},
-    {"Fujitsu ICL","Fujitsu FMV-DP84X2"},
-    {"Fujitsu ICL","Fujitsu FMV-DP84X3(G)"},
-    {"Fujitsu ICL","Fujitsu FMV-DP97X3"},
-    {"Fujitsu ICL","Fujitsu FMV-DP97X4"},
-    {"Fujitsu ICL","Fujitsu FMV-DP98X1"},
-    {"Fujitsu ICL","Fujitsu FMVDP97X5(G)/FMVDP97X6"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 140v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 141p"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 141v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 142v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 151p"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 151p AutoBrite"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 151v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 152v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 171p"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 171v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 172p"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 172p AutoBrite"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 172v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 172v AutoBrite"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro 211v"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro e142"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro e153"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro e172"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro e173"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro e212"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro x152"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro x173"},
-    {"Fujitsu ICL","Fujitsu ICL ErgoPro x173a"},
-    {"Fujitsu ICL","Fujitsu VL-14TX1"},
-    {"Fujitsu ICL","Fujitsu VL-15TX1(G)"},
-    {"Fujitsu ICL","Fujitsu x150f"},
-    {"FUJITSU ICL","FUJITSU x154"},
-    {"Fujitsu ICL","Fujitsu x176"},
-    {"Fujitsu ICL","Fujitsu x177"},
-    {"Fujitsu ICL","Fujitsu x177a"},
-    {"FUJITSU ICL","FUJITSU x191"},
-    {"Funai Electric Company of Taiwan","Funai 17GD"},
-    {"Gateway","Gateway 14SVGA"},
-    {"Gateway","Gateway CM751"},
-    {"Gateway","Gateway CM803"},
-    {"Gateway","Gateway CrystalScan 1024"},
-    {"Gateway","Gateway CrystalScan 1024NI"},
-    {"Gateway","Gateway CrystalScan 1024NI2G"},
-    {"Gateway","Gateway CrystalScan 14"},
-    {"Gateway","Gateway CrystalScan 15"},
-    {"Gateway","Gateway CrystalScan 1572DG"},
-    {"Gateway","Gateway CrystalScan 1572DGM"},
-    {"Gateway","Gateway CrystalScan 1572FS"},
-    {"Gateway","Gateway CrystalScan 17"},
-    {"Gateway","Gateway CrystalScan 17762LEG"},
-    {"Gateway","Gateway CrystalScan 500"},
-    {"Gateway","Gateway CrystalScan 500-069"},
-    {"Gateway","Gateway CrystalScan 700"},
-    {"Gateway","Gateway CrystalScan 700-069"},
-    {"Gateway","Gateway Destination 31-1"},
-    {"Gateway","Gateway Destination 31-2"},
-    {"Gateway","Gateway Destination 36-1"},
-    {"Gateway","Gateway Destination DL27"},
-    {"Gateway","Gateway Destination DL36"},
-    {"Gateway","Gateway EV500"},
-    {"Gateway","Gateway EV700"},
-    {"Gateway","Gateway EV700-H"},
-    {"Gateway","Gateway EV900"},
-    {"Gateway","Gateway FPD1500"},
-    {"Gateway","Gateway Vivitron 1100"},
-    {"Gateway","Gateway Vivitron 15"},
-    {"Gateway","Gateway Vivitron 17"},
-    {"Gateway","Gateway Vivitron 20"},
-    {"Gateway","Gateway Vivitron 21"},
-    {"Gateway","Gateway Vivitron 500"},
-    {"Gateway","Gateway Vivitron 700"},
-    {"Gateway","Gateway Vivitron 700-069"},
-    {"Gateway","Gateway VX1100"},
-    {"Gateway","Gateway VX700"},
-    {"Gateway","Gateway VX900"},
-    {"Gateway","Gateway VX900T"},
-    {"Golden Dragon","Golden Dragon TY-1411"},
-    {"Golden Dragon","Golden Dragon TY-2015"},
-    {"GoldStar Technology, Inc.","GoldStar 1423"},
-    {"GoldStar Technology, Inc.","GoldStar 1423 Plus VGA"},
-    {"GoldStar Technology, Inc.","GoldStar 1453 Plus"},
-    {"GoldStar Technology, Inc.","GoldStar 1460 Plus VGA"},
-    {"GoldStar Technology, Inc.","GoldStar 1470_Plus"},
-    {"GoldStar Technology, Inc.","GoldStar 1490"},
-    {"GoldStar Technology, Inc.","GoldStar 1510"},
-    {"GoldStar Technology, Inc.","GoldStar 1620"},
-    {"GoldStar Technology, Inc.","GoldStar 1710"},
-    {"GoldStar Technology, Inc.","GoldStar 1725"},
-    {"Hansol Electronics","Hansol  400F"},
-    {"Hansol Electronics","Hansol 2100A"},
-    {"Hansol Electronics","Hansol 2100P"},
-    {"Hansol Electronics","Hansol 400F"},
-    {"Hansol Electronics","Hansol 400P"},
-    {"Hansol Electronics","Hansol 401A"},
-    {"Hansol Electronics","Hansol 500A"},
-    {"Hansol Electronics","Hansol 500F"},
-    {"Hansol Electronics","Hansol 501P"},
-    {"Hansol Electronics","Hansol 510A"},
-    {"Hansol Electronics","Hansol 510F"},
-    {"Hansol Electronics","Hansol 701A"},
-    {"Hansol Electronics","Hansol 701P"},
-    {"Hansol Electronics","Hansol 705D"},
-    {"Hansol Electronics","Hansol 710E/710Aplus"},
-    {"Hansol Electronics","Hansol 710P/710D"},
-    {"Hansol Electronics","Hansol 900P"},
-    {"Hansol Electronics","Hansol 910A"},
-    {"Hansol Electronics","Hansol 920D"},
-    {"Hansol Electronics","Hansol 920eF"},
-    {"Hansol Electronics","Hansol Electronics Mazellan14px"},
-    {"Hansol Electronics","Hansol Electronics Mazellan15ax"},
-    {"Hansol Electronics","Hansol Electronics Mazellan17ax"},
-    {"Hansol Electronics","Hansol Electronics Mazellan17px"},
-    {"Hansol Electronics","Hansol Electronics Mazellan400A"},
-    {"Hansol Electronics","Hansol Electronics Mazellan400P"},
-    {"Hansol Electronics","Hansol Electronics Mazellan500A"},
-    {"Hansol Electronics","Hansol Electronics Mazellan500P"},
-    {"Hansol Electronics","Hansol Electronics Mazellan700A"},
-    {"Hansol Electronics","Hansol Electronics Mazellan700P"},
-    {"Hansol Electronics","Hansol Mazellan14ax"},
-    {"Hansol Electronics","Hansol Mazellan14px"},
-    {"Hansol Electronics","Hansol Mazellan15ax"},
-    {"Hansol Electronics","Hansol Mazellan17ax"},
-    {"Hansol Electronics","Hansol Mazellan17px"},
-    {"Hansol Electronics","Hansol Mazellan400A"},
-    {"Hansol Electronics","Hansol Mazellan400P"},
-    {"Hansol Electronics","Hansol Mazellan401A"},
-    {"Hansol Electronics","Hansol Mazellan500A"},
-    {"Hansol Electronics","Hansol Mazellan500M"},
-    {"Hansol Electronics","Hansol Mazellan500P"},
-    {"Hansol Electronics","Hansol Mazellan501P"},
-    {"Hansol Electronics","Hansol Mazellan700A"},
-    {"Hansol Electronics","Hansol Mazellan700P"},
-    {"Hansol Electronics","Hansol Mazellan701A"},
-    {"Hansol Electronics","Hansol Mazellan701P"},
-    {"Hansol Electronics","Hansol Mazellan900P"},
-    {"Hansol Electronics","Hansol Mazellan_400P"},
-    {"Hansol Electronics","Hansol Mazellan_500A"},
-    {"HCI","HCI Maxiscan"},
-    {"Hewlett Packard","HP D1187A 20-inch Display"},
-    {"Hewlett Packard","HP D1188A 20-inch Display"},
-    {"Hewlett Packard","HP D1192A VGA Monochrome 14-inch Display"},
-    {"Hewlett Packard","HP D1192B VGA Monochrome 14-inch Display"},
-    {"Hewlett Packard","HP D1193A Ultra VGA 17-inch"},
-    {"Hewlett Packard","HP D1194A SVGA 14-inch Display"},
-    {"Hewlett Packard","HP D1195A Ergo-SVGA 14-inch Display"},
-    {"Hewlett Packard","HP D1196A Ergo Ultra VGA 15-inch Display"},
-    {"Hewlett Packard","HP D1197A Color VGA 14-inch Display"},
-    {"Hewlett Packard","HP D1198A SVGA 14-inch Display"},
-    {"Hewlett Packard","HP D1199A Ultra VGA 1600 21-inch Display"},
-    {"Hewlett Packard","HP D1815A 1024 Low Emissions 14-inch Display"},
-    {"Hewlett Packard","HP D2800A Ultra VGA 1600 21-inch Display"},
-    {"Hewlett Packard","HP D2801A VGA Monochrome 14-inch Display"},
-    {"Hewlett Packard","HP D2801A/B Monochrome VGA 14-inch Display"},
-    {"Hewlett Packard","HP D2802A Entry-Level SVGA 14-inch Display"},
-    {"Hewlett Packard","HP D2802A SVGA 14-inch Display"},
-    {"Hewlett Packard","HP D2803A Super VGA 1024i 14-inch Display"},
-    {"Hewlett Packard","HP D2804A Super VGA and 1024i 14-inch Display"},
-    {"Hewlett Packard","HP D2804A/B Super VGA 1024i 14-inch Display"},
-    {"Hewlett Packard","HP D2805A Ergo 1024 14-inch Display"},
-    {"Hewlett Packard","HP D2806A Ergo Ultra VGA 15-inch Display"},
-    {"Hewlett Packard","HP D2806A/B Ergo Ultra VGA 15-inch Display"},
-    {"Hewlett Packard","HP D2807A Ultra VGA 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2807A/B Ultra VGA 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2808 1024 Low Emissions 15-inch Display"},
-    {"Hewlett Packard","HP D2808A 1024 Low Emissions 15-inch Display"},
-    {"Hewlett Packard","HP D2809A 1024 Low Emissions MM 15-inch Display"},
-    {"Hewlett Packard","HP D2810A 1024 14-inch Display"},
-    {"Hewlett Packard","HP D2811A 1024 Low Emissions 14-inch Display"},
-    {"Hewlett Packard","HP D2813 1024 14-inch Display"},
-    {"Hewlett Packard","HP D2814A Super VGA and 1024I 14-inch Display"},
-    {"Hewlett Packard","HP D2814A Super VGA Low Emissions 14-inch Display"},
-    {"Hewlett Packard","HP D2815 1024 Low Emissions 14-inch Display"},
-    {"Hewlett Packard","HP D2817A Ultra VGA 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2818 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2819 Ultra VGA 1280 Extra Low Emissions 17-inch Display"},
-    {"Hewlett Packard","HP D2821 1024 Low Emissions 14-inch Display"},
-    {"Hewlett Packard","HP D2825 Ultra VGA 1024 15-inch Display"},
-    {"Hewlett Packard","HP D2826 15-inch Display"},
-    {"Hewlett Packard","HP D2830 Ergo 1024 15-inch Display"},
-    {"Hewlett Packard","HP D2831 Ergo 1024 Extra Low Emissions 15-inch Display"},
-    {"Hewlett Packard","HP D2832A"},
-    {"Hewlett Packard","HP D2835 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2836 Ultra VGA 1280 Extra Low Emissions 17-inch Display"},
-    {"Hewlett Packard","HP D2838 M700 17-inch Display"},
-    {"Hewlett Packard","HP D2840 Ergo 1280 17-inch Display"},
-    {"Hewlett Packard","HP D2843 M900 Monitor"},
-    {"Hewlett Packard","HP D2845 Ergo 1600 21-inch Display"},
-    {"Hewlett Packard","HP D2846 P1100 Monitor"},
-    {"Hewlett Packard","HP D3857A Multi Media 15-inch Display"},
-    {"Hewlett Packard","HP D3857A Multi Media 15-inch Display."},
-    {"Hewlett Packard","HP D3858A Multi Media 14-inch Display"},
-    {"Hewlett Packard","HP D3859A Multi Media 17-inch Display"},
-    {"Hewlett Packard","HP D3861A Multi Scan 14-inch Display"},
-    {"Hewlett Packard","HP D3899A Multi Media 14-inch Display"},
-    {"Hewlett Packard","HP D5060 1024 14-inch Liquid Crystal Display"},
-    {"Hewlett Packard","HP D5258A Pavilion M50 Monitor"},
-    {"Hewlett Packard","HP D5259A Pavilion M70 Monitor"},
-    {"Hewlett Packard","HP D5269A Pavilion M40 Monitor"},
-    {"Hewlett Packard","HP D6433A Pavilion M90 Monitor"},
-    {"Hewlett Packard","HP D7739A Pavilion S50 Monitor"},
-    {"Hewlett Packard","HP D7740A Pavilion S70 Monitor"},
-    {"Hewlett Packard","HP Pavilion M45/S40 Monitor"},
-    {"Hewlett-Packard","HP D2800 Ultra VGA 1600 21-inch Display"},
-    {"Hewlett-Packard","HP D2801 Monochrome VGA 14-inch Display"},
-    {"Hewlett-Packard","HP D2802 Entry-Level SVGA 14-inch Display"},
-    {"Hewlett-Packard","HP D2803 Super VGA 1024i 14-inch Display"},
-    {"Hewlett-Packard","HP D2804 Super VGA 1024i 14-inch Display"},
-    {"Hewlett-Packard","HP D2805 Ergo 1024 14-inch Display"},
-    {"Hewlett-Packard","HP D2806 Ergo Ultra VGA 15-inch Display"},
-    {"Hewlett-Packard","HP D2807 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett-Packard","HP D2808 1024 Low Emissions 15-inch Display"},
-    {"Hewlett-Packard","HP D2809 1024 Low Emissions MM 15-inch Display"},
-    {"Hewlett-Packard","HP D2810 1024 14-inch Display"},
-    {"Hewlett-Packard","HP D2811 1024 Low Emissions 14-inch Display"},
-    {"Hewlett-Packard","HP D2813 1024 14-inch Display"},
-    {"Hewlett-Packard","HP D2814 Super VGA Low Emissions 14-inch Display"},
-    {"Hewlett-Packard","HP D2815 1024 Low Emissions 14-inch Display"},
-    {"Hewlett-Packard","HP D2817 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett-Packard","HP D2818 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett-Packard","HP D2819 Ultra VGA 1280 Extra Low Emissions 17-inch Display"},
-    {"Hewlett-Packard","HP D2821 1024 Low Emissions 14-inch Display"},
-    {"Hewlett-Packard","HP D2825 Ultra VGA 1024 15-inch Display"},
-    {"Hewlett-Packard","HP D2826 HP 50 15-inch Display"},
-    {"Hewlett-Packard","HP D2827 HP 51 15-inch Display"},
-    {"Hewlett-Packard","HP D2828 HP 52 15-inch Monitor"},
-    {"Hewlett-Packard","HP D2830 Ergo 1024 15-inch Display"},
-    {"Hewlett-Packard","HP D2831 Ergo 1024 Extra Low Emissions 15-inch Display"},
-    {"Hewlett-Packard","HP D2832 HP 500 15-inch Monitor"},
-    {"Hewlett-Packard","HP D2835 Ultra VGA 1280 17-inch Display"},
-    {"Hewlett-Packard","HP D2836 Ultra VGA 1280 Extra Low Emissions 17-inch Display"},
-    {"Hewlett-Packard","HP D2837 HP 70 17-inch Display"},
-    {"Hewlett-Packard","HP D2838 HP 700 17-inch Monitor"},
-    {"Hewlett-Packard","HP D2839 HP 70 17-inch Monitor"},
-    {"Hewlett-Packard","HP D2840 Ergo 1280 17-inch Display"},
-    {"Hewlett-Packard","HP D2842 HP 90 19-inch Display"},
-    {"Hewlett-Packard","HP D2843 M900 19-inch Monitor"},
-    {"Hewlett-Packard","HP D2845 Ergo 1600 21-inch Display"},
-    {"Hewlett-Packard","HP D2846 P1100 21-inch Monitor"},
-    {"Hewlett-Packard","HP D2847 P1110 21-inch Monitor"},
-    {"Hewlett-Packard","HP D5060 1024 14-inch Liquid Crystal Display"},
-    {"Hewlett-Packard","HP D5061 L1500 15-inch LCD Monitor"},
-    {"Hewlett-Packard","HP D5065 L1800 18.1-inch LCD Monitor"},
-    {"Hewlett-Packard","HP D5069 L1810 18.1-inch LCD Monitor"},
-    {"Hewlett-Packard","HP D8891 HP 40 14-inch Monitor"},
-    {"Hewlett-Packard","HP D8894 HP 55 15-inch Monitor"},
-    {"Hewlett-Packard","HP D8895 HP 55 15-inch Monitor"},
-    {"Hewlett-Packard","HP D8896 HP 55 15-inch Monitor"},
-    {"Hewlett-Packard","HP D8897 HP 55 15-inch Monitor"},
-    {"Hewlett-Packard","HP D8898 HP 55 TCO95 15-inch Monitor"},
-    {"Hewlett-Packard","HP D8900 HP 75 17-inch Monitor"},
-    {"Hewlett-Packard","HP D8901A HP 71 17-inch Monitor"},
-    {"Hewlett-Packard","HP D8902A HP 71 17-inch Monitor"},
-    {"Hewlett-Packard","HP D8903A HP 71 17-inch Monitor"},
-    {"Hewlett-Packard","HP D8906A HP P700 17-inch Monitor"},
-    {"Hewlett-Packard","HP D8910A HP P910 19-inch Monitor"},
-    {"Hewlett-Packard","HP D8911A HP 91 19-inch Monitor"},
-    {"Hewlett-Packard","HP D8912A HP P920 19-inch Monitor"},
-    {"Hewlett-Packard","HP D8915A HP P1120 21-inch Monitor"},
-    {"Hitachi, Ltd.","CM640ET/CM640U"},
-    {"Hitachi, Ltd.","Hitachi 20-AP"},
-    {"Hitachi, Ltd.","Hitachi 20-APF"},
-    {"Hitachi, Ltd.","Hitachi 20-AS"},
-    {"Hitachi, Ltd.","Hitachi 21-AP"},
-    {"Hitachi, Ltd.","Hitachi Accuvue GX17L"},
-    {"Hitachi, Ltd.","Hitachi Accuvue GX20"},
-    {"Hitachi, Ltd.","Hitachi Accuvue GX20H"},
-    {"Hitachi, Ltd.","Hitachi Accuvue GX21"},
-    {"Hitachi, Ltd.","Hitachi Accuvue UX4721"},
-    {"Hitachi, Ltd.","Hitachi Accuvue UX4921"},
-    {"Hitachi, Ltd.","Hitachi Accuvue UX6821"},
-    {"Hitachi, Ltd.","Hitachi CM1586MJ"},
-    {"Hitachi, Ltd.","Hitachi CM1796MJZ"},
-    {"Hitachi, Ltd.","Hitachi CM1797MJZ"},
-    {"Hitachi, Ltd.","Hitachi CM1798M"},
-    {"Hitachi, Ltd.","Hitachi CM2198M"},
-    {"Hitachi, Ltd.","Hitachi CM2199M"},
-    {"Hitachi, Ltd.","Hitachi CM500E"},
-    {"Hitachi, Ltd.","Hitachi CM500U/J"},
-    {"Hitachi, Ltd.","Hitachi CM610"},
-    {"Hitachi, Ltd.","Hitachi CM615"},
-    {"Hitachi, Ltd.","Hitachi CM620"},
-    {"Hitachi, Ltd.","Hitachi CM630"},
-    {"Hitachi, Ltd.","Hitachi CM640"},
-    {"Hitachi, Ltd.","Hitachi CM641"},
-    {"Hitachi, Ltd.","Hitachi CM643"},
-    {"Hitachi, Ltd.","Hitachi CM650"},
-    {"Hitachi, Ltd.","Hitachi CM651"},
-    {"Hitachi, Ltd.","Hitachi CM751"},
-    {"Hitachi, Ltd.","Hitachi CM752"},
-    {"Hitachi, Ltd.","Hitachi CM753"},
-    {"Hitachi, Ltd.","Hitachi CM761"},
-    {"Hitachi, Ltd.","Hitachi CM762"},
-    {"Hitachi, Ltd.","Hitachi CM763"},
-    {"Hitachi, Ltd.","Hitachi CM766"},
-    {"Hitachi, Ltd.","Hitachi CM767"},
-    {"Hitachi, Ltd.","Hitachi CM768"},
-    {"Hitachi, Ltd.","Hitachi CM769"},
-    {"Hitachi, Ltd.","Hitachi CM771"},
-    {"Hitachi, Ltd.","Hitachi CM776"},
-    {"Hitachi, Ltd.","Hitachi CM800"},
-    {"Hitachi, Ltd.","Hitachi CM801"},
-    {"Hitachi, Ltd.","Hitachi CM802"},
-    {"Hitachi, Ltd.","Hitachi CM803"},
-    {"Hitachi, Ltd.","Hitachi CM811"},
-    {"Hitachi, Ltd.","Hitachi CM811PLUS"},
-    {"Hitachi, Ltd.","Hitachi CM812"},
-    {"Hitachi, Ltd.","Hitachi CM813"},
-    {"Hitachi, Ltd.","Hitachi CM814"},
-    {"Hitachi, Ltd.","Hitachi CM815"},
-    {"Hitachi, Ltd.","Hitachi HM-5219"},
-    {"Hitachi, Ltd.","Hitachi HM1764"},
-    {"Hitachi, Ltd.","Hitachi HM1782"},
-    {"Hitachi, Ltd.","Hitachi HM4020"},
-    {"Hitachi, Ltd.","Hitachi HM4021"},
-    {"Hitachi, Ltd.","Hitachi HM4721"},
-    {"Hitachi, Ltd.","Hitachi HM4820"},
-    {"Hitachi, Ltd.","Hitachi HM4821"},
-    {"Hitachi, Ltd.","Hitachi HM4921"},
-    {"Hitachi, Ltd.","Hitachi HM6421"},
-    {"Hitachi, Ltd.","Hitachi HM6821"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM-1711M"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM-2110M"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM-2111M"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM-2112M"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM500"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM600"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM611"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM701"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM800"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM801"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM802"},
-    {"Hitachi, Ltd.","Hitachi, Ltd CM803"},
-    {"Hyundai Electronics Industries Co., Ltd.","DeluxScan 7687"},
-    {"Hyundai Electronics Industries Co., Ltd.","HL-2885B"},
-    {"Hyundai Electronics Industries Co., Ltd.","HL-7770A"},
-    {"Hyundai Electronics Industries Co., Ltd.","HL-7770RD"},
-    {"Hyundai Electronics Industries Co., Ltd.","HT-7695B"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 14S"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai DeluxScan 15 Pro"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 15B"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 15G"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai DeluxScan 15G+"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai DeluxScan 17"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 17 Pro"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 17B"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai DeluxScan 17B+"},
-    {"Hyundai Electronics Industries Co., Ltd.","Hyundai Deluxscan 21"},
-    {"IBM","IBM 2112"},
-    {"IBM","IBM 2113"},
-    {"IBM","IBM 2114"},
-    {"IBM","IBM 2115"},
-    {"IBM","IBM 2116 MM55 Multimedia"},
-    {"IBM","IBM 2117"},
-    {"IBM","IBM 2122"},
-    {"IBM","IBM 2122-xxL"},
-    {"IBM","IBM 2124"},
-    {"IBM","IBM 2124-xxL"},
-    {"IBM","IBM 2126"},
-    {"IBM","IBM 2127"},
-    {"IBM","IBM 2128 MM75 Multimedia"},
-    {"IBM","IBM 2131"},
-    {"IBM","IBM 2132"},
-    {"IBM","IBM 2215"},
-    {"IBM","IBM 2235 C50 "},
-    {"IBM","IBM 2236"},
-    {"IBM","IBM 2237 C71 "},
-    {"IBM","IBM 2238"},
-    {"IBM","IBM 2248"},
-    {"IBM","IBM 2264"},
-    {"IBM","IBM 2414-A04"},
-    {"IBM","IBM 2414-A07"},
-    {"IBM","IBM 2414-A17"},
-    {"IBM","IBM 5574-N15"},
-    {"IBM","IBM 5574-N17"},
-    {"IBM","IBM 5574-S15"},
-    {"IBM","IBM 5574-S17"},
-    {"IBM","IBM 6312"},
-    {"IBM","IBM 6314"},
-    {"IBM","IBM 6315"},
-    {"IBM","IBM 6317"},
-    {"IBM","IBM 6319"},
-    {"IBM","IBM 6321"},
-    {"IBM","IBM 6322"},
-    {"IBM","IBM 6324"},
-    {"IBM","IBM 6325"},
-    {"IBM","IBM 6327"},
-    {"IBM","IBM 6333 E51"},
-    {"IBM","IBM 6540 G42 "},
-    {"IBM","IBM 6541 G51 "},
-    {"IBM","IBM 6546"},
-    {"IBM","IBM 6546 G52 "},
-    {"IBM","IBM 6546 G52 & G54 "},
-    {"IBM","IBM 6547"},
-    {"IBM","IBM 6547 G72 "},
-    {"IBM","IBM 6547 G72 & G74 "},
-    {"IBM","IBM 6549 G94 "},
-    {"IBM","IBM 6556 P72 "},
-    {"IBM","IBM 6557 P92 "},
-    {"IBM","IBM 6558 P202 "},
-    {"IBM","IBM 7095"},
-    {"IBM","IBM 7097"},
-    {"IBM","IBM 8504"},
-    {"IBM","IBM 8511"},
-    {"IBM","IBM 8512"},
-    {"IBM","IBM 8513"},
-    {"IBM","IBM 8514"},
-    {"IBM","IBM 8515"},
-    {"IBM","IBM 8517"},
-    {"IBM","IBM 8518"},
-    {"IBM","IBM 9483"},
-    {"IBM","IBM 9493 T56A"},
-    {"IBM","IBM 9495"},
-    {"IBM","IBM 9497 T86D"},
-    {"IBM","IBM 9504"},
-    {"IBM","IBM 9511 T54H"},
-    {"IBM","IBM 9513 T55A TFT Monitor "},
-    {"IBM","IBM 9513 T55D TFT Monitor "},
-    {"IBM","IBM 9514-B TFT Panel "},
-    {"IBM","IBM 9515"},
-    {"IBM","IBM 9516-B TFT Panel "},
-    {"IBM","IBM 9517"},
-    {"IBM","IBM 9518"},
-    {"IBM","IBM 9519 T85A"},
-    {"IBM","IBM 9519 T85D"},
-    {"IBM","IBM 9521"},
-    {"IBM","IBM 9524"},
-    {"IBM","IBM 9525"},
-    {"IBM","IBM 9525-0X1"},
-    {"IBM","IBM 9527"},
-    {"IBM","IBM A70"},
-    {"IBM","IBM Aptiva 9900"},
-    {"IBM","IBM Aptiva 9901"},
-    {"IBM","IBM Aptiva Vision 2407"},
-    {"IBM","IBM G200"},
-    {"IBM","IBM G41"},
-    {"IBM","IBM G50"},
-    {"IBM","IBM G70"},
-    {"IBM","IBM G78"},
-    {"IBM","IBM MM55"},
-    {"IBM","IBM MM75"},
-    {"IBM","IBM P200"},
-    {"IBM","IBM P201"},
-    {"IBM","IBM P50"},
-    {"IBM","IBM P70"},
-    {"IBM","IBM ThinkPad 1024x768 DSTN/HPA LCD panel"},
-    {"IBM","IBM ThinkPad 1024x768 TFT LCD panel"},
-    {"IBM","IBM ThinkPad 1280x1024 TFT LCD panel"},
-    {"IBM","IBM ThinkPad 640x480 DSTN/HPA LCD panel"},
-    {"IBM","IBM ThinkPad 640x480 TFT LCD panel"},
-    {"IBM","IBM ThinkPad 800x600 DSTN/HPA LCD panel"},
-    {"IBM","IBM ThinkPad 800x600 TFT LCD panel"},
-    {"ICL","Fujitsu ICL ErgoPro 140v"},
-    {"ICL","Fujitsu ICL ErgoPro 141p"},
-    {"ICL","Fujitsu ICL ErgoPro 141v"},
-    {"ICL","Fujitsu ICL ErgoPro 142v"},
-    {"ICL","Fujitsu ICL ErgoPro 151p"},
-    {"ICL","Fujitsu ICL ErgoPro 151p AutoBrite"},
-    {"ICL","Fujitsu ICL ErgoPro 151v"},
-    {"ICL","Fujitsu ICL ErgoPro 152v"},
-    {"ICL","Fujitsu ICL ErgoPro 171p"},
-    {"ICL","Fujitsu ICL ErgoPro 171v"},
-    {"ICL","Fujitsu ICL ErgoPro 172p"},
-    {"ICL","Fujitsu ICL ErgoPro 172p AutoBrite"},
-    {"ICL","Fujitsu ICL ErgoPro 172v"},
-    {"ICL","Fujitsu ICL ErgoPro 172v AutoBrite"},
-    {"ICL","Fujitsu ICL ErgoPro 211v"},
-    {"ICL","Fujitsu ICL ErgoPro e142"},
-    {"ICL","Fujitsu ICL ErgoPro e153"},
-    {"ICL","Fujitsu ICL ErgoPro e172"},
-    {"ICL","Fujitsu ICL ErgoPro e173"},
-    {"ICL","Fujitsu ICL ErgoPro e212"},
-    {"ICL","Fujitsu ICL ErgoPro x152"},
-    {"ICL","Fujitsu ICL ErgoPro x173"},
-    {"ICL","Fujitsu ICL ErgoPro x173a"},
-    {"ICL","ICL 14C"},
-    {"ICL","ICL 14M"},
-    {"ICL","ICL 14V"},
-    {"ICL","ICL 15V"},
-    {"ICL","ICL 17V"},
-    {"ICL","ICL ErgoPRO 14C"},
-    {"ICL","ICL ErgoPRO 15C"},
-    {"ICL","ICL ErgoPRO 17C"},
-    {"ICL","ICL ErgoPRO VE15C"},
-    {"ICL","ICL ErgoPRO VE15M"},
-    {"ICL","ICL SE14M"},
-    {"ICL","ICL VE15C"},
-    {"ICL","ICL VE17C"},
-    {"ICM","ICM LS-2517TS"},
-    {"ICM","ICM LS-2521F"},
-    {"ICM","ICM LS-2617FN"},
-    {"ICM","ICM LS-2617FNII"},
-    {"ICM","ICM LS-2815FN"},
-    {"ICM","ICM RS-A770N"},
-    {"ICM","ICM RS-A785N"},
-    {"ICM","ICM RS-S982H"},
-    {"Iiyama","Iiyama A101GT,    VisionMasterPro 501"},
-    {"Iiyama","Iiyama A102GT"},
-    {"Iiyama","Iiyama A102GT,    VisionMasterPro 502"},
-    {"Iiyama","Iiyama A201HT, VisionMaster Pro 510"},
-    {"Iiyama","Iiyama A701GT,       VisionMasterPro 400"},
-    {"Iiyama","Iiyama A702HT, VisionMaster Pro 410"},
-    {"Iiyama","Iiyama A705MT, VisionMaster Pro 411 /i70A"},
-    {"Iiyama","Iiyama A901HT"},
-    {"Iiyama","Iiyama A901HT,       VisionMaster Pro 450"},
-    {"Iiyama","Iiyama A902MT,    VisionMaster Pro 451"},
-    {"Iiyama","Iiyama DR-3114"},
-    {"Iiyama","Iiyama MA901U,    VisionMaster Pro 452"},
-    {"Iiyama","Iiyama MF-5014A"},
-    {"Iiyama","Iiyama MF-5015A"},
-    {"Iiyama","Iiyama MF-5017"},
-    {"Iiyama","Iiyama MF-5021"},
-    {"Iiyama","Iiyama MF-5115"},
-    {"Iiyama","Iiyama MF-5117"},
-    {"Iiyama","Iiyama MF-5121A"},
-    {"Iiyama","Iiyama MF-5214A"},
-    {"Iiyama","Iiyama MF-5215A"},
-    {"Iiyama","Iiyama MF-5217"},
-    {"Iiyama","Iiyama MF-5221"},
-    {"Iiyama","Iiyama MF-5315"},
-    {"Iiyama","Iiyama MF-5317"},
-    {"Iiyama","Iiyama MF-5317AJ"},
-    {"Iiyama","Iiyama MF-5321"},
-    {"Iiyama","Iiyama MF-5421"},
-    {"Iiyama","Iiyama MF-5621"},
-    {"Iiyama","Iiyama MF-8217"},
-    {"Iiyama","Iiyama MF-8217AJ"},
-    {"Iiyama","Iiyama MF-8221"},
-    {"Iiyama","Iiyama MF-8221E/T,    VisionMaster"},
-    {"Iiyama","Iiyama MF-8317AJ"},
-    {"Iiyama","Iiyama MF-8515F"},
-    {"Iiyama","Iiyama MF-8515G,      VisionMaster"},
-    {"Iiyama","Iiyama MF-8517"},
-    {"Iiyama","Iiyama MF-8517B"},
-    {"Iiyama","Iiyama MF-8615"},
-    {"Iiyama","Iiyama MF-8615A"},
-    {"Iiyama","Iiyama MF-8615B"},
-    {"Iiyama","Iiyama MF-8617"},
-    {"Iiyama","Iiyama MF-8617B"},
-    {"Iiyama","Iiyama MF-8617E/T,    VisionMaster"},
-    {"Iiyama","Iiyama MF-8617ES,     VisionMaster"},
-    {"Iiyama","Iiyama MF-8721E,      VisionMaster"},
-    {"Iiyama","Iiyama MF901U,    VisionMaster 452"},
-    {"Iiyama","Iiyama MR-5314"},
-    {"Iiyama","Iiyama MT-8621"},
-    {"Iiyama","Iiyama MT-9017E/T,    VisionMasterPro"},
-    {"Iiyama","Iiyama MT-9021E/T,    VisionMasterPro"},
-    {"Iiyama","Iiyama MT-9221,       VisionMasterPro"},
-    {"Iiyama","Iiyama S101GT,    VisionMaster 501"},
-    {"Iiyama","Iiyama S102GT"},
-    {"Iiyama","Iiyama S102GT,    VisionMaster 502"},
-    {"Iiyama","Iiyama S103MT,    VisionMaster 503"},
-    {"Iiyama","Iiyama S104MT,    VisionMaster 504"},
-    {"Iiyama","Iiyama S500M1"},
-    {"Iiyama","Iiyama S700JT1"},
-    {"Iiyama","Iiyama S701GT,       VisionMaster 400"},
-    {"Iiyama","Iiyama S702GT,       VisionMaster 400"},
-    {"Iiyama","Iiyama S703HT,       VisionMaster 403"},
-    {"Iiyama","Iiyama S704HT,       VisionMaster 404"},
-    {"Iiyama","Iiyama S705MT,       VisionMaster 405"},
-    {"Iiyama","Iiyama S901GT"},
-    {"Iiyama","Iiyama S901GT,       VisionMaster 450"},
-    {"Iiyama","Iiyama S902JT, VisionMaster Pro 451"},
-    {"Iiyama","Iiyama TSA3931HT,     Prolite39 "},
-    {"Iiyama","Iiyama TSA4632HT,     Prolite46 "},
-    {"Iiyama","Iiyama TSA4633JT,     Prolite46b"},
-    {"Iiyama","Iiyama TSA4634JT"},
-    {"Iiyama","Iiyama TXA3601GT"},
-    {"Iiyama","Iiyama TXA3602GT,     Prolite36 "},
-    {"Iiyama","Iiyama TXA3611/3621HT Prolite36 "},
-    {"Iiyama","Iiyama TXA3611/3621HT,     Prolite36 "},
-    {"Iiyama","Iiyama TXA3612JT,             Prolite36c "},
-    {"Iiyama","Iiyama TXA3811/3821HT,     Prolite38 "},
-    {"Iiyama","Iiyama TXA3811HT"},
-    {"Iiyama","Iiyama TXA3812JT/3822JT ,     Prolite38e/38f "},
-    {"Iiyama","Iiyama TXA3813/3823MT"},
-    {"Iiyama","Iiyama TXA3832HT,     Prolite38c "},
-    {"Iiyama","Iiyama TXA3833JT ,            Prolite38g "},
-    {"Iiyama","Iiyama Vision Master MF-8221"},
-    {"Iiyama","Iiyama Vision Master MF-8317"},
-    {"Iiyama","Iiyama Vision Master MF-8421"},
-    {"Iiyama","Iiyama Vision Master MF-8617"},
-    {"Iiyama","Iiyama Vision Master MF-8617E"},
-    {"Iiyama","Iiyama Vision Master MF-8621"},
-    {"Iiyama","Iiyama Vision Master Pro 21 MT-9121"},
-    {"Ikegami Electronics, Inc.","Ikegami C/CDE-165VB"},
-    {"Ikegami Electronics, Inc.","Ikegami C/DM-2010A"},
-    {"Ikegami Electronics, Inc.","Ikegami C/DM-2060"},
-    {"Ikegami Electronics, Inc.","Ikegami CN-20"},
-    {"Ikegami Electronics, Inc.","Ikegami CT-17A"},
-    {"Ikegami Electronics, Inc.","Ikegami CT-20"},
-    {"Ikegami Electronics, Inc.","Ikegami CT-21BJ"},
-    {"Image Systems Corp.","Image Systems C21LMAX"},
-    {"Image Systems Corp.","Image Systems M24LMAX"},
-    {"Impression","Impression 7SP"},
-    {"Intra Electronics USA, Inc.","Intra Electronics USA CM-1403"},
-    {"Iocomm International Technology Corp.","Iocomm CM-7126"},
-    {"JVC Information Products Co.","JVC GD-H4220US"},
-    {"KFC Computek Components Corp.","KFC Computek CA-17"},
-    {"KFC Computek Components Corp.","KFC Computek CH-14"},
-    {"KFC Computek Components Corp.","KFC Computek CM-14"},
-    {"KLH Computers","KLH Computers MN275"},
-    {"KTX EDGE Technology","KTX BM15D 1998-10-07 "},
-    {"KTX EDGE Technology","KTX BM15K 1998-10-07 "},
-    {"KTX EDGE Technology","KTX BM17E 1998-10-07 "},
-    {"KTX EDGE Technology","KTX BM17K 1998-10-07 "},
-    {"KTX EDGE Technology","KTX BM19F 1998-10-07 "},
-    {"Leading Technology, Inc.","Leading Technology 1730S"},
-    {"LG Electronics Inc.","77E"},
-    {"LG Electronics Inc.","FLATRON 773FT"},
-    {"LG Electronics Inc.","FLATRON 776FM"},
-    {"LG Electronics Inc.","FLATRON 777FN PLUS"},
-    {"LG Electronics Inc.","FLATRON 793FT"},
-    {"LG Electronics Inc.","FLATRON 793FT PLUS"},
-    {"LG Electronics Inc.","FLATRON 995FT"},
-    {"LG Electronics Inc.","LG 1430"},
-    {"LG Electronics Inc.","LG 1455"},
-    {"LG Electronics Inc.","LG 1455D"},
-    {"LG Electronics Inc.","LG 1455DL"},
-    {"LG Electronics Inc.","LG 1460DL"},
-    {"LG Electronics Inc.","LG 1461D"},
-    {"LG Electronics Inc.","LG 1462DM"},
-    {"LG Electronics Inc.","LG 1465DL"},
-    {"LG Electronics Inc.","LG 1465DLS"},
-    {"LG Electronics Inc.","LG 1466"},
-    {"LG Electronics Inc.","LG 1466DM"},
-    {"LG Electronics Inc.","LG 1466LR"},
-    {"LG Electronics Inc.","LG 1466LRS"},
-    {"LG Electronics Inc.","LG 1467"},
-    {"LG Electronics Inc.","LG 1468"},
-    {"LG Electronics Inc.","LG 1485"},
-    {"LG Electronics Inc.","LG 1505"},
-    {"LG Electronics Inc.","LG 1505S"},
-    {"LG Electronics Inc.","LG 1515"},
-    {"LG Electronics Inc.","LG 1520"},
-    {"LG Electronics Inc.","LG 1520DM"},
-    {"LG Electronics Inc.","LG 1527"},
-    {"LG Electronics Inc.","LG 1725"},
-    {"LG Electronics Inc.","LG 1725DM"},
-    {"LG Electronics Inc.","LG 1725s"},
-    {"LG Electronics Inc.","LG 1727"},
-    {"LG Electronics Inc.","LG 1730DM"},
-    {"LG Electronics Inc.","LG 2010"},
-    {"LG Electronics Inc.","LG 500LC (15.1inch LCD Monitor)"},
-    {"LG Electronics Inc.","LG 77G"},
-    {"LG Electronics Inc.","LG 99G"},
-    {"LG Electronics Inc.","LG CB770DE"},
-    {"LG Electronics Inc.","LG CB770DM"},
-    {"LG Electronics Inc.","LG CB790C"},
-    {"LG Electronics Inc.","LG CB795C"},
-    {"LG Electronics Inc.","LG CB910C"},
-    {"LG Electronics Inc.","LG CF786C"},
-    {"LG Electronics Inc.","LG CF900C"},
-    {"LG Electronics Inc.","LG CS555DM"},
-    {"LG Electronics Inc.","LG CS585DM"},
-    {"LG Electronics Inc.","LG CS771DM"},
-    {"LG Electronics Inc.","LG CS777BY"},
-    {"LG Electronics Inc.","LG CS778DC"},
-    {"LG Electronics Inc.","LG CS788C"},
-    {"LG Electronics Inc.","LG CS990DC"},
-    {"LG Electronics Inc.","LG CS990DE"},
-    {"LG Electronics Inc.","LG CS991DC"},
-    {"LG Electronics Inc.","LG FLATRON 774FT"},
-    {"LG Electronics Inc.","LG FLATRON 775FT"},
-    {"LG Electronics Inc.","LG Flatron 78FT"},
-    {"LG Electronics Inc.","LG Flatron 78FT Plus"},
-    {"LG Electronics Inc.","LG FLATRON 795FT"},
-    {"LG Electronics Inc.","LG FLATRON 795FT PLUS"},
-    {"LG Electronics Inc.","LG FLATRON 795FT PLUS(FB795CU)"},
-    {"LG Electronics Inc.","LG FLATRON 795FT(FB795CE)"},
-    {"LG Electronics Inc.","LG FLATRON 915FT PLUS"},
-    {"LG Electronics Inc.","LG FLATRON LCD 285LT"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575LE"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575LM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575LS"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575MM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575MS"},
-    {"LG Electronics Inc.","LG FLATRON LCD 575SM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 576LU"},
-    {"LG Electronics Inc.","LG FLATRON LCD 577LH"},
-    {"LG Electronics Inc.","LG FLATRON LCD 577LM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 680LE"},
-    {"LG Electronics Inc.","LG FLATRON LCD 680LM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 680LT"},
-    {"LG Electronics Inc.","LG FLATRON LCD 680LU"},
-    {"LG Electronics Inc.","LG FLATRON LCD 680UM"},
-    {"LG Electronics Inc.","LG FLATRON LCD 885LE"},
-    {"LG Electronics Inc.","LG LB570BZ"},
-    {"LG Electronics Inc.","LG StudioWorks 20i"},
-    {"LG Electronics Inc.","LG StudioWorks 216SC"},
-    {"LG Electronics Inc.","LG StudioWorks 216Si"},
-    {"LG Electronics Inc.","LG StudioWorks 221U"},
-    {"LG Electronics Inc.","LG StudioWorks 28i"},
-    {"LG Electronics Inc.","LG StudioWorks 28T5"},
-    {"LG Electronics Inc.","LG StudioWorks 440Si"},
-    {"LG Electronics Inc.","LG StudioWorks 441"},
-    {"LG Electronics Inc.","LG StudioWorks 44i"},
-    {"LG Electronics Inc.","LG StudioWorks 44m"},
-    {"LG Electronics Inc.","LG StudioWorks 450N"},
-    {"LG Electronics Inc.","LG StudioWorks 45i"},
-    {"LG Electronics Inc.","LG StudioWorks 45V"},
-    {"LG Electronics Inc.","LG StudioWorks 520Si"},
-    {"LG Electronics Inc.","LG StudioWorks 520Si(CB550BN)"},
-    {"LG Electronics Inc.","LG StudioWorks 521Mi"},
-    {"LG Electronics Inc.","LG StudioWorks 54m"},
-    {"LG Electronics Inc.","LG StudioWorks 550M"},
-    {"LG Electronics Inc.","LG StudioWorks 55i"},
-    {"LG Electronics Inc.","LG StudioWorks 55V"},
-    {"LG Electronics Inc.","LG StudioWorks 560N"},
-    {"LG Electronics Inc.","LG StudioWorks 560SC"},
-    {"LG Electronics Inc.","LG StudioWorks 560Si"},
-    {"LG Electronics Inc.","LG StudioWorks 56i"},
-    {"LG Electronics Inc.","LG StudioWorks 56m"},
-    {"LG Electronics Inc.","LG StudioWorks 56T"},
-    {"LG Electronics Inc.","LG StudioWorks 575C"},
-    {"LG Electronics Inc.","LG StudioWorks 575N"},
-    {"LG Electronics Inc.","LG StudioWorks 57i"},
-    {"LG Electronics Inc.","LG StudioWorks 57M"},
-    {"LG Electronics Inc.","LG StudioWorks 57M(MB576BM)"},
-    {"LG Electronics Inc.","LG StudioWorks 57T5"},
-    {"LG Electronics Inc.","LG StudioWorks 5D"},
-    {"LG Electronics Inc.","LG StudioWorks 5DT"},
-    {"LG Electronics Inc.","LG StudioWorks 74i"},
-    {"LG Electronics Inc.","LG StudioWorks 74m"},
-    {"LG Electronics Inc.","LG StudioWorks 760SC"},
-    {"LG Electronics Inc.","LG StudioWorks 760Si"},
-    {"LG Electronics Inc.","LG StudioWorks 76i"},
-    {"LG Electronics Inc.","LG StudioWorks 76m"},
-    {"LG Electronics Inc.","LG StudioWorks 76T"},
-    {"LG Electronics Inc.","LG StudioWorks 770Si"},
-    {"LG Electronics Inc.","LG StudioWorks 775C"},
-    {"LG Electronics Inc.","LG StudioWorks 775N"},
-    {"LG Electronics Inc.","LG StudioWorks 77i"},
-    {"LG Electronics Inc.","LG StudioWorks 77M"},
-    {"LG Electronics Inc.","LG StudioWorks 77M(MB776BM)"},
-    {"LG Electronics Inc.","LG StudioWorks 77ME"},
-    {"LG Electronics Inc.","LG StudioWorks 77S"},
-    {"LG Electronics Inc.","LG StudioWorks 77T5"},
-    {"LG Electronics Inc.","LG StudioWorks 78D"},
-    {"LG Electronics Inc.","LG StudioWorks 78DT"},
-    {"LG Electronics Inc.","LG StudioWorks 78DT5"},
-    {"LG Electronics Inc.","LG StudioWorks 78i"},
-    {"LG Electronics Inc.","LG StudioWorks 78m"},
-    {"LG Electronics Inc.","LG StudioWorks 78T"},
-    {"LG Electronics Inc.","LG StudioWorks 78T5"},
-    {"LG Electronics Inc.","LG StudioWorks 790SC"},
-    {"LG Electronics Inc.","LG StudioWorks 790UR"},
-    {"LG Electronics Inc.","LG StudioWorks 795SC"},
-    {"LG Electronics Inc.","LG StudioWorks 795UR"},
-    {"LG Electronics Inc.","LG StudioWorks 7D"},
-    {"LG Electronics Inc.","LG StudioWorks 7DT"},
-    {"LG Electronics Inc.","LG StudioWorks 880LC"},
-    {"LG Electronics Inc.","LG StudioWorks 910SC"},
-    {"LG Electronics Inc.","LG StudioWorks 910UC"},
-    {"LG Electronics Inc.","LG StudioWorks 912E"},
-    {"LG Electronics Inc.","LG StudioWorks 912U"},
-    {"LG Electronics Inc.","LG StudioWorks 995E"},
-    {"LG Electronics Inc.","LG StudioWorks 995E PLUS"},
-    {"LG Electronics Inc.","LG StudioWorks 995E(CB995CE)"},
-    {"LG Electronics Inc.","LG StudioWorks 995U"},
-    {"LG Electronics Inc.","LG StudioWorks 99T"},
-    {"LG Electronics Inc.","LG StudioWorks/FLATRON LCD 570LE"},
-    {"LG Electronics Inc.","LG StudioWorks/FLATRON LCD 570LS"},
-    {"LG Electronics Inc.","LG StudioWorks/FLATRON LCD 870LE"},
-    {"LG Electronics Inc.","LG StudioWorks20i"},
-    {"LG Electronics Inc.","LG Studioworks28i"},
-    {"LG Electronics Inc.","LG Studioworks45I"},
-    {"LG Electronics Inc.","LG Studioworks55i"},
-    {"LG Electronics Inc.","LG StudioWorks56i"},
-    {"LG Electronics Inc.","LG StudioWorks56m"},
-    {"LG Electronics Inc.","LG Studioworks57i"},
-    {"LG Electronics Inc.","LG StudioWorks74m"},
-    {"LG Electronics Inc.","LG StudioWorks76i"},
-    {"LG Electronics Inc.","LG StudioWorks76m"},
-    {"LG Electronics Inc.","LG Studioworks77i"},
-    {"LG Electronics Inc.","LG StudioWorks78i"},
-    {"LG Electronics Inc.","LG StudioWorks78T"},
-    {"LG Electronics Inc.","StudioWorks 452V"},
-    {"LG Electronics Inc.","StudioWorks 550D"},
-    {"LG Electronics Inc.","StudioWorks 552V"},
-    {"LG Electronics Inc.","StudioWorks 553V"},
-    {"LG Electronics Inc.","StudioWorks 560A"},
-    {"LG Electronics Inc.","StudioWorks 561N"},
-    {"LG Electronics Inc.","StudioWorks 570LS-noir"},
-    {"LG Electronics Inc.","StudioWorks 575E"},
-    {"LG Electronics Inc.","StudioWorks 575N-noir"},
-    {"LG Electronics Inc.","StudioWorks 775E"},
-    {"LG Electronics Inc.","StudioWorks 775N-noir"},
-    {"LG Electronics Inc.","StudioWorks 795E"},
-    {"LG Electronics Inc.","StudioWorks 995SU"},
-    {"LG Electronics Inc.","StudioWorks/HiSync 291U"},
-    {"LG Electronics Inc.","StudioWorks/HiSync 573E"},
-    {"LG Electronics Inc.","StudioWorks/HiSync 573N"},
-    {"LG Electronics Inc.","StudioWorks/HiSync 773E"},
-    {"LG Electronics Inc.","StudioWorks/HiSync 773N"},
-    {"LG Electronics Inc.","WS771A"},
-    {"LG Electronics Inc.","WS771B"},
-    {"Likom Technology Sdn Bhd","Likom 4AL-N"},
-    {"Likom Technology Sdn Bhd","Likom 4AS-N"},
-    {"Likom Technology Sdn Bhd","Likom 5DL"},
-    {"Likom Technology Sdn Bhd","Likom C407"},
-    {"Likom Technology Sdn Bhd","Likom C408X"},
-    {"Likom Technology Sdn Bhd","Likom C5081"},
-    {"Likom Technology Sdn Bhd","Likom C5091"},
-    {"Likom Technology Sdn Bhd","Likom K703X"},
-    {"Likom Technology Sdn Bhd","Likom K903X"},
-    {"Likom Technology Sdn Bhd","Likom L4011"},
-    {"Likom Technology Sdn Bhd","Likom L5011"},
-    {"Likom Technology Sdn Bhd","Likom L503X"},
-    {"Likom Technology Sdn Bhd","Likom L703X"},
-    {"Link Computer, Inc.","Link Computer CE-8"},
-    {"Link Computer, Inc.","Link Computer CM-3"},
-    {"Lite-On, Inc.","Lite-On CM-2090M"},
-    {"Logitec","Logitec LCM-15"},
-    {"Logitec","Logitec LCM-17"},
-    {"Logitec","Logitec LCM-21"},
-    {"MAG","DX17Fe"},
-    {"MAG","MAG DX15N"},
-    {"MAG","MX14S"},
-    {"MAG","MX15F"},
-    {"MAG","MX17F/S"},
-    {"Mag Computronic (USA) Inc.","Mag Computronic Colorview/15"},
-    {"Mag Computronic (USA) Inc.","Mag Computronic PMV-14AC/plus"},
-    {"Mag Computronic (USA) Inc.","Mag Computronic PMV-1531"},
-    {"MAG Technology Co., Ltd.","MAG 410V2"},
-    {"MAG Technology Co., Ltd.","MAG 510V2"},
-    {"MAG Technology Co., Ltd.","MAG 570FD"},
-    {"MAG Technology Co., Ltd.","MAG 570V"},
-    {"MAG Technology Co., Ltd.","MAG 710V2"},
-    {"MAG Technology Co., Ltd.","MAG 720V2"},
-    {"MAG Technology Co., Ltd.","MAG 770T"},
-    {"MAG Technology Co., Ltd.","MAG 770V"},
-    {"MAG Technology Co., Ltd.","MAG 786FD"},
-    {"MAG Technology Co., Ltd.","MAG 796FD"},
-    {"MAG Technology Co., Ltd.","MAG 800V"},
-    {"MAG Technology Co., Ltd.","MAG 810FD"},
-    {"MAG Technology Co., Ltd.","MAG D410"},
-    {"MAG Technology Co., Ltd.","MAG DJ530"},
-    {"MAG Technology Co., Ltd.","MAG DJ530AV"},
-    {"MAG Technology Co., Ltd.","MAG DJ700"},
-    {"MAG Technology Co., Ltd.","MAG DJ702"},
-    {"MAG Technology Co., Ltd.","MAG DJ702E"},
-    {"MAG Technology Co., Ltd.","MAG DJ707"},
-    {"MAG Technology Co., Ltd.","MAG DJ707AV"},
-    {"MAG Technology Co., Ltd.","MAG DJ717"},
-    {"MAG Technology Co., Ltd.","MAG DJ800"},
-    {"MAG Technology Co., Ltd.","MAG DJ810"},
-    {"MAG Technology Co., Ltd.","MAG DJ920"},
-    {"MAG Technology Co., Ltd.","MAG DJ925T"},
-    {"MAG Technology Co., Ltd.","MAG DX-1595"},
-    {"MAG Technology Co., Ltd.","MAG DX-15T"},
-    {"MAG Technology Co., Ltd.","MAG DX-1795"},
-    {"MAG Technology Co., Ltd.","MAG DX-700T"},
-    {"MAG Technology Co., Ltd.","MAG DX1495"},
-    {"MAG Technology Co., Ltd.","MAG DX1595"},
-    {"MAG Technology Co., Ltd.","MAG DX15F"},
-    {"MAG Technology Co., Ltd.","MAG DX15T"},
-    {"MAG Technology Co., Ltd.","MAG DX1795"},
-    {"MAG Technology Co., Ltd.","MAG DX17F"},
-    {"MAG Technology Co., Ltd.","MAG DX17T"},
-    {"MAG Technology Co., Ltd.","MAG DX21F"},
-    {"MAG Technology Co., Ltd.","MAG DX500AV"},
-    {"MAG Technology Co., Ltd.","MAG DX500T"},
-    {"MAG Technology Co., Ltd.","MAG dx700e"},
-    {"MAG Technology Co., Ltd.","MAG DX700T"},
-    {"MAG Technology Co., Ltd.","MAG DX715T"},
-    {"MAG Technology Co., Ltd.","MAG DX725T"},
-    {"MAG Technology Co., Ltd.","MAG dx800"},
-    {"MAG Technology Co., Ltd.","MAG LT530C"},
-    {"MAG Technology Co., Ltd.","MAG LT541C"},
-    {"MAG Technology Co., Ltd.","MAG LT541F"},
-    {"MAG Technology Co., Ltd.","MAG LT561D"},
-    {"MAG Technology Co., Ltd.","MAG LT561E"},
-    {"MAG Technology Co., Ltd.","MAG LX1450"},
-    {"MAG Technology Co., Ltd.","MAG LX1450LG"},
-    {"MAG Technology Co., Ltd.","MAG LX1564LG"},
-    {"MAG Technology Co., Ltd.","MAG MX14S"},
-    {"MAG Technology Co., Ltd.","MAG MX15F"},
-    {"MAG Technology Co., Ltd.","MAG MX17F"},
-    {"MAG Technology Co., Ltd.","MAG MX17F/S"},
-    {"MAG Technology Co., Ltd.","MAG MX17FG"},
-    {"MAG Technology Co., Ltd.","MAG MX21F"},
-    {"MAG Technology Co., Ltd.","MAG MX21NT"},
-    {"MAG Technology Co., Ltd.","MAG MXE15F"},
-    {"MAG Technology Co., Ltd.","MAG MXP17F"},
-    {"MAG Technology Co., Ltd.","MAG PMV14SV"},
-    {"MAG Technology Co., Ltd.","MAG XJ500"},
-    {"MAG Technology Co., Ltd.","MAG XJ500T"},
-    {"MAG Technology Co., Ltd.","MAG XJ530"},
-    {"MAG Technology Co., Ltd.","MAG XJ700"},
-    {"MAG Technology Co., Ltd.","MAG XJ700T"},
-    {"MAG Technology Co., Ltd.","MAG XJ707"},
-    {"MAG Technology Co., Ltd.","MAG XJ717"},
-    {"MAG Technology Co., Ltd.","MAG xj770"},
-    {"MAG Technology Co., Ltd.","MAG XJ796"},
-    {"MAG Technology Co., Ltd.","MAG XJ810"},
-    {"MAG Technology Co., Ltd.","MAG XJ810U"},
-    {"MAG Technology Co., Ltd.","MAG XJ910"},
-    {"MAXDATA Computer GmbH","Belinea 10 14 10"},
-    {"MAXDATA Computer GmbH","Belinea 10 40 10"},
-    {"MAXDATA Computer GmbH","Belinea 10 40 40"},
-    {"MAXDATA Computer GmbH","Belinea 10 40 50"},
-    {"MAXDATA Computer GmbH","Belinea 10 40 60"},
-    {"Maxdata Computer GmbH","Belinea 10 40 65"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 30"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 35"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 45"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 50"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 60"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 65"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 66"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 70"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 75"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 76"},
-    {"MAXDATA Computer GmbH","Belinea 10 50 90"},
-    {"Maxdata Computer GmbH","Belinea 10 50 95"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 20"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 40"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 50"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 60"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 70"},
-    {"Maxdata Computer GmbH","Belinea 10 55 75"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 76"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 86"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 90"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 95"},
-    {"MAXDATA Computer GmbH","Belinea 10 55 96"},
-    {"MAXDATA Computer GmbH","Belinea 10 60 40"},
-    {"MAXDATA Computer GmbH","Belinea 10 60 50"},
-    {"MAXDATA Computer GmbH","Belinea 10 60 90"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 10"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 15"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 20"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 30"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 35"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 40"},
-    {"MAXDATA Computer GmbH","Belinea 10 70 50"},
-    {"MAXDATA Computer GmbH","Belinea 10 80 10"},
-    {"MAXDATA Computer GmbH","Belinea 10 80 15"},
-    {"MAXDATA Computer GmbH","Belinea 10 80 90"},
-    {"MAXDATA Computer GmbH","Belinea 10 80 95"},
-    {"Microvitec, Inc.","Microvitec 1020/LP"},
-    {"Microvitec, Inc.","Microvitec 1020/SP"},
-    {"Microvitec, Inc.","Microvitec 2012/LP"},
-    {"Microvitec, Inc.","Microvitec 2014/LP"},
-    {"Microvitec, Inc.","Microvitec 2014/SVGA"},
-    {"Microvitec, Inc.","Microvitec 2019/SP"},
-    {"Microvitec, Inc.","Microvitec 4015/FST"},
-    {"Microvitec, Inc.","Microvitec 604/FST"},
-    {"Microvitec, Inc.","Microvitec 704/FST"},
-    {"Midori","Midori Denshi VSA-151"},
-    {"Midori","Midori Denshi VSA-171"},
-    {"miro Computer Products AG","miroD1568"},
-    {"miro Computer Products AG","miroD1769"},
-    {"miro Computer Products AG","PROOFSCREEN miroC1768"},
-    {"miro Computer Products AG","PROOFSCREEN miroC1782"},
-    {"miro Computer Products AG","PROOFSCREEN miroC2085 E"},
-    {"miro Computer Products AG","PROOFSCREEN miroC21107"},
-    {"miro Computer Products AG","PROOFSCREEN miroC2185"},
-    {"miro Computer Products AG","PROOFSCREEN miroC2193"},
-    {"MITAC","MITAC 1450FD"},
-    {"MITAC","MITAC 1450FV"},
-    {"MITAC","MITAC 1450PD"},
-    {"MITAC","MITAC 1564FD/1564FS"},
-    {"MITAC","MITAC 1564FS/D"},
-    {"MITAC","MITAC 1564PDM"},
-    {"MITAC","MITAC 1766PD"},
-    {"MITAC","MITAC 1769FD"},
-    {"Mitsuba Corp.","Mitsuba Corp. 710MH"},
-    {"Mitsubishi Electric Australia","Diamond View 1554"},
-    {"Mitsubishi Electric Australia","Diamond View 1554e"},
-    {"Mitsubishi Electric Australia","Diamond View 1566i"},
-    {"Mitsubishi Electric Australia","Diamond View 1569i"},
-    {"Mitsubishi Electric Australia","Diamond View 1570i"},
-    {"Mitsubishi Electric Australia","Diamond View 1768i"},
-    {"Mitsubishi Electric Australia","Diamond View 1770e"},
-    {"Mitsubishi Electric Australia","Diamond View 1772e"},
-    {"Mitsubishi Electric Australia","Diamond View 1772ie"},
-    {"Mitsubishi Electric Australia","Diamond View 1795DT"},
-    {"Mitsubishi Electric Australia","Diamond View 1995"},
-    {"Mitsubishi Electric Australia","Diamond View 2107"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 100 (TFW1105)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 120u (TFA1105)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 200 (NSH1117)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 70 (TF-7700P)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 71 (TFV6708)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 72 (TFV-8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 72 (TFV8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 73 (N9705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Plus 91 (NFL9905)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 1000 (TFX1105)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 1010 (TUX1107)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 14 (FW6405)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 14 Plus (SD45xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 15FS (SD56xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 15FS (SD56xxC)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 17 (TFS6705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 17TX (TFG8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 20 (HL7955)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 2020u (NUB1107)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 2040u (NSB1107)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 2045u (NSH1157)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 20X (FR8905)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 21FS (FFL7165)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 21T (THZ8155)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 21TX (THN9105)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 26H (HJ6505)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 26M (HC3505)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 29 (XC2930)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 37 (XC3725)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 67TXV (TFV6705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 700 (TFK9705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 710 (NFF8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 710s (NFN8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 720 (NFN9705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 87TXM (TFM8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 900u (NFJ9905)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 91TXM (TFW9105)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro 920 (NUR1905)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro SVGA (SD43xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Pro VGA (SD41xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 15FS (SD55xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 15HX (SD57xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 15HX (SD57xxC)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 15VX (SD58xx)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 17FS (FFY7705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 17HX (FFF8705)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 20 (HL6945/55)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 20H (FR8905)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 20M (HC3925)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 21 (FFL7165)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 33 (XC3315)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 37 (XC3715)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 50 (SD5904)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 70 (SD7704)"},
-    {"Mitsubishi Electronics","Mitsubishi Diamond Scan 90e (FFT9905)"},
-    {"Mitsubishi Electronics","Mitsubishi FHL32WEXII"},
-    {"Mitsubishi Electronics","Mitsubishi HC39PEX"},
-    {"Mitsubishi Electronics","Mitsubishi HL59PEX"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 151A (LXA572WB)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 40 (LXA420W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 50 (LXA520W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 51 (LXA530W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 52 (LXA550W/WB)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 52 (LXA565W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 580 (LXA580W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 80 (LSA810W)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 80 (LSA820W/WB)"},
-    {"Mitsubishi Electronics","Mitsubishi LCD 80 (LSA831W)"},
-    {"Mitsubishi Electronics","Mitsubishi LVP-X300 Projector (LVP-X300)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView 29 (AM2752)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView 33 (XC3315)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView 37 (XC3716)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView 37 Plus (XC3717)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView Pro 29 (XC2930)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView Pro 37 (XC3730)"},
-    {"Mitsubishi Electronics","Mitsubishi MegaView Pro 42 (AM4201)"},
-    {"Mitsubishi Electronics","MITSUBISHI MERLIN"},
-    {"Mitsubishi Electronics","Mitsubishi PC Division V70 (XJ63754)"},
-    {"Mitsubishi Electronics","Mitsubishi Precise Point 5800"},
-    {"Mitsubishi Electronics","Mitsubishi Precise Point 8705"},
-    {"Mitsubishi Electronics","Mitsubishi Precise Point 8905"},
-    {"Mitsubishi Electronics","Mitsubishi RD15D"},
-    {"Mitsubishi Electronics","Mitsubishi RD15DII"},
-    {"Mitsubishi Electronics","Mitsubishi RD15G"},
-    {"Mitsubishi Electronics","Mitsubishi RD15M"},
-    {"Mitsubishi Electronics","Mitsubishi RD17F"},
-    {"Mitsubishi Electronics","Mitsubishi RD17G"},
-    {"Mitsubishi Electronics","Mitsubishi RD17GII"},
-    {"Mitsubishi Electronics","Mitsubishi RD17GR"},
-    {"Mitsubishi Electronics","Mitsubishi RD17GZ"},
-    {"Mitsubishi Electronics","Mitsubishi RD17S"},
-    {"Mitsubishi Electronics","Mitsubishi RD17Y"},
-    {"Mitsubishi Electronics","Mitsubishi RD17Y/V"},
-    {"Mitsubishi Electronics","Mitsubishi RD21E"},
-    {"Mitsubishi Electronics","Mitsubishi RD21EII"},
-    {"Mitsubishi Electronics","Mitsubishi RD21EIII"},
-    {"Mitsubishi Electronics","Mitsubishi RD21G"},
-    {"Mitsubishi Electronics","Mitsubishi RD21GH"},
-    {"Mitsubishi Electronics","Mitsubishi RD21GII"},
-    {"Mitsubishi Electronics","Mitsubishi RD21GIII"},
-    {"Mitsubishi Electronics","Mitsubishi RD21GX"},
-    {"Mitsubishi Electronics","Mitsubishi RD21Z"},
-    {"Mitsubishi Electronics","Mitsubishi RD21ZII"},
-    {"Mitsubishi Electronics","Mitsubishi RDT151"},
-    {"Mitsubishi Electronics","Mitsubishi SpectraView 1000"},
-    {"Mitsubishi Electronics","Mitsubishi SpectraView 700"},
-    {"Mitsubishi Electronics","Mitsubishi TFT Monitor RDT150S"},
-    {"Mitsubishi Electronics","Mitsubishi TFT Monitor RDT180S"},
-    {"Mitsubishi Electronics","Mitsubishi The Big Easy 1281 (VS1281)"},
-    {"Mitsubishi Electronics","Mitsubishi The Big Easy G1A (LVPG1A)"},
-    {"Mitsubishi Electronics","Mitsubishi VS1280 Projector"},
-    {"Mitsubishi Electronics","MITSUBISHI XJ59992"},
-    {"Modgraph, Inc.","Modgraph, Inc. MG-3200"},
-    {"Monitor","Gateway AN1_15"},
-    {"Monitor","Gateway CM751"},
-    {"Monitor","Gateway CM803"},
-    {"Monitor","Gateway CrystalScan 500"},
-    {"Monitor","Gateway CrystalScan 500-069"},
-    {"Monitor","Gateway CrystalScan 700-069"},
-    {"Monitor","Gateway CrystalScan700"},
-    {"Monitor","Gateway DL27-1"},
-    {"Monitor","Gateway DL31-1"},
-    {"Monitor","Gateway DL36-1"},
-    {"Monitor","Gateway EV500"},
-    {"Monitor","Gateway EV575"},
-    {"Monitor","Gateway EV700"},
-    {"Monitor","Gateway EV900"},
-    {"Monitor","Gateway EV910"},
-    {"Monitor","Gateway EV910B"},
-    {"Monitor","Gateway EVF720"},
-    {"Monitor","Gateway FPD1500"},
-    {"Monitor","Gateway FPD1800"},
-    {"Monitor","Gateway LE500"},
-    {"Monitor","Gateway PFL2-15A"},
-    {"Monitor","Gateway Vivitron 1100"},
-    {"Monitor","Gateway VX1100"},
-    {"Monitor","Gateway VX1110"},
-    {"Monitor","Gateway VX1120"},
-    {"Monitor","Gateway VX700"},
-    {"Monitor","Gateway VX700A"},
-    {"Monitor","Gateway VX720"},
-    {"Monitor","Gateway VX900"},
-    {"Monitor","Gateway VX900T"},
-    {"Monitor","Gateway VX920"},
-    {"Monitor","Samsung17"},
-    {"Monitronix, Inc.","Monitronix MX-200MC"},
-    {"Monitronix, Inc.","Monitronix MX-210EZ"},
-    {"Monitronix, Inc.","Monitronix MX-240EZ"},
-    {"Monitronix, Inc.","Monitronix MX240"},
-    {"Morse Technology, Inc.","Morse Monitor"},
-    {"NANAO","EIZO E141L"},
-    {"NANAO","EIZO E151L"},
-    {"NANAO","EIZO E35F"},
-    {"NANAO","EIZO E51F"},
-    {"NANAO","EIZO E51FS"},
-    {"NANAO","EIZO E53F"},
-    {"NANAO","EIZO E54F"},
-    {"NANAO","EIZO E55D"},
-    {"NANAO","EIZO E57T"},
-    {"NANAO","EIZO E57Ts"},
-    {"NANAO","EIZO E65T"},
-    {"NANAO","EIZO E66T"},
-    {"NANAO","EIZO E67F"},
-    {"NANAO","EIZO E67T"},
-    {"NANAO","EIZO E75F"},
-    {"NANAO","EIZO E76D"},
-    {"NANAO","EIZO E76F"},
-    {"NANAO","EIZO E78F"},
-    {"NANAO","EIZO L360"},
-    {"NANAO","EIZO L66"},
-    {"NANAO","EIZO T960"},
-    {"NANAO","NANAO 9060S"},
-    {"NANAO","NANAO 9065S"},
-    {"NANAO","NANAO 9070U"},
-    {"NANAO","NANAO 9080i"},
-    {"NANAO","NANAO 9400i"},
-    {"NANAO","NANAO 9500"},
-    {"NANAO","NANAO FlexScan 33F"},
-    {"NANAO","NANAO FlexScan 52F"},
-    {"NANAO","NANAO FlexScan 53T"},
-    {"NANAO","NANAO FlexScan 54T"},
-    {"NANAO","NANAO FlexScan 55F"},
-    {"NANAO","NANAO FlexScan 56T"},
-    {"NANAO","NANAO FlexScan 6500"},
-    {"NANAO","NANAO FlexScan 6600"},
-    {"NANAO","NANAO FlexScan 68T"},
-    {"NANAO","NANAO FlexScan 76F"},
-    {"NANAO","NANAO FlexScan 77F"},
-    {"NANAO","NANAO FlexScan 88F"},
-    {"NANAO","NANAO FlexScan F340iW"},
-    {"NANAO","NANAO FlexScan F347"},
-    {"NANAO","NANAO FlexScan F347II"},
-    {"NANAO","NANAO FlexScan F550i"},
-    {"NANAO","NANAO FlexScan F550iW"},
-    {"NANAO","NANAO FlexScan F557"},
-    {"NANAO","NANAO FlexScan F560iW"},
-    {"NANAO","NANAO FlexScan F750i"},
-    {"NANAO","NANAO FlexScan F760iW"},
-    {"NANAO","NANAO FlexScan F780iJ"},
-    {"NANAO","NANAO FlexScan F780iW"},
-    {"NANAO","NANAO FlexScan T560i"},
-    {"NANAO","NANAO FlexScan T560iJ"},
-    {"NANAO","NANAO FlexScan T567"},
-    {"NANAO","NANAO FlexScan T660i"},
-    {"NANAO","NANAO FlexScan T660iJ"},
-    {"NANAO","NANAO USA F2-15"},
-    {"NANAO","NANAO USA F2-17"},
-    {"NANAO","NANAO USA F2-17EX"},
-    {"NANAO","NANAO USA F2-21"},
-    {"NANAO","NANAO USA FlexScan 6300"},
-    {"NANAO","NANAO USA FlexScan T2-17"},
-    {"NANAO","NANAO USA FlexScan T2-17TS"},
-    {"NANAO","NANAO USA FlexScan T2-20"},
-    {"NANAO","NANAO USA FX2-21"},
-    {"NEC Technologies, Inc.","NEC C510"},
-    {"NEC Technologies, Inc.","NEC C550"},
-    {"NEC Technologies, Inc.","NEC C700"},
-    {"NEC Technologies, Inc.","NEC C710"},
-    {"NEC Technologies, Inc.","NEC C900"},
-    {"NEC Technologies, Inc.","NEC CRT Display D151"},
-    {"NEC Technologies, Inc.","NEC CRT Display D15A1"},
-    {"NEC Technologies, Inc.","NEC CRT Display D171"},
-    {"NEC Technologies, Inc.","NEC CRT Display D172"},
-    {"NEC Technologies, Inc.","NEC CRT Display D17A1"},
-    {"NEC Technologies, Inc.","NEC CRT Display D17B1"},
-    {"NEC Technologies, Inc.","NEC CRT Display D17C2"},
-    {"NEC Technologies, Inc.","NEC CS500"},
-    {"NEC Technologies, Inc.","NEC CS500 Multimedia Monitor"},
-    {"NEC Technologies, Inc.","NEC DH28W2"},
-    {"NEC Technologies, Inc.","NEC DH32W2"},
-    {"NEC Technologies, Inc.","NEC DV15A1"},
-    {"NEC Technologies, Inc.","NEC DV15A2"},
-    {"NEC Technologies, Inc.","NEC DV15D1"},
-    {"NEC Technologies, Inc.","NEC DV17A1"},
-    {"NEC Technologies, Inc.","NEC DV17B1"},
-    {"NEC Technologies, Inc.","NEC DV17B2"},
-    {"NEC Technologies, Inc.","NEC DV17C1"},
-    {"NEC Technologies, Inc.","NEC DV17C2"},
-    {"NEC Technologies, Inc.","NEC DV17C3"},
-    {"NEC Technologies, Inc.","NEC F14T1"},
-    {"NEC Technologies, Inc.","NEC F14T2"},
-    {"NEC Technologies, Inc.","NEC F14T2H"},
-    {"NEC Technologies, Inc.","NEC F14T2L"},
-    {"NEC Technologies, Inc.","NEC F15T1"},
-    {"NEC Technologies, Inc.","NEC LCD1280"},
-    {"NEC Technologies, Inc.","NEC LCD200"},
-    {"NEC Technologies, Inc.","NEC LCD300"},
-    {"NEC Technologies, Inc.","NEC MultiSync 14"},
-    {"NEC Technologies, Inc.","NEC MultiSync 15"},
-    {"NEC Technologies, Inc.","NEC MultiSync 17"},
-    {"NEC Technologies, Inc.","NEC MultiSync 2A"},
-    {"NEC Technologies, Inc.","NEC MultiSync 2V"},
-    {"NEC Technologies, Inc.","NEC MultiSync 3D"},
-    {"NEC Technologies, Inc.","NEC MultiSync 3Ds"},
-    {"NEC Technologies, Inc.","NEC MultiSync 3FGe"},
-    {"NEC Technologies, Inc.","NEC MultiSync 3FGx"},
-    {"NEC Technologies, Inc.","NEC MultiSync 3V"},
-    {"NEC Technologies, Inc.","NEC MultiSync 4D"},
-    {"NEC Technologies, Inc.","NEC MultiSync 4Ds"},
-    {"NEC Technologies, Inc.","NEC MultiSync 4FG"},
-    {"NEC Technologies, Inc.","NEC MultiSync 4FGe"},
-    {"NEC Technologies, Inc.","NEC MultiSync 50"},
-    {"NEC Technologies, Inc.","NEC MultiSync 5D"},
-    {"NEC Technologies, Inc.","NEC MultiSync 5FG"},
-    {"NEC Technologies, Inc.","NEC MultiSync 5FGe"},
-    {"NEC Technologies, Inc.","NEC MultiSync 5FGp"},
-    {"NEC Technologies, Inc.","NEC MultiSync 6FG"},
-    {"NEC Technologies, Inc.","NEC MultiSync 6FGp"},
-    {"NEC Technologies, Inc.","NEC MultiSync 70"},
-    {"NEC Technologies, Inc.","NEC MultiSync 90"},
-    {"NEC Technologies, Inc.","NEC MultiSync A500"},
-    {"NEC Technologies, Inc.","NEC MultiSync A500+"},
-    {"NEC Technologies, Inc.","NEC MultiSync A700"},
-    {"NEC Technologies, Inc.","NEC MultiSync A700+"},
-    {"NEC Technologies, Inc.","NEC MultiSync A900"},
-    {"NEC Technologies, Inc.","NEC MultiSync C400"},
-    {"NEC Technologies, Inc.","NEC MultiSync C500"},
-    {"NEC Technologies, Inc.","NEC MultiSync E1100"},
-    {"NEC Technologies, Inc.","NEC MultiSync E1100+"},
-    {"NEC Technologies, Inc.","NEC MultiSync E500"},
-    {"NEC Technologies, Inc.","NEC MultiSync E700"},
-    {"NEC Technologies, Inc.","NEC MultiSync E750"},
-    {"NEC Technologies, Inc.","NEC MultiSync E900"},
-    {"NEC Technologies, Inc.","NEC MultiSync E900+"},
-    {"NEC Technologies, Inc.","NEC MultiSync E950"},
-    {"NEC Technologies, Inc.","NEC MultiSync FP1350"},
-    {"NEC Technologies, Inc.","NEC MultiSync FP950"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1400M"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1500M"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1510"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1510V"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1525M"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1525V"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD1810"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD2000"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD2010"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD400"},
-    {"NEC Technologies, Inc.","NEC MultiSync LCD400V"},
-    {"NEC Technologies, Inc.","NEC MultiSync LT80"},
-    {"NEC Technologies, Inc.","NEC MultiSync M500"},
-    {"NEC Technologies, Inc.","NEC MultiSync M700"},
-    {"NEC Technologies, Inc.","NEC MultiSync MT1000"},
-    {"NEC Technologies, Inc.","NEC MultiSync MT810"},
-    {"NEC Technologies, Inc.","NEC MultiSync P1150"},
-    {"NEC Technologies, Inc.","NEC MultiSync P1250+"},
-    {"NEC Technologies, Inc.","NEC MultiSync P750"},
-    {"NEC Technologies, Inc.","NEC MultiSync V500"},
-    {"NEC Technologies, Inc.","NEC MultiSync XE15"},
-    {"NEC Technologies, Inc.","NEC MultiSync XE17"},
-    {"NEC Technologies, Inc.","NEC MultiSync XE21"},
-    {"NEC Technologies, Inc.","NEC MultiSync XP15"},
-    {"NEC Technologies, Inc.","NEC MultiSync XP17"},
-    {"NEC Technologies, Inc.","NEC MultiSync XP21"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV14"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV15"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV15+"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV17"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV17 / XV17+"},
-    {"NEC Technologies, Inc.","NEC MultiSync XV17+ (-2)"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cb Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cb2 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cb3,Cb10 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Ce Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Ce2/S1/S2/S2D Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Ce2/T2/T2D Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cs2 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cu10,Cu13,Cu16,Cu13T Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cx,Cf Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cx2 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Cx3,Cx13 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V12/S5R,V13/S5R Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V12/S7R Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V13/M7 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V13/S7R Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V16/M7C2/M7D2 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V7/C4K,V10/C4R Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V7/S5K,V10/S5K Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821V7/S7K,V10/S7K Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Xa7e/S15 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Xa7e/S17 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-9821Xe10/S15 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-DH171, NEC PC-9821Ct16,Ct20 Integrated Color Monitor"},
-    {"NEC Technologies, Inc.","NEC PC-DH28W1"},
-    {"NEC Technologies, Inc.","NEC PC-DH32W1"},
-    {"NEC Technologies, Inc.","NEC PC-KM 151"},
-    {"NEC Technologies, Inc.","NEC PC-KM 152"},
-    {"NEC Technologies, Inc.","NEC PC-KM 171"},
-    {"NEC Technologies, Inc.","NEC PC-KM 211"},
-    {"NEC Technologies, Inc.","NEC PK-DH172"},
-    {"NEC Technologies, Inc.","NEC Ready Monitor"},
-    {"NEC Technologies, Inc.","NEC VistaScan 7000"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM1483M"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM1584MU"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM1785MU"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2085M"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2085MU"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2086A"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2087MU"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2186AF"},
-    {"Nissei Sangyo America, Ltd.","Nissei Sangyo CM2187MU"},
-    {"NOKIA","NOKIA 300Xa"},
-    {"NOKIA","NOKIA 400Xa"},
-    {"NOKIA","NOKIA 417TV"},
-    {"NOKIA","NOKIA 445G"},
-    {"NOKIA","NOKIA 445M"},
-    {"NOKIA","NOKIA 445R"},
-    {"NOKIA","NOKIA 445X"},
-    {"NOKIA","NOKIA 445Xav"},
-    {"NOKIA","NOKIA 445Xavc"},
-    {"NOKIA","NOKIA 445Xi"},
-    {"NOKIA","Nokia 445XiPlus"},
-    {"NOKIA","NOKIA 445Xpro"},
-    {"NOKIA","NOKIA 445Xpro125"},
-    {"NOKIA","NOKIA 446Xpro"},
-    {"NOKIA","Nokia 446XS"},
-    {"NOKIA","NOKIA 446Xt"},
-    {"NOKIA","NOKIA 447B"},
-    {"NOKIA","Nokia 447DTC"},
-    {"NOKIA","NOKIA 447E"},
-    {"NOKIA","NOKIA 447i"},
-    {"NOKIA","NOKIA 447K"},
-    {"NOKIA","NOKIA 447KA"},
-    {"NOKIA","NOKIA 447KC"},
-    {"NOKIA","NOKIA 447L"},
-    {"NOKIA","NOKIA 447M"},
-    {"NOKIA","NOKIA 447S"},
-    {"NOKIA","NOKIA 447V"},
-    {"NOKIA","NOKIA 447W"},
-    {"NOKIA","NOKIA 447X"},
-    {"NOKIA","NOKIA 447Xa"},
-    {"NOKIA","NOKIA 447Xav"},
-    {"NOKIA","NOKIA 447Xavc"},
-    {"NOKIA","NOKIA 447Xi"},
-    {"NOKIA","Nokia 447XiPlus"},
-    {"NOKIA","NOKIA 447Xpro"},
-    {"NOKIA","Nokia 447XS"},
-    {"NOKIA","NOKIA 447Za"},
-    {"NOKIA","NOKIA 447Zi"},
-    {"NOKIA","NOKIA 449E"},
-    {"NOKIA","NOKIA 449M"},
-    {"NOKIA","NOKIA 449X"},
-    {"NOKIA","NOKIA 449Xa"},
-    {"NOKIA","NOKIA 449XaPlus"},
-    {"NOKIA","NOKIA 449Xi"},
-    {"NOKIA","NOKIA 449XiPlus"},
-    {"NOKIA","NOKIA 44BS"},
-    {"NOKIA","Nokia 500Xa"},
-    {"NOKIA","NOKIA 800Xi"},
-    {"Nokia Display Products","NOKIA 300Xa"},
-    {"Nokia Display Products","NOKIA 400Xa"},
-    {"Nokia Display Products","NOKIA 417TV"},
-    {"Nokia Display Products","NOKIA 445G"},
-    {"Nokia Display Products","NOKIA 445M"},
-    {"Nokia Display Products","NOKIA 445PRO"},
-    {"Nokia Display Products","NOKIA 445R"},
-    {"Nokia Display Products","NOKIA 445X"},
-    {"Nokia Display Products","NOKIA 445Xav"},
-    {"Nokia Display Products","NOKIA 445Xavc"},
-    {"Nokia Display Products","NOKIA 445Xi"},
-    {"Nokia Display Products","NOKIA 445XiPlus"},
-    {"Nokia Display Products","NOKIA 445Xpro"},
-    {"Nokia Display Products","NOKIA 445Xpro125"},
-    {"Nokia Display Products","NOKIA 445ZA"},
-    {"Nokia Display Products","NOKIA 446PRO"},
-    {"Nokia Display Products","NOKIA 446Xpro"},
-    {"Nokia Display Products","NOKIA 446XS"},
-    {"Nokia Display Products","NOKIA 446Xt"},
-    {"Nokia Display Products","NOKIA 446ZA"},
-    {"Nokia Display Products","NOKIA 447B"},
-    {"Nokia Display Products","NOKIA 447DTC"},
-    {"Nokia Display Products","NOKIA 447E"},
-    {"Nokia Display Products","NOKIA 447i"},
-    {"Nokia Display Products","NOKIA 447K"},
-    {"Nokia Display Products","NOKIA 447KA"},
-    {"Nokia Display Products","NOKIA 447KC"},
-    {"Nokia Display Products","NOKIA 447L"},
-    {"Nokia Display Products","NOKIA 447M"},
-    {"Nokia Display Products","NOKIA 447PRO"},
-    {"Nokia Display Products","NOKIA 447S"},
-    {"Nokia Display Products","NOKIA 447V"},
-    {"Nokia Display Products","NOKIA 447W"},
-    {"Nokia Display Products","NOKIA 447X"},
-    {"Nokia Display Products","NOKIA 447Xa"},
-    {"Nokia Display Products","NOKIA 447Xav"},
-    {"Nokia Display Products","NOKIA 447Xavc"},
-    {"Nokia Display Products","NOKIA 447Xi"},
-    {"Nokia Display Products","NOKIA 447XiPlus"},
-    {"Nokia Display Products","NOKIA 447Xpro"},
-    {"Nokia Display Products","NOKIA 447XS"},
-    {"Nokia Display Products","NOKIA 447Za"},
-    {"Nokia Display Products","NOKIA 447ZAPlus"},
-    {"Nokia Display Products","NOKIA 447Zi"},
-    {"Nokia Display Products","NOKIA 447ZiPlus"},
-    {"Nokia Display Products","NOKIA 449E"},
-    {"Nokia Display Products","NOKIA 449M"},
-    {"Nokia Display Products","NOKIA 449X"},
-    {"Nokia Display Products","NOKIA 449Xa"},
-    {"Nokia Display Products","NOKIA 449XaPlus"},
-    {"Nokia Display Products","NOKIA 449Xi"},
-    {"Nokia Display Products","NOKIA 449XiPlus"},
-    {"Nokia Display Products","NOKIA 449ZA"},
-    {"Nokia Display Products","NOKIA 44BS"},
-    {"Nokia Display Products","NOKIA 500Xa"},
-    {"Nokia Display Products","NOKIA 510L"},
-    {"Nokia Display Products","NOKIA 800Pro"},
-    {"Nokia Display Products","NOKIA 800Xi"},
-    {"OKI","Oki GD2010"},
-    {"OKI","Oki GD2020"},
-    {"OKI","Oki GD2021"},
-    {"OKI","Oki GD2030"},
-    {"OKI","Oki GD2050"},
-    {"Olivetti","Olivetti DSM 25-314 P-Y"},
-    {"Olivetti","Olivetti DSM 26-314 LE"},
-    {"Olivetti","Olivetti DSM 27-039"},
-    {"Olivetti","Olivetti DSM 27-117"},
-    {"Olivetti","Olivetti DSM 27-120"},
-    {"Olivetti","Olivetti DSM 27-140 LE"},
-    {"Olivetti","Olivetti DSM 27-141 PS"},
-    {"Olivetti","Olivetti DSM 27-514 MS"},
-    {"Olivetti","Olivetti DSM 27-615"},
-    {"Olivetti","Olivetti DSM 28-039 PS"},
-    {"Olivetti","Olivetti DSM 28-142 PS"},
-    {"Olivetti","Olivetti DSM 28-143 PS"},
-    {"Olivetti","Olivetti DSM 28-143 PS-2"},
-    {"Olivetti","Olivetti DSM 28-144 MS"},
-    {"Olivetti","Olivetti DSM 28-171 HR"},
-    {"Olivetti","Olivetti DSM 28-172 EY"},
-    {"Olivetti","Olivetti DSM 28-201 HR"},
-    {"Olivetti","Olivetti DSM 40-151"},
-    {"Olivetti","Olivetti DSM 50-148"},
-    {"Olivetti","Olivetti DSM 50-172"},
-    {"Olivetti","Olivetti DSM 50-201"},
-    {"Olivetti","Olivetti DSM26-2020J"},
-    {"Olivetti","Olivetti DSM26-2020J (New Model)"},
-    {"Olivetti","Olivetti DSM26-2030J"},
-    {"Packard Bell","Packard Bell 1010"},
-    {"Packard Bell","Packard Bell 1015"},
-    {"Packard Bell","Packard Bell 1020"},
-    {"Packard Bell","Packard Bell 1024"},
-    {"Packard Bell","Packard Bell 1024S"},
-    {"Packard Bell","Packard Bell 1408E"},
-    {"Packard Bell","Packard Bell 1408SE"},
-    {"Packard Bell","Packard Bell 1408SLE"},
-    {"Packard Bell","Packard Bell 1412SME"},
-    {"Packard Bell","Packard Bell 1428ME"},
-    {"Packard Bell","Packard Bell 1511SL"},
-    {"Packard Bell","Packard Bell 1512SL"},
-    {"Packard Bell","Packard Bell 1512SME"},
-    {"Packard Bell","Packard Bell 1712SL"},
-    {"Packard Bell","Packard Bell 2020"},
-    {"Packard Bell","Packard Bell 2024"},
-    {"Packard Bell","Packard Bell 2025"},
-    {"Packard Bell","Packard Bell 3010"},
-    {"Packard Bell","Packard Bell 3020"},
-    {"Packard Bell","Packard Bell 3025"},
-    {"Packard Bell","Packard Bell Monitor"},
-    {"Packard Bell","Packard Bell PB8510SV"},
-    {"Packard Bell","Packard Bell PB8528SVG"},
-    {"Packard Bell","Packard Bell PnP 2024S"},
-    {"Packard Bell","Packard Bell PnP 2025"},
-    {"Packard Bell","Packard Bell PnP 2025E"},
-    {"Packard Bell","Packard Bell PnP 2160"},
-    {"Packard Bell","Packard Bell PnP 3025"},
-    {"Packard Bell","Packard Bell PnP 3030"},
-    {"Packard Bell","Packard Bell PnP 3070"},
-    {"Packard Bell","Packard Bell PnP 4480"},
-    {"Packard Bell","Packard Bell PnP 5480"},
-    {"Packard Bell","Packard Bell PnP 5480E"},
-    {"Packard Bell","Packard Bell PnP 5680"},
-    {"Packard Bell","Packard Bell PnP 7480"},
-    {"Packard Bell","Packard Bell PnP 7680"},
-    {"Packard Bell","Packard Bell Pnp LCD15"},
-    {"Panasonic","Panasonic C1381"},
-    {"Panasonic","Panasonic C1391"},
-    {"Panasonic","Panasonic C1395"},
-    {"Panasonic","Panasonic C1795"},
-    {"Panasonic","Panasonic C1991"},
-    {"Panasonic","Panasonic CF-32"},
-    {"Panasonic","Panasonic E50"},
-    {"Panasonic","Panasonic LC40"},
-    {"Panasonic","Panasonic LC50S (TX-D5L31F)"},
-    {"Panasonic","Panasonic P50"},
-    {"Panasonic","Panasonic P70"},
-    {"Panasonic","Panasonic PF70"},
-    {"Panasonic","Panasonic PL70i(TX-D7S55)"},
-    {"Panasonic","Panasonic S110"},
-    {"Panasonic","Panasonic S15"},
-    {"Panasonic","Panasonic SL70"},
-    {"Panasonic","Panasonic SL70i(TX-D7S36)"},
-    {"Panasonic","Panasonic SL90 (TX-D9S54)"},
-    {"Panasonic","Panasonic TX-1703MAA"},
-    {"Panasonic","Panasonic TX-2013MAA"},
-    {"Panasonic","Panasonic TX-2103MAA"},
-    {"Panasonic","Panasonic TX-D2151NM"},
-    {"Panasonic","Panasonic TX-D2151W-ES"},
-    {"PC Brand, Inc.","PC Brand, Inc. Super_VGA"},
-    {"Philips Consumer Electronics","Magnavox MB4010 (14inch/CM1300)"},
-    {"Philips Consumer Electronics","Magnavox MB5011 (15inch/CM1300)"},
-    {"Philips Consumer Electronics","Magnavox MB5314 (15inch/CM1200)"},
-    {"Philips Consumer Electronics","Magnavox MB7000 (17inch/CM6800)"},
-    {"Philips Consumer Electronics","Magnavox MB7000(17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips 104B (14inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 104B (14inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 104B(14inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 104B(14inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 104E"},
-    {"Philips Consumer Electronics","Philips 105A (105B1)"},
-    {"Philips Consumer Electronics","Philips 105B (105B1)"},
-    {"Philips Consumer Electronics","Philips 105B (15inch/CM1200)"},
-    {"Philips Consumer Electronics","Philips 105B (15inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 105B(15inch/CM1200)"},
-    {"Philips Consumer Electronics","Philips 105E"},
-    {"Philips Consumer Electronics","Philips 105G (105B1)"},
-    {"Philips Consumer Electronics","Philips 105MB (15inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 105MG (105B1)"},
-    {"Philips Consumer Electronics","Philips 105S (105S1)"},
-    {"Philips Consumer Electronics","Philips 105S (15inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 105S (15inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 105S(15inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 105S(15inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 107B (107B1)"},
-    {"Philips Consumer Electronics","Philips 107B (17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips 107B (CM2400)"},
-    {"Philips Consumer Electronics","Philips 107B(17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips 107E"},
-    {"Philips Consumer Electronics","Philips 107E (107E1)"},
-    {"Philips Consumer Electronics","Philips 107E (17inch/CM2600)"},
-    {"Philips Consumer Electronics","Philips 107G"},
-    {"Philips Consumer Electronics","Philips 107MB (17inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 107S (107S1)"},
-    {"Philips Consumer Electronics","Philips 107S (17inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 107S (17inch/CM2300)"},
-    {"Philips Consumer Electronics","Philips 107S (17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips 107S (CM2400)"},
-    {"Philips Consumer Electronics","Philips 107S(17inch/CM1300)"},
-    {"Philips Consumer Electronics","Philips 107S(17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips 109B (109B1)"},
-    {"Philips Consumer Electronics","Philips 109B (CM2500)"},
-    {"Philips Consumer Electronics","Philips 109S"},
-    {"Philips Consumer Electronics","Philips 109S (109S1)"},
-    {"Philips Consumer Electronics","Philips 109S/86"},
-    {"Philips Consumer Electronics","Philips 150B (15.0 LCD MONITOR)"},
-    {"Philips Consumer Electronics","Philips 17ACM38"},
-    {"Philips Consumer Electronics","Philips 17BCM28"},
-    {"Philips Consumer Electronics","Philips 17TCM26"},
-    {"Philips Consumer Electronics","Philips 200B (20inch/CM5600)"},
-    {"Philips Consumer Electronics","Philips 200T (20inch/CM0700)"},
-    {"Philips Consumer Electronics","Philips 200T(20inch/CM0700)"},
-    {"Philips Consumer Electronics","Philips 201B (201B1)"},
-    {"Philips Consumer Electronics","Philips 201B (21inch/CM0770)"},
-    {"Philips Consumer Electronics","Philips 201B(21inch/CM0770)"},
-    {"Philips Consumer Electronics","Philips 20CM64"},
-    {"Philips Consumer Electronics","Philips 29PX8031 Monitor/TV"},
-    {"Philips Consumer Electronics","Philips 4CM 8270/20T"},
-    {"Philips Consumer Electronics","Philips 4CM4280"},
-    {"Philips Consumer Electronics","Philips 4CM6088I"},
-    {"Philips Consumer Electronics","Philips 4CM6282"},
-    {"Philips Consumer Electronics","Philips 6CM321"},
-    {"Philips Consumer Electronics","Philips 7BM749"},
-    {"Philips Consumer Electronics","Philips 7CM321"},
-    {"Philips Consumer Electronics","Philips 7CM329"},
-    {"Philips Consumer Electronics","Philips 9CM062"},
-    {"Philips Consumer Electronics","Philips 9CM082"},
-    {"Philips Consumer Electronics","Philips Brilliance 105 (15inch/CM2200)"},
-    {"Philips Consumer Electronics","Philips Brilliance 105(15inch/CM2200)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107 (17inch/CM8800)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107 (PRODUCT ID 17A58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107(17inch/CM8800)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107(PRODUCT ID 17A58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107MP (17inch/CM5800)"},
-    {"Philips Consumer Electronics","Philips Brilliance 107P (107P1)"},
-    {"Philips Consumer Electronics","Philips Brilliance 109 (PRODUCT ID 19A58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 109(PRODUCT ID 19A58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 109MP (19inch/CM5800)"},
-    {"Philips Consumer Electronics","Philips Brilliance 109P (109P1)"},
-    {"Philips Consumer Electronics","Philips Brilliance 151AX (15.1 LCD MONITOR)"},
-    {"Philips Consumer Electronics","Philips Brilliance 181AS (18.1 LCD MONITOR)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201 (21inch/CM1700)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201(21inch/CM1700)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201B (PRODUCT ID 21B58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201CS"},
-    {"Philips Consumer Electronics","Philips Brilliance 201CS (21inch/CM0900)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201P (201P1)"},
-    {"Philips Consumer Electronics","Philips Brilliance 201P (PRODUCT ID 21A58...)"},
-    {"Philips Consumer Electronics","Philips Brilliance 2120"},
-    {"Philips Consumer Electronics","Philips Brilliance 4500AX (14.5 LCD MONITOR)"},
-    {"Philips Consumer Electronics","Philips Brilliance AX4500(14.5 LCD MONITOR)"},
-    {"Philips Consumer Electronics","Philips C2082-DAS"},
-    {"Philips Consumer Electronics","Philips C2182-DAS"},
-    {"Philips Consumer Electronics","Philips CM0200 (14B)"},
-    {"Philips Consumer Electronics","Philips CM0200 (15C)"},
-    {"Philips Consumer Electronics","Philips CM0500 (20C)"},
-    {"Philips Consumer Electronics","Philips CM0700 (20T)"},
-    {"Philips Consumer Electronics","Philips CM0700 (21B)"},
-    {"Philips Consumer Electronics","Philips CM0800 (14A)"},
-    {"Philips Consumer Electronics","Philips CM0800 (15B)"},
-    {"Philips Consumer Electronics","Philips CM1200 (15A)"},
-    {"Philips Consumer Electronics","Philips CM1800 (15A)"},
-    {"Philips Consumer Electronics","Philips CM5600 (20B)"},
-    {"Philips Consumer Electronics","Philips CM9039"},
-    {"Philips Consumer Electronics","Philips CM9079"},
-    {"Philips Consumer Electronics","Philips CM9085"},
-    {"Philips Consumer Electronics","Philips CM9089"},
-    {"Philips Consumer Electronics","Philips CM9214"},
-    {"Philips Consumer Electronics","Philips CM9217"},
-    {"Philips Consumer Electronics","Philips Magnavox 109S"},
-    {"Philips Consumer Electronics","Philips Magnavox MB7000(17inch/CM6800)"},
-    {"Philips Consumer Electronics","Philips PD5029S Monitor/TV"},
-    {"PLB Monitor,Inc","PLB 1410 Model"},
-    {"PLB Monitor,Inc","PLB 1510 Model"},
-    {"PLB Monitor,Inc","PLB 1710"},
-    {"PLB Monitor,Inc","PLB 1910"},
-    {"Premier Computer Innovations","Premier PM14V-S-1"},
-    {"Princeton Graphic Systems","Princeton 14"},
-    {"Princeton Graphic Systems","Princeton 14ni"},
-    {"Princeton Graphic Systems","Princeton 15"},
-    {"Princeton Graphic Systems","Princeton 17"},
-    {"Princeton Graphic Systems","Princeton AF3.0HD"},
-    {"Princeton Graphic Systems","Princeton AGF700"},
-    {"Princeton Graphic Systems","Princeton AGF900"},
-    {"Princeton Graphic Systems","Princeton AGX700"},
-    {"Princeton Graphic Systems","Princeton AGX740"},
-    {"Princeton Graphic Systems","Princeton AGX750"},
-    {"Princeton Graphic Systems","Princeton AGX900"},
-    {"Princeton Graphic Systems","Princeton APP520"},
-    {"Princeton Graphic Systems","Princeton APP550"},
-    {"Princeton Graphic Systems","Princeton APP560"},
-    {"Princeton Graphic Systems","Princeton APP800"},
-    {"Princeton Graphic Systems","Princeton AR2.7T"},
-    {"Princeton Graphic Systems","Princeton AR3.2T"},
-    {"Princeton Graphic Systems","Princeton Arcadia AR2.7"},
-    {"Princeton Graphic Systems","Princeton Arcadia AR2.7AV"},
-    {"Princeton Graphic Systems","Princeton Arcadia AR3.1"},
-    {"Princeton Graphic Systems","Princeton Arcadia AR3.1AV"},
-    {"Princeton Graphic Systems","Princeton Arcadia AR3.6"},
-    {"Princeton Graphic Systems","Princeton C2001"},
-    {"Princeton Graphic Systems","Princeton DPP500"},
-    {"Princeton Graphic Systems","Princeton DPP540"},
-    {"Princeton Graphic Systems","Princeton DPP550"},
-    {"Princeton Graphic Systems","Princeton DPP560"},
-    {"Princeton Graphic Systems","Princeton DPP800"},
-    {"Princeton Graphic Systems","Princeton DPP810"},
-    {"Princeton Graphic Systems","Princeton EO14"},
-    {"Princeton Graphic Systems","Princeton EO15"},
-    {"Princeton Graphic Systems","Princeton EO17"},
-    {"Princeton Graphic Systems","Princeton EO2000"},
-    {"Princeton Graphic Systems","Princeton EO2005"},
-    {"Princeton Graphic Systems","Princeton EO2010"},
-    {"Princeton Graphic Systems","Princeton EO40"},
-    {"Princeton Graphic Systems","Princeton EO400"},
-    {"Princeton Graphic Systems","Princeton EO50"},
-    {"Princeton Graphic Systems","Princeton EO500"},
-    {"Princeton Graphic Systems","Princeton EO505"},
-    {"Princeton Graphic Systems","Princeton EO70"},
-    {"Princeton Graphic Systems","Princeton EO700"},
-    {"Princeton Graphic Systems","Princeton EO705"},
-    {"Princeton Graphic Systems","Princeton EO710"},
-    {"Princeton Graphic Systems","Princeton EO72"},
-    {"Princeton Graphic Systems","Princeton EO720"},
-    {"Princeton Graphic Systems","Princeton EO74/74T"},
-    {"Princeton Graphic Systems","Princeton EO75"},
-    {"Princeton Graphic Systems","Princeton EO750"},
-    {"Princeton Graphic Systems","Princeton EO76/76T"},
-    {"Princeton Graphic Systems","Princeton EO90"},
-    {"Princeton Graphic Systems","Princeton EO900"},
-    {"Princeton Graphic Systems","Princeton EO930"},
-    {"Princeton Graphic Systems","Princeton EO935S"},
-    {"Princeton Graphic Systems","Princeton EO950"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems C2001"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO15"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO17"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO40"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO400"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO50"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO500"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO70"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO700"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO710"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO72"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO720"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems EO75"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems MAX-15"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra 40"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra 50"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra-1200"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra-1400"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra-1600"},
-    {"Princeton Graphic Systems","Princeton Graphic Systems Ultra-2000"},
-    {"Princeton Graphic Systems","Princeton LD150"},
-    {"Princeton Graphic Systems","Princeton LD50A"},
-    {"Princeton Graphic Systems","PRINCETON Senergy 550"},
-    {"Princeton Graphic Systems","PRINCETON Senergy 850"},
-    {"Princeton Graphic Systems","Princeton Ultra 100"},
-    {"Princeton Graphic Systems","Princeton Ultra 17+"},
-    {"Princeton Graphic Systems","Princeton Ultra 20"},
-    {"Princeton Graphic Systems","Princeton Ultra 40"},
-    {"Princeton Graphic Systems","Princeton Ultra 41"},
-    {"Princeton Graphic Systems","Princeton Ultra 42"},
-    {"Princeton Graphic Systems","Princeton Ultra 50"},
-    {"Princeton Graphic Systems","Princeton Ultra 50e"},
-    {"Princeton Graphic Systems","Princeton Ultra 51"},
-    {"Princeton Graphic Systems","Princeton Ultra 52/52B"},
-    {"Princeton Graphic Systems","Princeton Ultra 52e/52B"},
-    {"Princeton Graphic Systems","Princeton Ultra 54"},
-    {"Princeton Graphic Systems","Princeton Ultra 55"},
-    {"Princeton Graphic Systems","Princeton Ultra 70F"},
-    {"Princeton Graphic Systems","Princeton Ultra 71"},
-    {"Princeton Graphic Systems","Princeton Ultra 72"},
-    {"Princeton Graphic Systems","Princeton Ultra 72e"},
-    {"Princeton Graphic Systems","Princeton Ultra 74"},
-    {"Princeton Graphic Systems","Princeton Ultra 75/75B"},
-    {"Princeton Graphic Systems","Princeton Ultra 75B"},
-    {"Princeton Graphic Systems","Princeton Ultra 75e"},
-    {"Princeton Graphic Systems","Princeton Ultra 77"},
-    {"Princeton Graphic Systems","Princeton Ultra 77e"},
-    {"Princeton Graphic Systems","Princeton Ultra 80"},
-    {"Princeton Graphic Systems","Princeton Ultra 90/90B"},
-    {"Princeton Graphic Systems","Princeton Ultra 90B"},
-    {"Princeton Graphic Systems","Princeton Ultra 90e"},
-    {"Princeton Graphic Systems","Princeton Ultra 92"},
-    {"Princeton Graphic Systems","Princeton Ultra 95"},
-    {"Princeton Graphic Systems","Princeton Ultra 95e"},
-    {"Princeton Graphic Systems","W54"},
-    {"Princeton Graphic Systems","W74"},
-    {"Princeton Publishing Labs","Princeton Publishing Labs MultiView"},
-    {"Princeton Publishing Labs","Princeton Publishing Labs MultiView_II"},
-    {"Proview Electronics Co.,Ltd.","Proview 10-inch 250"},
-    {"Proview Electronics Co.,Ltd.","Proview 14-inch 455/456/462"},
-    {"Proview Electronics Co.,Ltd.","Proview 15-inch 560/561/562"},
-    {"Proview Electronics Co.,Ltd.","Proview 15-inch 564/570"},
-    {"Proview Electronics Co.,Ltd.","Proview 15-inch 566/571/572"},
-    {"Proview Electronics Co.,Ltd.","Proview 16-inch 720/722"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 765/768/770"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 769/771/772"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 775/776/778"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 777 Pure Flat"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 785/786/788"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 787 Pure Flat"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 795/796"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch 797 Pure Flat"},
-    {"Proview Electronics Co.,Ltd.","Proview 17-inch PD/ID-950F Daimondtron Pure Flat"},
-    {"Proview Electronics Co.,Ltd.","Proview 19-inch 986"},
-    {"Proview Electronics Co.,Ltd.","Proview 19-inch 995/998/998A"},
-    {"Proview Electronics Co.,Ltd.","Proview 19-inch 997 Pure Flat"},
-    {"Proview Electronics Co.,Ltd.","Proview 19-inch PV-1995S"},
-    {"Proview Electronics Co.,Ltd.","Proview 21-inch 215"},
-    {"Proview Electronics Co.,Ltd.","Proview 330 (LCD 13.3-inch)"},
-    {"Proview Electronics Co.,Ltd.","Proview 468 (LCD 14-inch)"},
-    {"Proview Electronics Co.,Ltd.","Proview 510/560/580 (LCD 15-inch)"},
-    {"Proview Electronics Co.,Ltd.","Proview 560/580 (LCD 15-inch Pivot)"},
-    {"Proview Electronics Co.,Ltd.","Proview 568 (LCD 15-inch)"},
-    {"Proview Electronics Co.,Ltd.","Proview 600/660 (LCD 15-inch Pivot)"},
-    {"Proview Electronics Co.,Ltd.","Proview 780 (LCD 17-inch)"},
-    {"Proview Technology Corp.","PROVIEW  550D"},
-    {"Proview Technology Corp.","PROVIEW  570"},
-    {"Proview Technology Corp.","PROVIEW  750"},
-    {"Proview Technology Corp.","PROVIEW  768"},
-    {"Proview Technology Corp.","PROVIEW  770"},
-    {"Proview Technology Corp.","PROVIEW  785"},
-    {"Proview Technology Corp.","PROVIEW  848D"},
-    {"Proview Technology Corp.","PROVIEW  860"},
-    {"Proview Technology Corp.","PROVIEW  995"},
-    {"Proview Technology Corp.","PROVIEW  MD-1452"},
-    {"Proview Technology Corp.","PROVIEW  MD-1552"},
-    {"Proview Technology Corp.","PROVIEW  PRO-400"},
-    {"Proview Technology Corp.","PROVIEW  PRO-500"},
-    {"Proview Technology Corp.","PROVIEW  PRO-700"},
-    {"Proview Technology Corp.","PROVIEW  PRO-900"},
-    {"Proview Technology Corp.","PROVIEW  PV-1450"},
-    {"Proview Technology Corp.","PROVIEW  PV-1995S"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1455"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1550"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1564"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1568"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1750"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1766"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1768"},
-    {"Proview Technology Corp.","PROVIEW  PV/SA-1776"},
-    {"Proview Technology Corp.","PROVIEW  VS-1452"},
-    {"Proview Technology Corp.","PROVIEW  VS-1565"},
-    {"Proview Technology Corp.","Proview 570"},
-    {"Proview Technology Corp.","Proview 770"},
-    {"Proview Technology Corp.","Proview 860"},
-    {"Qume Corp.","Qume Corp. QM835"},
-    {"Radius, Inc.","Radius PrecisionColor Display/19"},
-    {"Radius, Inc.","Radius PrecisionColor Display/20"},
-    {"Radius, Inc.","Radius PrecisionColor Pivot"},
-    {"RasterOps","RasterOps 20/20"},
-    {"RasterOps","RasterOps ClearVueColor 17"},
-    {"RasterOps","RasterOps ClearVueColor 20T"},
-    {"RasterOps","RasterOps ClearVueColor 21"},
-    {"REDMS Group, Inc.","REDMS Group, Inc. SRC-1401"},
-    {"REDMS Group, Inc.","REDMS Group, Inc. SRC-1402"},
-    {"Relisys","Relisys RE-1420"},
-    {"Relisys","Relisys RE-1520"},
-    {"Relisys","Relisys RE-1528"},
-    {"Relisys","Relisys RE-5155"},
-    {"Relisys","Relisys RE451"},
-    {"Relisys","Relisys RE518"},
-    {"Relisys","Relisys RE550"},
-    {"Relisys","Relisys RE551"},
-    {"Relisys","Relisys RE767"},
-    {"Relisys","Relisys RM-1541"},
-    {"Royal Information Company","TRL/RIC DH-1570M/DH-1570"},
-    {"Royal Information Company","TRL/RIC DH-1764M/DH-1764"},
-    {"Royal Information Company","TRL/RIC DH-1764UM/DH-1764U"},
-    {"Royal Information Company","TRL/RIC DL-1564"},
-    {"Royal Information Company","TRL/RIC DL-1564M/DL-1564"},
-    {"Royal Information Company","TRL/RIC DL-1750MU"},
-    {"Royal Information Company","TRL/RIC RH-1450"},
-    {"Sampo Technology Corp.","AlphaScan 711"},
-    {"Sampo Technology Corp.","AlphaScan 712"},
-    {"Sampo Technology Corp.","AlphaScan 800S"},
-    {"Sampo Technology Corp.","AlphaScan 811"},
-    {"Sampo Technology Corp.","Sampo AlphaScan 15"},
-    {"Sampo Technology Corp.","Sampo AlphaScan 17"},
-    {"Sampo Technology Corp.","Sampo AlphaScan LC"},
-    {"Sampo Technology Corp.","Sampo AlphaScan Plus"},
-    {"Samsung","CT4581"},
-    {"Samsung","Samsung 15GLsi"},
-    {"Samsung","Samsung 17GLi"},
-    {"Samsung","Samsung 17GLsi"},
-    {"Samsung","Samsung 5b (CKB52*)"},
-    {"Samsung","Samsung 5e (CKA52*)"},
-    {"Samsung","Samsung 7e (CKB72*)"},
-    {"Samsung","Samsung CJ4685"},
-    {"Samsung","Samsung CMQ5387L"},
-    {"Samsung","Samsung Cn4551"},
-    {"Samsung","Samsung CSA-7571"},
-    {"Samsung","Samsung CSU5977"},
-    {"Samsung","Samsung CT-4581"},
-    {"Samsung","Samsung MF-4771"},
-    {"Samsung","Samsung Samtron 40B"},
-    {"Samsung","Samsung Samtron 40Bn"},
-    {"Samsung","Samsung SAMTRON 4Bi"},
-    {"Samsung","Samsung SAMTRON 5(M)B (CGB5617*)"},
-    {"Samsung","Samsung SAMTRON 5(M)E (CGK5517*)"},
-    {"Samsung","Samsung Samtron 50(M)E"},
-    {"Samsung","Samsung Samtron 50B"},
-    {"Samsung","Samsung SAMTRON 5Bi"},
-    {"Samsung","Samsung SAMTRON 5Ei"},
-    {"Samsung","Samsung Samtron 60(M)B"},
-    {"Samsung","Samsung SAMTRON 7(M)B (CGM7617*)"},
-    {"Samsung","Samsung SAMTRON 7(M)E (CGE7517*)"},
-    {"Samsung","Samsung Samtron 70(M)E"},
-    {"Samsung","Samsung SAMTRON 7Ei"},
-    {"Samsung","Samsung Samtron 9P"},
-    {"Samsung","Samsung SyncMaster 1000b (CGX1607*)"},
-    {"Samsung","Samsung SyncMaster 1000p"},
-    {"Samsung","Samsung SyncMaster 1000p (CGX160*)"},
-    {"Samsung","Samsung SyncMaster 1000s (CGP1607*)"},
-    {"Samsung","Samsung SyncMaster 1100p"},
-    {"Samsung","Samsung SyncMaster 1100p Plus"},
-    {"Samsung","Samsung SyncMaster 1200NF/2200NF"},
-    {"Samsung","Samsung SyncMaster 14GL"},
-    {"Samsung","Samsung SyncMaster 150MP"},
-    {"Samsung","Samsung SyncMaster 15GL"},
-    {"Samsung","Samsung SyncMaster 15GLe"},
-    {"Samsung","Samsung SyncMaster 15GLi"},
-    {"Samsung","Samsung SyncMaster 15M"},
-    {"Samsung","Samsung SyncMaster 15Me"},
-    {"Samsung","Samsung SyncMaster 170MP"},
-    {"Samsung","Samsung SyncMaster 17GL"},
-    {"Samsung","Samsung SyncMaster 17GLi"},
-    {"Samsung","Samsung SyncMaster 17GLs"},
-    {"Samsung","Samsung SyncMaster 17GLsi"},
-    {"Samsung","Samsung SyncMaster 2"},
-    {"Samsung","Samsung SyncMaster 20GLs"},
-    {"Samsung","Samsung SyncMaster 20GLsi"},
-    {"Samsung","Samsung SyncMaster 21GLs"},
-    {"Samsung","Samsung SyncMaster 2400(U)W (SWM400*)"},
-    {"Samsung","Samsung SyncMaster 3"},
-    {"Samsung","Samsung SyncMaster 320TFT (LXB310*)"},
-    {"Samsung","Samsung SyncMaster 330/331TFT (LXB350*)"},
-    {"Samsung","Samsung SyncMaster 3Ne"},
-    {"Samsung","Samsung SyncMaster 4+"},
-    {"Samsung","Samsung SyncMaster 400b (CKA4217*)"},
-    {"Samsung","Samsung SyncMaster 400TFT (LXA41*)"},
-    {"Samsung","Samsung SyncMaster 410b(CHA4217*)"},
-    {"Samsung","Samsung SyncMaster 450b(n)"},
-    {"Samsung","Samsung SyncMaster 470S /480S TFT"},
-    {"Samsung","Samsung SyncMaster 4NE"},
-    {"Samsung","Samsung SyncMaster 4S"},
-    {"Samsung","Samsung SyncMaster 500(M)b (CGB5607*)"},
-    {"Samsung","Samsung SyncMaster 500(M)p (CGC5607*)"},
-    {"Samsung","Samsung SyncMaster 500(M)s (CGK5507*)"},
-    {"Samsung","Samsung SyncMaster 500(M)s Plus (CKE5507*)"},
-    {"Samsung","Samsung SyncMaster 500b"},
-    {"Samsung","Samsung SyncMaster 500b Plus (CKF5607*)"},
-    {"Samsung","Samsung SyncMaster 510(M)s (CHA5807*)"},
-    {"Samsung","Samsung SyncMaster 510b(CHB5707*)"},
-    {"Samsung","Samsung SyncMaster 520TFT (LXB530*)"},
-    {"Samsung","Samsung SyncMaster 530/531TFT (LXB550*)"},
-    {"Samsung","Samsung SyncMaster 550b(T)"},
-    {"Samsung","Samsung SyncMaster 550s(T)"},
-    {"Samsung","Samsung SyncMaster 550v"},
-    {"Samsung","Samsung SyncMaster 570B/580B TFT"},
-    {"Samsung","Samsung SyncMaster 570P TFT/580P TFT"},
-    {"Samsung","Samsung SyncMaster 570P/580P Plus TFT"},
-    {"Samsung","Samsung SyncMaster 570S/580S TFT"},
-    {"Samsung","Samsung SyncMaster 5C"},
-    {"Samsung","Samsung SyncMaster 610(M)b(CHB6107*)"},
-    {"Samsung","Samsung SyncMaster 6Ne"},
-    {"Samsung","Samsung SyncMaster 700(M)b (CGM7607*)"},
-    {"Samsung","Samsung SyncMaster 700(M)p (CGH7609*)"},
-    {"Samsung","Samsung SyncMaster 700(M)s (CGE7507*)"},
-    {"Samsung","Samsung SyncMaster 700(M)s Plus (CKG7507*)"},
-    {"Samsung","Samsung SyncMaster 700b Plus"},
-    {"Samsung","Samsung SyncMaster 700IFT (CSH780B*)"},
-    {"Samsung","Samsung SyncMaster 700NF"},
-    {"Samsung","Samsung SyncMaster 700p Plus (CSH7839*)"},
-    {"Samsung","Samsung SyncMaster 700TFT"},
-    {"Samsung","Samsung SyncMaster 710(M)b (CHB7709*)"},
-    {"Samsung","Samsung SyncMaster 710(M)s (CHB7707*)"},
-    {"Samsung","Samsung SyncMaster 750(M)b"},
-    {"Samsung","Samsung SyncMaster 750NF(T)"},
-    {"Samsung","Samsung SyncMaster 750p(T)"},
-    {"Samsung","Samsung SyncMaster 750s(T)"},
-    {"Samsung","Samsung SyncMaster 753DF(T)"},
-    {"Samsung","Samsung SyncMaster 755DF(T)"},
-    {"Samsung","Samsung SyncMaster 770TFT"},
-    {"Samsung","Samsung SyncMaster 800TFT"},
-    {"Samsung","Samsung SyncMaster 900IFT"},
-    {"Samsung","Samsung SyncMaster 900NF"},
-    {"Samsung","Samsung SyncMaster 900p (CSH9839*)"},
-    {"Samsung","Samsung SyncMaster 900p Plus"},
-    {"Samsung","Samsung SyncMaster 900SL (CSM92*)"},
-    {"Samsung","Samsung SyncMaster 950NF(T)"},
-    {"Samsung","Samsung SyncMaster 950P Plus(T)"},
-    {"Samsung","Samsung SyncMaster 950SL"},
-    {"Samsung","Samsung SyncMaster 950SL Plus/900SL Plus"},
-    {"Samsung","Samsung SyncMaster 955DF(T)"},
-    {"Samsung","Samsung SyncMaster 955SL(T)"},
-    {"Samsung","Samsung SyncMaster sm950p(T)"},
-    {"Samsung","Samtron 428PT/PTL"},
-    {"Samsung","Samtron SC-208DXL+"},
-    {"Samsung","Samtron SC-528MDL"},
-    {"Samsung","Samtron SC-528MXLJ"},
-    {"Samsung","Samtron SC-528TXL"},
-    {"Samsung","Samtron SC-528UXL"},
-    {"Samsung","Samtron SC-726GXL"},
-    {"Samsung","Samtron SC-728FXL"},
-    {"Samsung","Samtron SC-728FXLJ"},
-    {"Samtron","Samtron SC-428PS"},
-    {"Samtron","Samtron SC-428TX(L)"},
-    {"Samtron","Samtron SC-428VS(L)+"},
-    {"Samtron","Samtron SC-428VX(L)"},
-    {"Samtron","Samtron SC-728SXL"},
-    {"SANYO","SANYO CMT-B15M6"},
-    {"SANYO","SANYO CMT-D14UM5V"},
-    {"Seiko Instruments U.S.A., Inc.","Seiko CM-1440"},
-    {"Seiko Instruments U.S.A., Inc.","Seiko CM-1450"},
-    {"Seiko Instruments U.S.A., Inc.","Seiko CM-2050"},
-    {"Shamrock Technology","SHAMROCK C072"},
-    {"Shamrock Technology","SHAMROCK C102"},
-    {"Shamrock Technology","SHAMROCK C407"},
-    {"Shamrock Technology","SHAMROCK C502"},
-    {"Shamrock Technology","SHAMROCK C505"},
-    {"Shamrock Technology","SHAMROCK C507"},
-    {"Shamrock Technology","SHAMROCK C703"},
-    {"Shamrock Technology","SHAMROCK C705"},
-    {"Shamrock Technology","SHAMROCK C706"},
-    {"Shamrock Technology","SHAMROCK HTC43860"},
-    {"Shamrock Technology","SHAMROCK M569"},
-    {"Shamrock Technology","SHAMROCK M769"},
-    {"Shamrock Technology","SHAMROCK SRC1405"},
-    {"Shamrock Technology","SHAMROCK SRC1405L"},
-    {"Shamrock Technology","SHAMROCK SRC1406"},
-    {"Shamrock Technology","SHAMROCK SRC1406L"},
-    {"Shamrock Technology","SHAMROCK SRC1407"},
-    {"Shamrock Technology","SHAMROCK SRC1407L"},
-    {"Shamrock Technology","SHAMROCK SRC1451LP"},
-    {"Shamrock Technology","SHAMROCK SRC1451P"},
-    {"Shamrock Technology","SHAMROCK SRC1452LP"},
-    {"Shamrock Technology","SHAMROCK SRC1452P"},
-    {"Shamrock Technology","SHAMROCK SRC1502"},
-    {"Shamrock Technology","SHAMROCK SRC1502L"},
-    {"Shamrock Technology","SHAMROCK SRC1505"},
-    {"Shamrock Technology","SHAMROCK SRC1507"},
-    {"Shamrock Technology","SHAMROCK SRC1702"},
-    {"Shamrock Technology","SHAMROCK SRC1702LP"},
-    {"Shamrock Technology","SHAMROCK SRC1703"},
-    {"Shamrock Technology","SHAMROCK SRC1703L"},
-    {"Shamrock Technology","SHAMROCK SRC1705"},
-    {"Shamrock Technology","SHAMROCK SRC1706"},
-    {"Shamrock Technology","SHAMROCK SRC2002"},
-    {"Shamrock Technology","SHAMROCK SRC2002LP"},
-    {"Shamrock Technology","SHAMROCK SRC2102"},
-    {"Shamrock Technology","SHAMROCK SRC2102LP"},
-    {"Siemens","MCF3512 (-K543-)"},
-    {"Siemens","MCF3801 (-K507-)"},
-    {"Siemens","MCF3811 (-K506-)"},
-    {"Siemens","MCF3812 (-K544-V150)"},
-    {"Siemens","MCF3812 (-K544-V155)"},
-    {"Siemens","MCF4611 (-K568-)"},
-    {"Siemens","MCM141V (-K542-)"},
-    {"Siemens","MCM153V (-K563-)"},
-    {"Siemens","MCM15P1 (-K561-)"},
-    {"Siemens","MCM173V (-K553-)"},
-    {"Siemens","MCM174V (-K575-)"},
-    {"Siemens","MCM17P1 (-K551-)"},
-    {"Siemens","MCM19P1 (-K552-)"},
-    {"Siemens","MCM19T1 (-K562-)"},
-    {"Siemens","MCM212V (-K539-)"},
-    {"Siemens","MCM21P1 (-K550-)"},
-    {"Siemens","Xpert 710 (-K557-)"},
-    {"Siemens Nixdorf","MCF3501 (-K451-)"},
-    {"Siemens Nixdorf","MCF3511 (-K505-)"},
-    {"Siemens Nixdorf","MCF3811 (-K506-)"},
-    {"Siemens Nixdorf","MCM1401 (-K292-)"},
-    {"Siemens Nixdorf","MCM1402 (-K343-V318)"},
-    {"Siemens Nixdorf","MCM1403 (-K368-V318)"},
-    {"Siemens Nixdorf","MCM1403 (-K368-V418)"},
-    {"Siemens Nixdorf","MCM1404 (-K372-) >= Rev.7"},
-    {"Siemens Nixdorf","MCM1404 (-K372-) Rev.1-Rev.6"},
-    {"Siemens Nixdorf","MCM1405 (-K449-)"},
-    {"Siemens Nixdorf","MCM1501 (-K302-)"},
-    {"Siemens Nixdorf","MCM1502 (-K323-)"},
-    {"Siemens Nixdorf","MCM1503 (-K344-)"},
-    {"Siemens Nixdorf","MCM1503 (-K344-V418) >= Rev.3A"},
-    {"Siemens Nixdorf","MCM1505 (-K424-)"},
-    {"Siemens Nixdorf","MCM1506 (-K448-V318)"},
-    {"Siemens Nixdorf","MCM1506 (-K448-V418/150)"},
-    {"Siemens Nixdorf","MCM1507 (-K470-)"},
-    {"Siemens Nixdorf","MCM1508 (-K486-)"},
-    {"Siemens Nixdorf","MCM1510 (-K494-)"},
-    {"Siemens Nixdorf","MCM151V (-K469-)"},
-    {"Siemens Nixdorf","MCM152V (-K495-)"},
-    {"Siemens Nixdorf","MCM1551 (-K396-)"},
-    {"Siemens Nixdorf","MCM1552 (-K421-)"},
-    {"Siemens Nixdorf","MCM1701 (-K316-)"},
-    {"Siemens Nixdorf","MCM1702 (-K373-)"},
-    {"Siemens Nixdorf","MCM1703 (-K414-V150)"},
-    {"Siemens Nixdorf","MCM1703 (-K414-V318)"},
-    {"Siemens Nixdorf","MCM1704 (-K425-)"},
-    {"Siemens Nixdorf","MCM1705 (-K471-)"},
-    {"Siemens Nixdorf","MCM1706 (-K488-)"},
-    {"Siemens Nixdorf","MCM1707 (-K512-)"},
-    {"Siemens Nixdorf","MCM171V (-K496-)"},
-    {"Siemens Nixdorf","MCM1751 (-K397-)"},
-    {"Siemens Nixdorf","MCM1753 (-K411-)"},
-    {"Siemens Nixdorf","MCM1754 (-K415-)"},
-    {"Siemens Nixdorf","MCM1755 (-K472-)"},
-    {"Siemens Nixdorf","MCM1901 (-K489-)"},
-    {"Siemens Nixdorf","MCM1902 (-K527-)"},
-    {"Siemens Nixdorf","MCM2101 (-K272-)"},
-    {"Siemens Nixdorf","MCM2102 (-K352-V318)"},
-    {"Siemens Nixdorf","MCM2102 (-K352-V418)"},
-    {"Siemens Nixdorf","MCM2102 (-K352-V518/618)"},
-    {"Siemens Nixdorf","MCM2103 (-K422-)"},
-    {"Siemens Nixdorf","MCM2105 (-K455-)"},
-    {"Siemens Nixdorf","MCM2106 (-K462-)"},
-    {"Siemens Nixdorf","MCM2107 (-K478-)"},
-    {"Siemens Nixdorf","MCM2108 (-K479-)"},
-    {"Siemens Nixdorf","MCM2109 (-K499-)"},
-    {"Siemens Nixdorf","MCM2110 (-K500-)"},
-    {"Siemens Nixdorf","MCM211V (-K508-)"},
-    {"Siemens Nixdorf","MCM21T1 (-K526-)"},
-    {"Siemens Nixdorf","MCQ1901 (-K218-)"},
-    {"Siemens Nixdorf","PM150 (-K408-)"},
-    {"Siemens Nixdorf","PM170 (-K409-)"},
-    {"Siemens Nixdorf","Siemens FD200"},
-    {"Siemens Nixdorf","Siemens Nixdorf MCM1402"},
-    {"Siemens Nixdorf","Siemens Nixdorf MCM1503"},
-    {"Siemens Nixdorf","Siemens Nixdorf MCM1702"},
-    {"Siemens Nixdorf","Siemens Nixdorf MCM2102"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  50kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  54kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  57kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  64kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  69kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  82kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor  92kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor 100kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor 107kHz"},
-    {"Siemens Nixdorf","Siemens Nixdorf Monitor 113kHz"},
-    {"Smile International Corp.","Smile/KFC CA6425DL/CB6425DL"},
-    {"Smile International Corp.","Smile/KFC CA6525DL/CB6525DL"},
-    {"Smile International Corp.","Smile/KFC CA6546SL/CB6546SL"},
-    {"Smile International Corp.","Smile/KFC CA6719SL/CB6719SL"},
-    {"Smile International Corp.","Smile/KFC CA6746SL/CB6746SL"},
-    {"Smile International Corp.","Smile/KFC CA6748SL/CB6748SL"},
-    {"Smile International Corp.","Smile/KFC CA6919SL/CB6919SL"},
-    {"Smile International Corp.","Smile/KFC, 85Khz Monitor"},
-    {"SONY Corporation","KL-W7000"},
-    {"SONY Corporation","KL-W9000"},
-    {"SONY Corporation","SONY CPD-100ES"},
-    {"SONY Corporation","SONY CPD-100EST"},
-    {"SONY Corporation","SONY CPD-100GS"},
-    {"SONY Corporation","SONY CPD-100GST"},
-    {"SONY Corporation","SONY CPD-100SF"},
-    {"SONY Corporation","SONY CPD-100SFB"},
-    {"SONY Corporation","SONY CPD-100SFT"},
-    {"SONY Corporation","SONY CPD-100SX"},
-    {"SONY Corporation","SONY CPD-100VS"},
-    {"SONY Corporation","SONY CPD-101VS iGPE"},
-    {"SONY Corporation","SONY CPD-110GS/110EST"},
-    {"SONY Corporation","SONY CPD-110GS/110EST/T9"},
-    {"SONY Corporation","SONY CPD-120AS"},
-    {"SONY Corporation","SONY CPD-120VS"},
-    {"SONY Corporation","SONY CPD-1302"},
-    {"SONY Corporation","SONY CPD-1304"},
-    {"SONY Corporation","SONY CPD-1304S"},
-    {"SONY Corporation","SONY CPD-1402"},
-    {"SONY Corporation","SONY CPD-1404S"},
-    {"SONY Corporation","SONY CPD-1430"},
-    {"SONY Corporation","SONY CPD-1431"},
-    {"SONY Corporation","SONY CPD-1438"},
-    {"SONY Corporation","SONY CPD-15ES"},
-    {"SONY Corporation","SONY CPD-15ES2"},
-    {"SONY Corporation","SONY CPD-15SF2"},
-    {"SONY Corporation","SONY CPD-15SF7"},
-    {"SONY Corporation","SONY CPD-15SF8"},
-    {"SONY Corporation","SONY CPD-15SF9"},
-    {"SONY Corporation","SONY CPD-15SX1"},
-    {"SONY Corporation","SONY CPD-1604S"},
-    {"SONY Corporation","SONY CPD-1704S"},
-    {"SONY Corporation","SONY CPD-1730"},
-    {"SONY Corporation","SONY CPD-1738"},
-    {"SONY Corporation","SONY CPD-17C1"},
-    {"SONY Corporation","SONY CPD-17ES2"},
-    {"SONY Corporation","SONY CPD-17GS"},
-    {"SONY Corporation","SONY CPD-17MS"},
-    {"SONY Corporation","SONY CPD-17SF2"},
-    {"SONY Corporation","SONY CPD-17SF7"},
-    {"SONY Corporation","SONY CPD-17SF8"},
-    {"SONY Corporation","SONY CPD-17SF8R"},
-    {"SONY Corporation","SONY CPD-17SF9"},
-    {"SONY Corporation","SONY CPD-2003GT"},
-    {"SONY Corporation","SONY CPD-200ES"},
-    {"SONY Corporation","SONY CPD-200EST"},
-    {"SONY Corporation","SONY CPD-200GS"},
-    {"SONY Corporation","SONY CPD-200GST"},
-    {"SONY Corporation","SONY CPD-200SF"},
-    {"SONY Corporation","SONY CPD-200SFT"},
-    {"SONY Corporation","SONY CPD-200SX"},
-    {"SONY Corporation","SONY CPD-201VS iGPE"},
-    {"SONY Corporation","SONY CPD-20SF2"},
-    {"SONY Corporation","SONY CPD-20SF2T"},
-    {"SONY Corporation","SONY CPD-20SF2T5"},
-    {"SONY Corporation","SONY CPD-20SF3"},
-    {"SONY Corporation","SONY CPD-210GS/210EST"},
-    {"SONY Corporation","SONY CPD-210GS/210EST/T9"},
-    {"SONY Corporation","SONY CPD-210SFB"},
-    {"SONY Corporation","SONY CPD-220AS"},
-    {"SONY Corporation","SONY CPD-220GS"},
-    {"SONY Corporation","SONY CPD-220GS/17GS2"},
-    {"SONY Corporation","SONY CPD-220VS"},
-    {"SONY Corporation","SONY CPD-300SFT"},
-    {"SONY Corporation","SONY CPD-300SFT5"},
-    {"SONY Corporation","SONY CPD-420GS"},
-    {"SONY Corporation","SONY CPD-420GS/420GST/19GS2"},
-    {"SONY Corporation","SONY CPD-420GS/GST/19GS2"},
-    {"SONY Corporation","SONY CPD-520GS/520GST/21GS2"},
-    {"SONY Corporation","SONY CPD-520GS/T/T9/21GS2"},
-    {"SONY Corporation","SONY CPD-A100"},
-    {"SONY Corporation","SONY CPD-A200"},
-    {"SONY Corporation","SONY CPD-E100/E100E"},
-    {"SONY Corporation","SONY CPD-E200/E200E"},
-    {"SONY Corporation","SONY CPD-E210"},
-    {"SONY Corporation","SONY CPD-E400/E400E"},
-    {"SONY Corporation","SONY CPD-E500/E500E"},
-    {"SONY Corporation","SONY CPD-G200"},
-    {"SONY Corporation","SONY CPD-G400"},
-    {"SONY Corporation","SONY CPD-G500"},
-    {"SONY Corporation","SONY CPD-H200"},
-    {"SONY Corporation","SONY CPD-L100"},
-    {"SONY Corporation","SONY CPD-L133"},
-    {"SONY Corporation","SONY CPD-L141"},
-    {"SONY Corporation","SONY CPD-L150"},
-    {"SONY Corporation","SONY CPD-L181"},
-    {"SONY Corporation","SONY CPD-L181/181A"},
-    {"SONY Corporation","SONY CPD-L200"},
-    {"SONY Corporation","SONY CPD-L200/M151"},
-    {"SONY Corporation","SONY CPD-V200"},
-    {"SONY Corporation","SONY GDM-1310"},
-    {"SONY Corporation","SONY GDM-17SE1"},
-    {"SONY Corporation","SONY GDM-17SE1T"},
-    {"SONY Corporation","SONY GDM-17SE2T"},
-    {"SONY Corporation","SONY GDM-17SE2T(NEW)"},
-    {"SONY Corporation","SONY GDM-17SE2T5"},
-    {"SONY Corporation","SONY GDM-1936"},
-    {"SONY Corporation","SONY GDM-2000TC"},
-    {"SONY Corporation","SONY GDM-200PS"},
-    {"SONY Corporation","SONY GDM-200PS/T/T9"},
-    {"SONY Corporation","SONY GDM-200PST"},
-    {"SONY Corporation","SONY GDM-2036S"},
-    {"SONY Corporation","SONY GDM-2038"},
-    {"SONY Corporation","SONY GDM-20SE1V"},
-    {"SONY Corporation","SONY GDM-20SE2T"},
-    {"SONY Corporation","SONY GDM-20SE2T5"},
-    {"SONY Corporation","SONY GDM-20SE3T"},
-    {"SONY Corporation","SONY GDM-20SHT"},
-    {"SONY Corporation","SONY GDM-20SHT(NEW)"},
-    {"SONY Corporation","SONY GDM-2100"},
-    {"SONY Corporation","SONY GDM-400PS/400PST/19PS"},
-    {"SONY Corporation","SONY GDM-400PS/T/T9/19PS"},
-    {"SONY Corporation","SONY GDM-500PS"},
-    {"SONY Corporation","SONY GDM-500PS/500PST/21PS"},
-    {"SONY Corporation","SONY GDM-500PS/T/T9/21PS"},
-    {"SONY Corporation","SONY GDM-F400"},
-    {"SONY Corporation","SONY GDM-F400/F400T9"},
-    {"SONY Corporation","SONY GDM-F500"},
-    {"SONY Corporation","SONY GDM-F500/F500T9"},
-    {"SONY Corporation","SONY GDM-W900"},
-    {"SONY Corporation","SONY GVM-1412"},
-    {"SONY Corporation","SONY GVM-2020"},
-    {"SONY Corporation","SONY HMD-A100"},
-    {"SONY Corporation","SONY HMD-A200"},
-    {"SONY Corporation","SONY HMD-H200"},
-    {"SONY Corporation","SONY HMD-V200"},
-    {"SONY Corporation","SONY KL-W7000"},
-    {"SONY Corporation","SONY MS-15SF1"},
-    {"SONY Corporation","SONY MS-15SF1T"},
-    {"SONY Corporation","SONY MS-17SF1"},
-    {"SONY Corporation","SONY MS-17SF1T"},
-    {"SONY Corporation","SONY MS-20SE1"},
-    {"SONY Corporation","SONY MS-20SE1T"},
-    {"SONY Corporation","SONY Multiscan 15sf"},
-    {"SONY Corporation","SONY Multiscan 17sf"},
-    {"SONY Corporation","SONY Multiscan 20se"},
-    {"SONY Corporation","Sony PLM-S700/S700E"},
-    {"SONY Corporation","SONY VMU-1000"},
-    {"Talon Technology Corp.","Talon Tuff/CRT"},
-    {"Tandberg Display","Tandberg Display ErgoScan 15c Item 300"},
-    {"Tandberg Display","Tandberg Display ErgoScan 15c-TCO'92"},
-    {"Tandberg Display","Tandberg Display ErgoScan 15c-TCO'95 Item 300"},
-    {"Tandberg Display","Tandberg Display ErgoScan 15cL-TCO'92 Item 527"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17-TCO'95 Item 540"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17c Item 310"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17c-PnP-TCO'95 Item 310"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17c-TCO'92"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17c-TCO'95 Item 530"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17cM TCO'95 Item 536"},
-    {"Tandberg Display","Tandberg Display ErgoScan 17cM-TCO'92 Item 528"},
-    {"Tandberg Display","Tandberg Display ErgoScan 19c TCO'99 Item 539"},
-    {"Tandberg Display","Tandberg Display ErgoScan 21c-TCO'92 82kHz"},
-    {"Tandberg Display","Tandberg Display ErgoScan 21c-TCO'92/95 95kHz Item 525/531"},
-    {"Tandberg Display","Tandberg Display ErgoScan 21cH TCO'95 Item 535"},
-    {"Tandberg Display","Tandberg Display ErgoScan 21cH-TCO'92/95 Item 526/532"},
-    {"Tandberg Display","Tandberg Display ErgoScan 350 TCO'95 Item 537"},
-    {"Tandberg Display","Tandberg Display ErgoScan 400M Item 600"},
-    {"Tandberg Display","Tandberg Display ErgoScan 400S TCO'95 Item 538"},
-    {"Tandberg Display","Tandberg Display ErgoScan 450 TCO'95 Item 534"},
-    {"Tandberg Display","Tandberg Display ErgoScan 500 TCO'95 Item 533"},
-    {"Tandberg Display","Tandberg Display ErgoScan 500X TCO'99 Item 543"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 12 Item 570"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 14 Item 571"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 15 Item 573"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 15 uten høyt/USB Item 579"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 16 Item 572"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 18 Item 578"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 360 Item 577"},
-    {"Tandberg Display","Tandberg Display ErgoScan LCD 380 Item 575"},
-    {"Tatung","Intelliscan TM442x series"},
-    {"Tatung","Intelliscan TM442x series 14''"},
-    {"Tatung","Intelliscan TM452x series"},
-    {"Tatung","Intelliscan TM452x series 15''"},
-    {"Tatung","Intelliscan TM651x series"},
-    {"Tatung","Intelliscan TM651x series 15''"},
-    {"Tatung","Intelliscan TM671x series"},
-    {"Tatung","Intelliscan TM671x series 17''"},
-    {"Tatung","Tatung    C5D"},
-    {"Tatung","Tatung C5D"},
-    {"Tatung","Tatung CM-1495G"},
-    {"Tatung","Tatung CM-1498M"},
-    {"Tatung","Tatung CM-1498R"},
-    {"Tatung","Tatung CM-1498T"},
-    {"Tatung","Tatung CM-14UH"},
-    {"Tatung","Tatung CM-1700"},
-    {"Tatung","Tatung CM-17MC"},
-    {"Tatung","Tatung CM-2000"},
-    {"Tatung","Tatung MM-1295"},
-    {"Tatung","Tatung VDBU C9N 19'' Colour Monitor"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1400G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1448G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1500G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1500N"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1548G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1564HS"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1564S"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1700G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1750G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1764S"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-1785G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-2000G"},
-    {"Techmedia Computer System Corp.","Techmedia TCM-214C"},
-    {"TECO Electric & Machinery Co.,Ltd.","TECO 15-inch VMN570"},
-    {"TECO Electric & Machinery Co.,Ltd.","TECO 17-inch VMN785T"},
-    {"TECO Electric & Machinery Co.,Ltd.","TECO 17-inch VMN798FT PURE FLAT"},
-    {"TECO Information Systems, Inc.","TECO TE1491"},
-    {"TECO Information Systems, Inc.","TECO TE1591"},
-    {"TECO Information Systems, Inc.","TECO TE1791"},
-    {"TECO Information Systems, Inc.","TECO TE2191"},
-    {"TOP Victory Electronics Co.,Ltd","1770,1770A,1770+ & 1770A+"},
-    {"TOP Victory Electronics Co.,Ltd","1785,1785A,1785+ & 1785A+"},
-    {"TOP Victory Electronics Co.,Ltd","1995,1995A,1995S & 1995SA"},
-    {"TOSHIBA","Toshiba 15 Type 1024x768 Panel"},
-    {"Toshiba","Toshiba DA1566M, Infinia 15-inch Monitor"},
-    {"Toshiba","Toshiba DA1766M, Infinia 17-inch Monitor"},
-    {"Toshiba","Toshiba DP566M, Equium 15-inch Monitor"},
-    {"Toshiba","Toshiba DP782M, Equium 17-inch Monitor"},
-    {"Toshiba","Toshiba DR569M (PV2001U)"},
-    {"Toshiba","Toshiba DR769MF (PV2002U)"},
-    {"Toshiba","Toshiba P17CM00"},
-    {"Toshiba","Toshiba P17CM01"},
-    {"Toshiba","Toshiba P17CS01"},
-    {"Toshiba","Toshiba P17CU01"},
-    {"Toshiba","Toshiba P21CM00"},
-    {"Toshiba","Toshiba P21CR01"},
-    {"Toshiba","Toshiba TekBright 500V (PV2005U)"},
-    {"Toshiba","Toshiba TekBright 510V (PV2009U)"},
-    {"Toshiba","Toshiba TekBright 700P (PV2006U)"},
-    {"Toshiba","Toshiba TekBright 700PM (PV2003U)"},
-    {"Toshiba","Toshiba TekBright 710V (PV2010U)"},
-    {"TOTOKU Electric","TOTOKU CH20M-30/82A"},
-    {"TOTOKU Electric","TOTOKU CV142J"},
-    {"TOTOKU Electric","TOTOKU CV14M-24/58A"},
-    {"TOTOKU Electric","TOTOKU CV151"},
-    {"TOTOKU Electric","TOTOKU CV151PJ1"},
-    {"TOTOKU Electric","TOTOKU CV172J"},
-    {"TOTOKU Electric","TOTOKU CV172PJ1"},
-    {"TOTOKU Electric","TOTOKU CV173"},
-    {"TOTOKU Electric","TOTOKU CV173PRO"},
-    {"TOTOKU Electric","TOTOKU CV173PRO PLUS"},
-    {"TOTOKU Electric","TOTOKU CV174"},
-    {"TOTOKU Electric","TOTOKU CV175"},
-    {"TOTOKU Electric","TOTOKU CV176PJ1"},
-    {"TOTOKU Electric","TOTOKU CV17M-24/65A"},
-    {"TOTOKU Electric","TOTOKU CV211J"},
-    {"TOTOKU Electric","TOTOKU CV211PJ1"},
-    {"TOTOKU Electric","TOTOKU CV212"},
-    {"TOTOKU Electric","TOTOKU CV213"},
-    {"TOTOKU Electric","TOTOKU CV213 PLUS"},
-    {"TOTOKU Electric","TOTOKU CV213PJ1"},
-    {"TOTOKU Electric","TOTOKU CV411PJ"},
-    {"TOTOKU Electric","TOTOKU CV411T"},
-    {"TOTOKU Electric","TOTOKU CV511PJ1"},
-    {"TOTOKU Electric","TOTOKU CV511R"},
-    {"TOTOKU Electric","TOTOKU CV511T"},
-    {"TOTOKU Electric","TOTOKU CV512PJ"},
-    {"TOTOKU Electric","TOTOKU CV711R"},
-    {"TOTOKU Electric","TOTOKU CV721X"},
-    {"TOTOKU Electric","TOTOKU CV821X"},
-    {"TOTOKU Electric","TOTOKU CV921X"},
-    {"TOTOKU Electric","TOTOKU CV931X"},
-    {"TOTOKU Electric","TOTOKU T15L-ID"},
-    {"TOTOKU Electric","TOTOKU TS-701D"},
-    {"TOTOKU Electric","TOTOKU TS-702F"},
-    {"TriGem Computer, Inc.","Trigem 7650R"},
-    {"TriGem Computer, Inc.","Trigem 7700SP"},
-    {"TriGem Computer, Inc.","Trigem 7800ST"},
-    {"TriGem Computer, Inc.","Trigem 7850R"},
-    {"TriGem Computer, Inc.","Trigem DG2424CP"},
-    {"TriGem Computer, Inc.","Trigem DG2424SP"},
-    {"TriGem Computer, Inc.","Trigem TG4279PX"},
-    {"TriGem Computer, Inc.","Trigem TG4480C"},
-    {"TriGem Computer, Inc.","Trigem TG4480HX"},
-    {"TriGem Computer, Inc.","Trigem TG4480S"},
-    {"TriGem Computer, Inc.","Trigem TG4480SX"},
-    {"TriGem Computer, Inc.","Trigem TG5481CX"},
-    {"TriGem Computer, Inc.","Trigem TG5481G"},
-    {"TriGem Computer, Inc.","Trigem TG5650K"},
-    {"TriGem Computer, Inc.","Trigem TG5650S"},
-    {"TriGem Computer, Inc.","Trigem TG5651GX"},
-    {"TriGem Computer, Inc.","Trigem TG7088PM"},
-    {"TriGem Computer, Inc.","Trigem TG7480G"},
-    {"TriGem Computer, Inc.","Trigem TG7480K"},
-    {"TriGem Computer, Inc.","Trigem TG7650C"},
-    {"TriGem Computer, Inc.","Trigem TG7650GX"},
-    {"TriGem Computer, Inc.","Trigem TG7650R"},
-    {"TriGem Computer, Inc.","Trigem TG7651GX"},
-    {"TriGem Computer, Inc.","Trigem TG7652S"},
-    {"TriGem Computer, Inc.","Trigem TG7687CM"},
-    {"TTX Computer Products, Inc.","TTX 3435AG"},
-    {"TTX Computer Products, Inc.","TTX 3436AG"},
-    {"TTX Computer Products, Inc.","TTX 3450AG"},
-    {"TVM Corp."," TVM AS4Dp/LR4Dp Model"},
-    {"TVM Corp."," TVM AS5S Model"},
-    {"TVM Corp."," TVM TCO5S Model"},
-    {"TVM Corp."," TVM TCO6S Model"},
-    {"TVM Corp.","TVM AS4Dp/LR4Dp/LR4Dc"},
-    {"TVM Corp.","TVM AS5s"},
-    {"TVM Corp.","TVM MG-11"},
-    {"TVM Corp.","TVM SuperSync 3+"},
-    {"TVM Corp.","TVM SuperSync 4A"},
-    {"TVM Corp.","TVM SuperSync 5A"},
-    {"TVM Corp.","TVM SuperSync 6A"},
-    {"TVM Corp.","TVM SuperSync 7A"},
-    {"TW Casper Corp.","TW Casper Corp. TM-5156H"},
-    {"TW Casper Corp.","TW Casper Corp. TM-5414"},
-    {"Unisys","Unisys EVG-142-COL"},
-    {"Unisys","Unisys EVG-152-COL"},
-    {"Unisys","Unisys EVG-153-COL"},
-    {"Unisys","Unisys EVG-174-COL"},
-    {"Unisys","Unisys EVG-215-COL"},
-    {"Unisys","Unisys EVG-300-COL"},
-    {"Unisys","Unisys EVG-400-COL"},
-    {"Unisys","Unisys EVG-500-COL"},
-    {"Unisys","UNISYS EVG1000-E2"},
-    {"Unisys","UNISYS EVG2000-E"},
-    {"Unisys","UNISYS EVG2000-P"},
-    {"Unisys","Unisys EVG2100-E"},
-    {"Unisys","Unisys EVG2100-P"},
-    {"Unisys","UNISYS EVG3000-E"},
-    {"Unisys","UNISYS EVG3000-P"},
-    {"Unisys","UNISYS EVG3100-E"},
-    {"Unisys","UNISYS EVG3100-P"},
-    {"Unisys","Unisys EVG4000-P"},
-    {"Unisys","Unisys EVG5000-P"},
-    {"Unisys","Unisys SVG-100-COL"},
-    {"Unisys","Unisys SVG-200-COL"},
-    {"Unisys","Unisys SVG-201-COL"},
-    {"Unisys","Unisys SVG-250-COL"},
-    {"Unisys","Unisys VGA-200-MON"},
-    {"Unisys","Unisys VGA-250-MON"},
-    {"ViewSonic Corporation","Optiquest 1000S"},
-    {"ViewSonic Corporation","Optiquest 1562A-2"},
-    {"ViewSonic Corporation","Optiquest 1769DC"},
-    {"ViewSonic Corporation","Optiquest Q100"},
-    {"ViewSonic Corporation","Optiquest Q41"},
-    {"ViewSonic Corporation","Optiquest Q51"},
-    {"ViewSonic Corporation","Optiquest Q53"},
-    {"ViewSonic Corporation","Optiquest Q71"},
-    {"ViewSonic Corporation","Optiquest Q71-2"},
-    {"ViewSonic Corporation","Optiquest V115"},
-    {"ViewSonic Corporation","Optiquest V115T"},
-    {"ViewSonic Corporation","Optiquest V55"},
-    {"ViewSonic Corporation","Optiquest V641"},
-    {"ViewSonic Corporation","Optiquest V655"},
-    {"ViewSonic Corporation","Optiquest V655-2"},
-    {"ViewSonic Corporation","Optiquest V655-3"},
-    {"ViewSonic Corporation","Optiquest V73"},
-    {"ViewSonic Corporation","Optiquest V75"},
-    {"ViewSonic Corporation","Optiquest V773"},
-    {"ViewSonic Corporation","Optiquest V773-2"},
-    {"ViewSonic Corporation","Optiquest V775"},
-    {"ViewSonic Corporation","Optiquest V775-2"},
-    {"ViewSonic Corporation","Optiquest V95"},
-    {"ViewSonic Corporation","Optiquest VA656"},
-    {"ViewSonic Corporation","ViewSonic 1"},
-    {"ViewSonic Corporation","ViewSonic 14E"},
-    {"ViewSonic Corporation","ViewSonic 14ES"},
-    {"ViewSonic Corporation","Viewsonic 15"},
-    {"ViewSonic Corporation","ViewSonic 15E"},
-    {"ViewSonic Corporation","ViewSonic 15ES"},
-    {"ViewSonic Corporation","ViewSonic 15ES-2"},
-    {"ViewSonic Corporation","ViewSonic 15EX"},
-    {"ViewSonic Corporation","ViewSonic 15G"},
-    {"ViewSonic Corporation","ViewSonic 15G-2"},
-    {"ViewSonic Corporation","ViewSonic 15GA"},
-    {"ViewSonic Corporation","ViewSonic 15GA-2"},
-    {"ViewSonic Corporation","ViewSonic 15GS"},
-    {"ViewSonic Corporation","ViewSonic 15GS-2"},
-    {"ViewSonic Corporation","ViewSonic 15GS-3"},
-    {"ViewSonic Corporation","ViewSonic 17"},
-    {"ViewSonic Corporation","ViewSonic 17E"},
-    {"ViewSonic Corporation","ViewSonic 17EA"},
-    {"ViewSonic Corporation","ViewSonic 17G"},
-    {"ViewSonic Corporation","ViewSonic 17GA"},
-    {"ViewSonic Corporation","ViewSonic 17GA-2"},
-    {"ViewSonic Corporation","ViewSonic 17GS"},
-    {"ViewSonic Corporation","ViewSonic 17GS-2"},
-    {"ViewSonic Corporation","ViewSonic 17PS"},
-    {"ViewSonic Corporation","ViewSonic 17PS-2"},
-    {"ViewSonic Corporation","ViewSonic 2"},
-    {"ViewSonic Corporation","ViewSonic 20"},
-    {"ViewSonic Corporation","ViewSonic 20G"},
-    {"ViewSonic Corporation","ViewSonic 20G-2"},
-    {"ViewSonic Corporation","ViewSonic 20PS"},
-    {"ViewSonic Corporation","ViewSonic 21"},
-    {"ViewSonic Corporation","ViewSonic 21PS"},
-    {"ViewSonic Corporation","ViewSonic 29GA"},
-    {"ViewSonic Corporation","ViewSonic 3"},
-    {"ViewSonic Corporation","ViewSonic 4"},
-    {"ViewSonic Corporation","ViewSonic 4E"},
-    {"ViewSonic Corporation","ViewSonic 5"},
-    {"ViewSonic Corporation","ViewSonic 5+"},
-    {"ViewSonic Corporation","ViewSonic 5E"},
-    {"ViewSonic Corporation","ViewSonic 6"},
-    {"ViewSonic Corporation","ViewSonic 6E"},
-    {"ViewSonic Corporation","ViewSonic 6FS"},
-    {"ViewSonic Corporation","ViewSonic 7"},
-    {"ViewSonic Corporation","ViewSonic 7E"},
-    {"ViewSonic Corporation","ViewSonic 8"},
-    {"ViewSonic Corporation","ViewSonic A110"},
-    {"ViewSonic Corporation","ViewSonic A110-2"},
-    {"ViewSonic Corporation","ViewSonic A50"},
-    {"ViewSonic Corporation","ViewSonic A70"},
-    {"ViewSonic Corporation","ViewSonic A70-2"},
-    {"ViewSonic Corporation","ViewSonic A70f"},
-    {"ViewSonic Corporation","ViewSonic A75f"},
-    {"ViewSonic Corporation","ViewSonic A75f-2"},
-    {"ViewSonic Corporation","ViewSonic A75s"},
-    {"ViewSonic Corporation","ViewSonic A75s-2"},
-    {"ViewSonic Corporation","ViewSonic A90"},
-    {"ViewSonic Corporation","ViewSonic A90-2"},
-    {"ViewSonic Corporation","ViewSonic A95f"},
-    {"ViewSonic Corporation","ViewSonic AL750"},
-    {"ViewSonic Corporation","ViewSonic AL950"},
-    {"ViewSonic Corporation","ViewSonic E40"},
-    {"ViewSonic Corporation","ViewSonic E40-2"},
-    {"ViewSonic Corporation","ViewSonic E40-3"},
-    {"ViewSonic Corporation","ViewSonic E40-4"},
-    {"ViewSonic Corporation","ViewSonic E40-5"},
-    {"ViewSonic Corporation","ViewSonic E41"},
-    {"ViewSonic Corporation","ViewSonic E50"},
-    {"ViewSonic Corporation","ViewSonic E50-2"},
-    {"ViewSonic Corporation","ViewSonic E51"},
-    {"ViewSonic Corporation","ViewSonic E53"},
-    {"ViewSonic Corporation","ViewSonic E53-G"},
-    {"ViewSonic Corporation","ViewSonic E55"},
-    {"ViewSonic Corporation","ViewSonic E641"},
-    {"ViewSonic Corporation","ViewSonic E641-2"},
-    {"ViewSonic Corporation","ViewSonic E641-3"},
-    {"ViewSonic Corporation","ViewSonic E651"},
-    {"ViewSonic Corporation","ViewSonic E651-2"},
-    {"ViewSonic Corporation","ViewSonic E651-3"},
-    {"ViewSonic Corporation","ViewSonic E653"},
-    {"ViewSonic Corporation","ViewSonic E653-2"},
-    {"ViewSonic Corporation","ViewSonic E655"},
-    {"ViewSonic Corporation","ViewSonic E655-2"},
-    {"ViewSonic Corporation","ViewSonic E655-3"},
-    {"ViewSonic Corporation","ViewSonic E655-4"},
-    {"ViewSonic Corporation","ViewSonic E70"},
-    {"ViewSonic Corporation","ViewSonic E70-2"},
-    {"ViewSonic Corporation","ViewSonic E70-3"},
-    {"ViewSonic Corporation","ViewSonic E70-4"},
-    {"ViewSonic Corporation","ViewSonic E70-5"},
-    {"ViewSonic Corporation","ViewSonic E70f"},
-    {"ViewSonic Corporation","ViewSonic E71"},
-    {"ViewSonic Corporation","ViewSonic E71-2"},
-    {"ViewSonic Corporation","ViewSonic E75"},
-    {"ViewSonic Corporation","ViewSonic E771"},
-    {"ViewSonic Corporation","ViewSonic E771-2"},
-    {"ViewSonic Corporation","ViewSonic E771-4"},
-    {"ViewSonic Corporation","ViewSonic E771TC"},
-    {"ViewSonic Corporation","ViewSonic E771TR"},
-    {"ViewSonic Corporation","ViewSonic E773"},
-    {"ViewSonic Corporation","ViewSonic E790"},
-    {"ViewSonic Corporation","ViewSonic E790-3"},
-    {"ViewSonic Corporation","ViewSonic E790B"},
-    {"ViewSonic Corporation","ViewSonic E790B-4"},
-    {"ViewSonic Corporation","ViewSonic E810"},
-    {"ViewSonic Corporation","ViewSonic E90"},
-    {"ViewSonic Corporation","ViewSonic EA771"},
-    {"ViewSonic Corporation","ViewSonic EA771B"},
-    {"ViewSonic Corporation","ViewSonic EF70"},
-    {"ViewSonic Corporation","ViewSonic G50m"},
-    {"ViewSonic Corporation","ViewSonic G55"},
-    {"ViewSonic Corporation","ViewSonic G653"},
-    {"ViewSonic Corporation","ViewSonic G653-2"},
-    {"ViewSonic Corporation","ViewSonic G655"},
-    {"ViewSonic Corporation","ViewSonic G655-2"},
-    {"ViewSonic Corporation","ViewSonic G655TR"},
-    {"ViewSonic Corporation","ViewSonic G70m"},
-    {"ViewSonic Corporation","ViewSonic G70mb"},
-    {"ViewSonic Corporation","ViewSonic G771"},
-    {"ViewSonic Corporation","ViewSonic G773"},
-    {"ViewSonic Corporation","ViewSonic G773-2"},
-    {"ViewSonic Corporation","ViewSonic G773-3"},
-    {"ViewSonic Corporation","ViewSonic G790"},
-    {"ViewSonic Corporation","ViewSonic G790-2"},
-    {"ViewSonic Corporation","ViewSonic G800"},
-    {"ViewSonic Corporation","ViewSonic G810"},
-    {"ViewSonic Corporation","ViewSonic G810-2"},
-    {"ViewSonic Corporation","ViewSonic G810-4"},
-    {"ViewSonic Corporation","ViewSonic G810-5"},
-    {"ViewSonic Corporation","ViewSonic G90f"},
-    {"ViewSonic Corporation","ViewSonic G90m"},
-    {"ViewSonic Corporation","ViewSonic G90mb"},
-    {"ViewSonic Corporation","ViewSonic GA655"},
-    {"ViewSonic Corporation","ViewSonic GA771"},
-    {"ViewSonic Corporation","ViewSonic GF775"},
-    {"ViewSonic Corporation","ViewSonic GS771"},
-    {"ViewSonic Corporation","ViewSonic GS773"},
-    {"ViewSonic Corporation","ViewSonic GS773-2"},
-    {"ViewSonic Corporation","ViewSonic GS790"},
-    {"ViewSonic Corporation","ViewSonic GS790TC"},
-    {"ViewSonic Corporation","ViewSonic GS815"},
-    {"ViewSonic Corporation","ViewSonic GT770"},
-    {"ViewSonic Corporation","ViewSonic GT775"},
-    {"ViewSonic Corporation","ViewSonic GT775-3"},
-    {"ViewSonic Corporation","ViewSonic GT800"},
-    {"ViewSonic Corporation","ViewSonic M50"},
-    {"ViewSonic Corporation","ViewSonic M70"},
-    {"ViewSonic Corporation","ViewSonic M70B"},
-    {"ViewSonic Corporation","ViewSonic MB110"},
-    {"ViewSonic Corporation","ViewSonic MB50"},
-    {"ViewSonic Corporation","ViewSonic MB70"},
-    {"ViewSonic Corporation","ViewSonic MB90"},
-    {"ViewSonic Corporation","ViewSonic P220f"},
-    {"ViewSonic Corporation","ViewSonic P655"},
-    {"ViewSonic Corporation","ViewSonic P775"},
-    {"ViewSonic Corporation","ViewSonic P795"},
-    {"ViewSonic Corporation","ViewSonic P810"},
-    {"ViewSonic Corporation","ViewSonic P810-3"},
-    {"ViewSonic Corporation","ViewSonic P810-4"},
-    {"ViewSonic Corporation","ViewSonic P810-A"},
-    {"ViewSonic Corporation","ViewSonic P810-E"},
-    {"ViewSonic Corporation","ViewSonic P810-ER"},
-    {"ViewSonic Corporation","ViewSonic P810-MR"},
-    {"ViewSonic Corporation","ViewSonic P815"},
-    {"ViewSonic Corporation","ViewSonic P815-4"},
-    {"ViewSonic Corporation","ViewSonic P817"},
-    {"ViewSonic Corporation","ViewSonic P817-E"},
-    {"ViewSonic Corporation","ViewSonic P95f"},
-    {"ViewSonic Corporation","ViewSonic PF75"},
-    {"ViewSonic Corporation","ViewSonic PF775"},
-    {"ViewSonic Corporation","ViewSonic PF77a"},
-    {"ViewSonic Corporation","ViewSonic PF77d"},
-    {"ViewSonic Corporation","ViewSonic PF790"},
-    {"ViewSonic Corporation","ViewSonic PF790-2"},
-    {"ViewSonic Corporation","ViewSonic PF795"},
-    {"ViewSonic Corporation","ViewSonic PF815"},
-    {"ViewSonic Corporation","ViewSonic PF815-2"},
-    {"ViewSonic Corporation","ViewSonic PF817"},
-    {"ViewSonic Corporation","ViewSonic PF95"},
-    {"ViewSonic Corporation","ViewSonic PF97a"},
-    {"ViewSonic Corporation","ViewSonic PF97d"},
-    {"ViewSonic Corporation","ViewSonic PJ1000"},
-    {"ViewSonic Corporation","ViewSonic PJ1060"},
-    {"ViewSonic Corporation","ViewSonic PJ1060-2"},
-    {"ViewSonic Corporation","ViewSonic PJ1200"},
-    {"ViewSonic Corporation","ViewSonic PJ800"},
-    {"ViewSonic Corporation","ViewSonic PJ820"},
-    {"ViewSonic Corporation","ViewSonic PJ850"},
-    {"ViewSonic Corporation","ViewSonic PJ853"},
-    {"ViewSonic Corporation","ViewSonic PJ860"},
-    {"ViewSonic Corporation","ViewSonic PJ860-2"},
-    {"ViewSonic Corporation","ViewSonic PJL1005"},
-    {"ViewSonic Corporation","ViewSonic PJL1035"},
-    {"ViewSonic Corporation","ViewSonic PJL1035-2"},
-    {"ViewSonic Corporation","ViewSonic PJL802"},
-    {"ViewSonic Corporation","ViewSonic PJL850"},
-    {"ViewSonic Corporation","ViewSonic PJL855"},
-    {"ViewSonic Corporation","ViewSonic PS775"},
-    {"ViewSonic Corporation","ViewSonic PS775-2"},
-    {"ViewSonic Corporation","ViewSonic PS790"},
-    {"ViewSonic Corporation","ViewSonic PS790-2"},
-    {"ViewSonic Corporation","ViewSonic PS795"},
-    {"ViewSonic Corporation","ViewSonic PT770"},
-    {"ViewSonic Corporation","ViewSonic PT771"},
-    {"ViewSonic Corporation","ViewSonic PT775"},
-    {"ViewSonic Corporation","ViewSonic PT775-6"},
-    {"ViewSonic Corporation","ViewSonic PT795"},
-    {"ViewSonic Corporation","ViewSonic PT810"},
-    {"ViewSonic Corporation","ViewSonic PT810-2"},
-    {"ViewSonic Corporation","ViewSonic PT810-3"},
-    {"ViewSonic Corporation","ViewSonic PT813"},
-    {"ViewSonic Corporation","ViewSonic S6E"},
-    {"ViewSonic Corporation","ViewSonic VA800"},
-    {"ViewSonic Corporation","ViewSonic VE150"},
-    {"ViewSonic Corporation","ViewSonic VE150-2"},
-    {"ViewSonic Corporation","ViewSonic VE150B"},
-    {"ViewSonic Corporation","ViewSonic VE150b-2"},
-    {"ViewSonic Corporation","ViewSonic VE151"},
-    {"ViewSonic Corporation","ViewSonic VE170"},
-    {"ViewSonic Corporation","ViewSonic VE170b"},
-    {"ViewSonic Corporation","ViewSonic VG150"},
-    {"ViewSonic Corporation","ViewSonic VG151"},
-    {"ViewSonic Corporation","ViewSonic VG151TR"},
-    {"ViewSonic Corporation","ViewSonic VG175"},
-    {"ViewSonic Corporation","ViewSonic VG180"},
-    {"ViewSonic Corporation","ViewSonic VG180-2"},
-    {"ViewSonic Corporation","ViewSonic VG181"},
-    {"ViewSonic Corporation","ViewSonic VP140"},
-    {"ViewSonic Corporation","ViewSonic VP140-2"},
-    {"ViewSonic Corporation","ViewSonic VP140-3"},
-    {"ViewSonic Corporation","ViewSonic VP140TR"},
-    {"ViewSonic Corporation","ViewSonic VP150"},
-    {"ViewSonic Corporation","ViewSonic VP150m"},
-    {"ViewSonic Corporation","ViewSonic VP151"},
-    {"ViewSonic Corporation","ViewSonic VP181"},
-    {"ViewSonic Corporation","ViewSonic VP190"},
-    {"ViewSonic Corporation","ViewSonic VP211HD"},
-    {"ViewSonic Corporation","ViewSonic VPA138"},
-    {"ViewSonic Corporation","ViewSonic VPA145"},
-    {"ViewSonic Corporation","ViewSonic VPA150"},
-    {"ViewSonic Corporation","ViewSonic VPA150-2"},
-    {"ViewSonic Corporation","ViewSonic VPD150"},
-    {"ViewSonic Corporation","ViewSonic VPD180"},
-    {"ViewSonic Corporation","ViewSonic Z50-2"},
-    {"ViewSonic Corporation","ViewSonic Z70"},
-    {"ViewSonic Corporation","ViewSonic Z90"},
-    {"WYSE Technology","WYSE Technology WY-670"},
-    {"WYSE Technology","WYSE Technology WY-890N"},
-    {"Zenith Data Systems","Zenith ZCM-1411"},
-    {"Zenith Data Systems","Zenith ZCM-1426"},
-    {"Zenith Data Systems","Zenith ZCM-1440"},
-    {"Zenith Data Systems","Zenith ZCM-1450"},
-    {"Zenith Data Systems","Zenith ZCM-1520"},
-    {"Zenith Data Systems","Zenith ZCM-1522"},
-    {"Zenith Data Systems","Zenith ZCM-1540"},
-    {"Zenith Data Systems","Zenith ZCM-1550"},
-    {"Zenith Data Systems","Zenith ZCM-1740"},
-    {"Zenith Data Systems","Zenith ZCM-1750"},
-    {"",""},
-    };
-
diff --git a/contrib/samples/deprecated/Makefile.in b/contrib/samples/deprecated/Makefile.in
deleted file mode 100644
index 94ab5c0403..0000000000
--- a/contrib/samples/deprecated/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-
-CONTRIB_SAMPLES=proplist resource treelay
-
-all:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
diff --git a/contrib/samples/deprecated/proplist/.cvsignore b/contrib/samples/deprecated/proplist/.cvsignore
deleted file mode 100644
index 627ed35cd1..0000000000
--- a/contrib/samples/deprecated/proplist/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-proplistM5.mcp
-proplistM*Data
-*Classic?Debug*
-*Classic?Release*
-*Carbon?Debug*
-*Carbon?Release*
-proplist
diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in
deleted file mode 100644
index ed5d6c960b..0000000000
--- a/contrib/samples/deprecated/proplist/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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-PROPLIST_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)
-PROPLIST_OBJECTS =  \
-	$(__proplist_os2_lib_res) \
-	proplist_proplist.o \
-	$(__proplist___win32rc)
-
-### 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@__proplist___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C proplist$(EXEEXT)
-@COND_PLATFORM_MAC_1@__proplist___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___proplist___os2_emxbindcmd = $(NM) proplist$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep proplist$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__proplist___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___proplist___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_OS2_1@__proplist_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__proplist_bundle___depname = proplist_bundle
-@COND_TOOLKIT_COCOA@____proplist_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	proplist.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____proplist_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	proplist.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@__proplist___win32rc = proplist_proplist_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 = $(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 proplist$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: proplist$(EXEEXT) $(__proplist_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f proplist$(EXEEXT)
-	rm -rf proplist.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
-	$(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
-	$(__proplist___mac_rezcmd)
-	$(__proplist___mac_setfilecmd)
-	$(__proplist___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p proplist.app/Contents
-	mkdir -p proplist.app/Contents/MacOS
-	mkdir -p proplist.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/proplist/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >proplist.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >proplist.app/Contents/PkgInfo
-	
-	
-	ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns proplist.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@proplist_bundle: $(____proplist_BUNDLE_TGT_REF_DEP)
-
-proplist_proplist.o: $(srcdir)/proplist.cpp
-	$(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $(srcdir)/proplist.cpp
-
-proplist_proplist_rc.o: $(srcdir)/proplist.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean proplist_bundle
diff --git a/contrib/samples/deprecated/proplist/cross.bmp b/contrib/samples/deprecated/proplist/cross.bmp
deleted file mode 100644
index 079cb0dd58..0000000000
Binary files a/contrib/samples/deprecated/proplist/cross.bmp and /dev/null differ
diff --git a/contrib/samples/deprecated/proplist/makefile.bcc b/contrib/samples/deprecated/proplist/makefile.bcc
deleted file mode 100644
index ba10e45c5f..0000000000
--- a/contrib/samples/deprecated/proplist/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PROPLIST_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)
-PROPLIST_OBJECTS =  \
-	$(OBJS)\proplist_proplist.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)\proplist.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)\proplist.exe del $(OBJS)\proplist.exe
-	-if exist $(OBJS)\proplist.tds del $(OBJS)\proplist.tds
-	-if exist $(OBJS)\proplist.ilc del $(OBJS)\proplist.ilc
-	-if exist $(OBJS)\proplist.ild del $(OBJS)\proplist.ild
-	-if exist $(OBJS)\proplist.ilf del $(OBJS)\proplist.ilf
-	-if exist $(OBJS)\proplist.ils del $(OBJS)\proplist.ils
-
-$(OBJS)\proplist.exe: $(PROPLIST_OBJECTS)  $(OBJS)\proplist_proplist.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(PROPLIST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\proplist_proplist.res
-|
-
-$(OBJS)\proplist_proplist.obj: .\proplist.cpp
-	$(CXX) -q -c -P -o$@ $(PROPLIST_CXXFLAGS) $**
-
-$(OBJS)\proplist_proplist.res: .\proplist.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/proplist/makefile.gcc b/contrib/samples/deprecated/proplist/makefile.gcc
deleted file mode 100644
index a2046ec037..0000000000
--- a/contrib/samples/deprecated/proplist/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PROPLIST_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)
-PROPLIST_OBJECTS =  \
-	$(OBJS)\proplist_proplist.o \
-	$(OBJS)\proplist_proplist_rc.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)\proplist.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\proplist.exe del $(OBJS)\proplist.exe
-
-$(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist_rc.o
-	$(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__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)\proplist_proplist.o: ./proplist.cpp
-	$(CXX) -c -o $@ $(PROPLIST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\proplist_proplist_rc.o: ./proplist.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/deprecated/proplist/makefile.unx b/contrib/samples/deprecated/proplist/makefile.unx
deleted file mode 100644
index e7143b6c99..0000000000
--- a/contrib/samples/deprecated/proplist/makefile.unx
+++ /dev/null
@@ -1,23 +0,0 @@
-# Purpose: makefile for proplist example (Unix)
-# Created: 2000-03-15
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = proplist
-
-OBJECTS = $(PROGRAM).o
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/deprecated/proplist/makefile.vc b/contrib/samples/deprecated/proplist/makefile.vc
deleted file mode 100644
index c9a3d248b2..0000000000
--- a/contrib/samples/deprecated/proplist/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-PROPLIST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\proplist.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)
-PROPLIST_OBJECTS =  \
-	$(OBJS)\proplist_proplist.obj \
-	$(OBJS)\proplist_proplist.res
-
-### 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)\proplist.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)\proplist.exe del $(OBJS)\proplist.exe
-	-if exist $(OBJS)\proplist.ilk del $(OBJS)\proplist.ilk
-	-if exist $(OBJS)\proplist.pdb del $(OBJS)\proplist.pdb
-
-$(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(PROPLIST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\proplist_proplist.obj: .\proplist.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PROPLIST_CXXFLAGS) $**
-
-$(OBJS)\proplist_proplist.res: .\proplist.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat
deleted file mode 100644
index d040ef12ef..0000000000
--- a/contrib/samples/deprecated/proplist/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PROPLIST_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)
-PROPLIST_OBJECTS =  &
-	$(OBJS)\proplist_proplist.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\proplist.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)\proplist.exe del $(OBJS)\proplist.exe
-
-$(OBJS)\proplist.exe :  $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
-	@%create $(OBJS)\proplist.lbc
-	@%append $(OBJS)\proplist.lbc option quiet
-	@%append $(OBJS)\proplist.lbc name $^@
-	@%append $(OBJS)\proplist.lbc option caseexact
-	@%append $(OBJS)\proplist.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(PROPLIST_OBJECTS)) do @%append $(OBJS)\proplist.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\proplist.lbc library %i
-	@%append $(OBJS)\proplist.lbc option resource=$(OBJS)\proplist_proplist.res
-	@for %i in () do @%append $(OBJS)\proplist.lbc option stack=%i
-	wlink @$(OBJS)\proplist.lbc
-
-$(OBJS)\proplist_proplist.obj :  .AUTODEPEND .\proplist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $<
-
-$(OBJS)\proplist_proplist.res :  .AUTODEPEND .\proplist.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/deprecated/proplist/proplist.bkl b/contrib/samples/deprecated/proplist/proplist.bkl
deleted file mode 100644
index e2bd9fff9a..0000000000
--- a/contrib/samples/deprecated/proplist/proplist.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="proplist" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            proplist.cpp
-        </sources>
-        <contrib-lib>deprecated</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>proplist.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/deprecated/proplist/proplist.cpp b/contrib/samples/deprecated/proplist/proplist.cpp
deleted file mode 100644
index 29b746899f..0000000000
--- a/contrib/samples/deprecated/proplist/proplist.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        proplist.cpp
-// Purpose:     Property sheet test implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// 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/deprecated/setup.h"
-
-#if !wxUSE_PROPSHEET
-#error Please set wxUSE_PROPSHEET to 1 in contrib/include/wx/deprecated/setup.h and recompile.
-#endif
-
-#include "proplist.h"
-
-IMPLEMENT_APP(MyApp)
-
-wxPropertyValidatorRegistry myListValidatorRegistry;
-wxPropertyValidatorRegistry myFormValidatorRegistry;
-
-MyApp::MyApp(void)
-{
-    m_childWindow = NULL;
-    m_mainFrame = NULL;
-}
-
-bool MyApp::OnInit(void)
-{
-  RegisterValidators();
-
-  // Create the main frame window
-  m_mainFrame = new MyFrame(NULL, _T("wxPropertySheet Demo"), wxPoint(0, 0), wxSize(300, 400), wxDEFAULT_FRAME_STYLE);
-
-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-  file_menu->Append(PROPERTY_TEST_DIALOG_LIST, _T("Test property list &dialog..."));
-  file_menu->Append(PROPERTY_TEST_FRAME_LIST, _T("Test property list &frame..."));
-  file_menu->AppendSeparator();
-  file_menu->Append(PROPERTY_TEST_DIALOG_FORM, _T("Test property form d&ialog..."));
-  file_menu->Append(PROPERTY_TEST_FRAME_FORM, _T("Test property form f&rame..."));
-  file_menu->AppendSeparator();
-  file_menu->Append(PROPERTY_QUIT, _T("E&xit"));
-
-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(PROPERTY_ABOUT, _T("&About"));
-
-  wxMenuBar *menu_bar = new wxMenuBar;
-
-  menu_bar->Append(file_menu, _T("&File"));
-  menu_bar->Append(help_menu, _T("&Help"));
-
-  // Associate the menu bar with the frame
-  m_mainFrame->SetMenuBar(menu_bar);
-
-  m_mainFrame->Centre(wxBOTH);
-  m_mainFrame->Show(true);
-
-  SetTopWindow(m_mainFrame);
-
-  return true;
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_CLOSE(MyFrame::OnCloseWindow)
-    EVT_MENU(PROPERTY_QUIT, MyFrame::OnQuit)
-    EVT_MENU(PROPERTY_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(PROPERTY_TEST_DIALOG_LIST, MyFrame::OnDialogList)
-    EVT_MENU(PROPERTY_TEST_FRAME_LIST, MyFrame::OnFrameList)
-    EVT_MENU(PROPERTY_TEST_DIALOG_FORM, MyFrame::OnDialogForm)
-    EVT_MENU(PROPERTY_TEST_FRAME_FORM, MyFrame::OnFrameForm)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, long type):
-  wxFrame(frame, wxID_ANY, title, pos, size, type)
-{
-}
-
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    if (wxGetApp().m_childWindow)
-    {
-        wxGetApp().m_childWindow->Close(true);
-    }
-
-    Destroy();
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-void MyFrame::OnDialogList(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().PropertyListTest(true);
-}
-
-void MyFrame::OnFrameList(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().PropertyListTest(false);
-}
-
-void MyFrame::OnDialogForm(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().PropertyFormTest(true);
-}
-
-void MyFrame::OnFrameForm(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().PropertyFormTest(false);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    (void)wxMessageBox(_T("Property Classes Demo\nAuthor: Julian Smart"), _T("About Property Classes Test"));
-}
-
-void MyApp::RegisterValidators(void)
-{
-  myListValidatorRegistry.RegisterValidator((wxString)_T("real"), new wxRealListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)_T("string"), new wxStringListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)_T("integer"), new wxIntegerListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)_T("bool"), new wxBoolListValidator);
-  myListValidatorRegistry.RegisterValidator((wxString)_T("stringlist"), new wxListOfStringsListValidator);
-
-  myFormValidatorRegistry.RegisterValidator((wxString)_T("real"), new wxRealFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)_T("string"), new wxStringFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)_T("integer"), new wxIntegerFormValidator);
-  myFormValidatorRegistry.RegisterValidator((wxString)_T("bool"), new wxBoolFormValidator);
-}
-
-void MyApp::PropertyListTest(bool useDialog)
-{
-    if (m_childWindow)
-        return;
-
-    wxPropertySheet *sheet = new wxPropertySheet;
-
-    sheet->AddProperty(new wxProperty(_T("fred"), 1.0, _T("real")));
-    sheet->AddProperty(new wxProperty(_T("tough choice"), true, _T("bool")));
-    sheet->AddProperty(new wxProperty(_T("ian"), (long)45, _T("integer"), new wxIntegerListValidator(-50, 50)));
-    sheet->AddProperty(new wxProperty(_T("bill"), 25.0, _T("real"), new wxRealListValidator(0.0, 100.0)));
-    sheet->AddProperty(new wxProperty(_T("julian"), _T("one"), _T("string")));
-    sheet->AddProperty(new wxProperty(_T("bitmap"), _T("none"), _T("string"), new wxFilenameListValidator(_T("Select a bitmap file"), _T("*.bmp"))));
-    wxStringList *strings = new wxStringList(wxT("one"), wxT("two"), wxT("three"), NULL);
-    sheet->AddProperty(new wxProperty(_T("constrained"), _T("one"), _T("string"), new wxStringListValidator(strings)));
-
-    wxStringList *strings2 = new wxStringList(wxT("earth"), wxT("fire"), wxT("wind"), wxT("water"), NULL);
-    sheet->AddProperty(new wxProperty(_T("string list"), strings2, _T("stringlist")));
-
-    wxPropertyListView *view = new wxPropertyListView
-        (
-            NULL,
-            wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS
-            | wxPROP_DYNAMIC_VALUE_FIELD | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
-        );
-
-    PropListDialog *propDialog = NULL;
-    PropListFrame *propFrame = NULL;
-    if (useDialog)
-    {
-        propDialog = new PropListDialog(view, NULL, _T("Property Sheet Test"),
-            wxDefaultPosition, wxSize(400, 500));
-        m_childWindow = propDialog;
-    }
-    else
-    {
-        propFrame = new PropListFrame(view, NULL, _T("Property Sheet Test"),
-            wxDefaultPosition, wxSize(400, 500));
-        m_childWindow = propFrame;
-    }
-
-    view->AddRegistry(&myListValidatorRegistry);
-
-    if (useDialog)
-    {
-        view->ShowView(sheet, (wxPanel *)propDialog);
-    }
-    else
-    {
-        propFrame->Initialize();
-        view->ShowView(sheet, propFrame->GetPropertyPanel());
-    }
-
-    m_childWindow->Centre(wxBOTH);
-    m_childWindow->Show(true);
-}
-
-void MyApp::PropertyFormTest(bool useDialog)
-{
-    if (m_childWindow)
-        return;
-
-    wxPropertySheet *sheet = new wxPropertySheet;
-
-    sheet->AddProperty(new wxProperty(_T("fred"), 25.0, _T("real"), new wxRealFormValidator(0.0, 100.0)));
-    sheet->AddProperty(new wxProperty(_T("tough choice"), true, _T("bool")));
-    sheet->AddProperty(new wxProperty(_T("ian"), (long)45, _T("integer"), new wxIntegerFormValidator(-50, 50)));
-    sheet->AddProperty(new wxProperty(_T("julian"), _T("one"), _T("string")));
-    wxStringList *strings = new wxStringList(wxT("one"), wxT("two"), wxT("three"), NULL);
-    sheet->AddProperty(new wxProperty(_T("constrained"), _T("one"), _T("string"), new wxStringFormValidator(strings)));
-
-    wxPropertyFormView *view = new wxPropertyFormView(NULL);
-
-    wxDialog *propDialog = NULL;
-    wxPropertyFormFrame *propFrame = NULL;
-
-    if (useDialog)
-    {
-        propDialog = new PropFormDialog(view, NULL, _T("Property Form Test"),
-            wxDefaultPosition, wxSize(380, 250));
-        m_childWindow = propDialog;
-    }
-    else
-    {
-        propFrame = new PropFormFrame(view, NULL, _T("Property Form Test"),
-            wxDefaultPosition, wxSize(380, 250));
-        propFrame->Initialize();
-        m_childWindow = propFrame;
-    }
-
-    // BCC32 does not like ?:
-    wxWindow *panel ;
-    if ( propDialog )
-    {
-        panel = propDialog;
-    }
-    else
-    {
-        panel = propFrame->GetPropertyPanel() ;
-    }
-
-    wxLayoutConstraints* c;
-
-#if 0
-    if (!propDialog)
-    {
-        c = new wxLayoutConstraints;
-        c->left.SameAs(m_childWindow, wxLeft, 4);
-        c->right.SameAs(m_childWindow, wxRight, 4);
-        c->top.SameAs(m_childWindow, wxTop, 4);
-        c->bottom.SameAs(m_childWindow, wxBottom, 40);
-
-        panel->SetConstraints(c);
-    }
-#endif
-
-    // Add items to the panel
-    wxButton *okButton = new wxButton(panel, wxID_OK, _T("OK"), wxDefaultPosition,
-        wxSize(80, 26), 0, wxDefaultValidator, _T("ok"));
-    wxButton *cancelButton = new wxButton(panel, wxID_CANCEL, _T("Cancel"),  wxDefaultPosition,
-        wxSize(80, 26), 0, wxDefaultValidator, _T("cancel"));
-    wxButton *updateButton = new wxButton(panel, wxID_PROP_UPDATE, _T("Update"),  wxDefaultPosition,
-        wxSize(80, 26), 0, wxDefaultValidator, _T("update"));
-    wxButton *revertButton = new wxButton(panel, wxID_PROP_REVERT, _T("Revert"),  wxDefaultPosition,
-        wxSize(80, 26), 0, wxDefaultValidator, _T("revert"));
-
-    c = new wxLayoutConstraints;
-    c->right.SameAs(panel, wxRight, 4);
-    c->bottom.SameAs(panel, wxBottom, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    revertButton->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->right.SameAs(revertButton, wxLeft, 4);
-    c->bottom.SameAs(panel, wxBottom, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    updateButton->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->right.SameAs(updateButton, wxLeft, 4);
-    c->bottom.SameAs(panel, wxBottom, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    cancelButton->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->right.SameAs(cancelButton, wxLeft, 4);
-    c->bottom.SameAs(panel, wxBottom, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    okButton->SetConstraints(c);
-
-    // The name of this text item matches the "fred" property
-    wxTextCtrl *text = new wxTextCtrl(panel, wxID_ANY, _T("Fred"), wxDefaultPosition,
-        wxSize( 200, wxDefaultCoord), 0, wxDefaultValidator, _T("fred"));
-
-    c = new wxLayoutConstraints;
-    c->left.SameAs(panel, wxLeft, 4);
-    c->top.SameAs(panel, wxTop, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    text->SetConstraints(c);
-
-    wxCheckBox *checkBox = new wxCheckBox(panel, wxID_ANY, _T("Yes or no"), wxDefaultPosition,
-        wxDefaultSize, 0, wxDefaultValidator, _T("tough choice"));
-
-    c = new wxLayoutConstraints;
-    c->left.SameAs(text, wxRight, 20);
-    c->top.SameAs(panel, wxTop, 4);
-    c->height.AsIs();
-    c->width.AsIs();
-    checkBox->SetConstraints(c);
-
-    wxSlider *slider = new wxSlider(panel, wxID_ANY, -50, 50, 150, wxDefaultPosition,
-    wxSize(200,10), 0, wxDefaultValidator, _T("ian"));
-
-    c = new wxLayoutConstraints;
-    c->left.SameAs(panel, wxLeft, 4);
-    c->top.SameAs(text, wxBottom, 10);
-    c->height.AsIs();
-    c->width.AsIs();
-    slider->SetConstraints(c);
-
-    wxListBox *listBox = new wxListBox(panel, wxID_ANY, wxDefaultPosition,
-        wxSize(200, 100), 0, NULL, 0, wxDefaultValidator, _T("constrained"));
-
-    c = new wxLayoutConstraints;
-    c->left.SameAs(panel, wxLeft, 4);
-    c->top.SameAs(slider, wxBottom, 10);
-    c->height.AsIs();
-    c->width.AsIs();
-    listBox->SetConstraints(c);
-
-    view->AddRegistry(&myFormValidatorRegistry);
-
-    panel->SetAutoLayout(true);
-
-    view->ShowView(sheet, panel);
-    view->AssociateNames();
-    view->TransferToDialog();
-
-    if (useDialog) {
-        propDialog->Layout();
-    }
-    else
-    {
-        // panel->Layout();
-    }
-    m_childWindow->Centre(wxBOTH);
-    m_childWindow->Show(true);
-}
-
-BEGIN_EVENT_TABLE(PropListFrame, wxPropertyListFrame)
-    EVT_CLOSE(PropListFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void PropListFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    wxGetApp().m_childWindow = NULL;
-
-    wxPropertyListFrame::OnCloseWindow(event);
-}
-
-BEGIN_EVENT_TABLE(PropListDialog, wxPropertyListDialog)
-    EVT_CLOSE(PropListDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-void PropListDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    wxGetApp().m_childWindow = NULL;
-
-    wxPropertyListDialog::OnCloseWindow(event);
-}
-
-BEGIN_EVENT_TABLE(PropFormFrame, wxPropertyFormFrame)
-    EVT_CLOSE(PropFormFrame::OnCloseWindow)
-    EVT_SIZE(PropFormFrame::OnSize)
-END_EVENT_TABLE()
-
-void PropFormFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    wxGetApp().m_childWindow = NULL;
-
-    wxPropertyFormFrame::OnCloseWindow(event);
-}
-
-void PropFormFrame::OnSize(wxSizeEvent& event)
-{
-    wxPropertyFormFrame::OnSize(event);
-    GetPropertyPanel()->Layout();
-}
-
-BEGIN_EVENT_TABLE(PropFormDialog, wxPropertyFormDialog)
-    EVT_CLOSE(PropFormDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-void PropFormDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    wxGetApp().m_childWindow = NULL;
-
-    wxPropertyFormDialog::OnCloseWindow(event);
-}
-
diff --git a/contrib/samples/deprecated/proplist/proplist.dsp b/contrib/samples/deprecated/proplist/proplist.dsp
deleted file mode 100644
index f1de7655a9..0000000000
--- a/contrib/samples/deprecated/proplist/proplist.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="proplist" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=proplist - 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 "proplist.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 "proplist.mak" CFG="proplist - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "proplist - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "proplist - 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)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\proplist.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\proplist.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\proplist.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\proplist.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\proplist.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\proplist.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\proplist.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\proplist.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\proplist.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\proplist.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\proplist.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\proplist.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\proplist.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\proplist.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\proplist.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\proplist.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\proplist.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\proplist.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\proplist.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\proplist.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\proplist.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\proplist.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\proplist.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\proplist.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\proplist.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\proplist.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\proplist.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\proplist.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\proplist.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\proplist.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\proplist.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "proplist - 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\proplist"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\proplist"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\proplist.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\proplist.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\proplist.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "proplist - Win32 DLL Universal Unicode Release"
-# Name "proplist - Win32 DLL Universal Unicode Debug"
-# Name "proplist - Win32 DLL Universal Release"
-# Name "proplist - Win32 DLL Universal Debug"
-# Name "proplist - Win32 DLL Unicode Release"
-# Name "proplist - Win32 DLL Unicode Debug"
-# Name "proplist - Win32 DLL Release"
-# Name "proplist - Win32 DLL Debug"
-# Name "proplist - Win32 Universal Unicode Release"
-# Name "proplist - Win32 Universal Unicode Debug"
-# Name "proplist - Win32 Universal Release"
-# Name "proplist - Win32 Universal Debug"
-# Name "proplist - Win32 Unicode Release"
-# Name "proplist - Win32 Unicode Debug"
-# Name "proplist - Win32 Release"
-# Name "proplist - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\proplist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\proplist.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/deprecated/proplist/proplist.h b/contrib/samples/deprecated/proplist/proplist.h
deleted file mode 100644
index 89dad82fe2..0000000000
--- a/contrib/samples/deprecated/proplist/proplist.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        proplist.h
-// Purpose:     Property sheet sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _PROPTEST_H_
-#define _PROPTEST_H_
-
-#include "wx/deprecated/proplist.h"
-#include "wx/deprecated/propform.h"
-
-class MyChild;
-
-// Define a new application
-class MyFrame;
-class MyApp: public wxApp
-{
-public:
-    MyApp(void);
-    bool OnInit(void);
-
-    void RegisterValidators(void);
-    void PropertyListTest(bool useDialog);
-    void PropertyFormTest(bool useDialog);
-
-    MyFrame*    m_mainFrame;
-    wxWindow*   m_childWindow;
-};
-
-DECLARE_APP(MyApp)
-
-// Define a new frame
-class MyFrame: public wxFrame
-{
-  public:
-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, long type);
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnDialogList(wxCommandEvent& event);
-    void OnFrameList(wxCommandEvent& event);
-    void OnDialogForm(wxCommandEvent& event);
-    void OnFrameForm(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-class PropListFrame: public wxPropertyListFrame
-{
-public:
-  PropListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = _T("frame")):
-        wxPropertyListFrame(v, parent, title, pos, size, style, name)
-    {
-    }
-
-    void OnCloseWindow(wxCloseEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-class PropListDialog: public wxPropertyListDialog
-{
-public:
-  PropListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = _T("dialogBox")):
-        wxPropertyListDialog(v, parent, title, pos, size, style, name)
-   {
-   }
-
-    void OnCloseWindow(wxCloseEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-class PropFormFrame: public wxPropertyFormFrame
-{
-public:
-  PropFormFrame(wxPropertyFormView *v, wxFrame *parent, const wxString& title,
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = _T("frame")):
-    wxPropertyFormFrame(v, parent, title, pos, size, style, name)
-    {
-    }
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-class PropFormDialog: public wxPropertyFormDialog
-{
-public:
-  PropFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = _T("dialogBox")):
-      wxPropertyFormDialog(v, parent, title, pos, size, style, name)
-    {
-    }
-
-    void OnCloseWindow(wxCloseEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-#define PROPERTY_QUIT                   1
-#define PROPERTY_ABOUT                  2
-#define PROPERTY_TEST_DIALOG_LIST       3
-#define PROPERTY_TEST_FRAME_LIST        4
-#define PROPERTY_TEST_DIALOG_FORM       5
-#define PROPERTY_TEST_FRAME_FORM        6
-
-#endif
-
diff --git a/contrib/samples/deprecated/proplist/proplist.rc b/contrib/samples/deprecated/proplist/proplist.rc
deleted file mode 100644
index 82f8ad6857..0000000000
--- a/contrib/samples/deprecated/proplist/proplist.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-//tick_bmp                BITMAP  "tick.bmp"
-//cross_bmp               BITMAP  "cross.bmp"
-
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/deprecated/proplist/proplistM5.xml b/contrib/samples/deprecated/proplist/proplistM5.xml
deleted file mode 100644
index c559aa9798..0000000000
--- a/contrib/samples/deprecated/proplist/proplistM5.xml
+++ /dev/null
@@ -1,3685 +0,0 @@
-<?xml version="1.0"?>
-<?codewarrior exportversion="1.0" ideversion="4.0"?>
-<!DOCTYPE PROJECT [
-
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?)>
-<!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?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?)>
-<!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>Classic Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”¼P</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>proplist Classic Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Classic Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Debug</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000E2D755010000000000001000E2D7E60
-                    0002000000000000000000000E2D2DD000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”¼P</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>proplist Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</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 "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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>:</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>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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”¼P</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>proplist Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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 Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”¼P</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>proplist Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>proplist.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>Classic Release</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Classic Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Release</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>proplist.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>wx</NAME>
-            <FILEREF>
-                <TARGETNAME>Carbon Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiff.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>zlib.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>png.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiffd.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>jpeg.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>MSL ANSI Libraries</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>console.stubs.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL RuntimePPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C++.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.CARBON.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>Win32 SDK</NAME>
-        </GROUP>
-        <GROUP><NAME>MacOS</NAME>
-            <GROUP><NAME>Carbon</NAME>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-            <GROUP><NAME>Classic</NAME>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/contrib/samples/deprecated/proplist/tick.bmp b/contrib/samples/deprecated/proplist/tick.bmp
deleted file mode 100644
index 3673eda5de..0000000000
Binary files a/contrib/samples/deprecated/proplist/tick.bmp and /dev/null differ
diff --git a/contrib/samples/deprecated/resource/.cvsignore b/contrib/samples/deprecated/resource/.cvsignore
deleted file mode 100644
index 3432835367..0000000000
--- a/contrib/samples/deprecated/resource/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-resourceM5.mcp
-resourceM*Data
-*Classic?Debug*
-*Classic?Release*
-*Carbon?Debug*
-*Carbon?Release*
diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in
deleted file mode 100644
index 1a4480eea1..0000000000
--- a/contrib/samples/deprecated/resource/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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-RESOURCE_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)
-RESOURCE_OBJECTS =  \
-	$(__resource_os2_lib_res) \
-	resource_resource.o \
-	$(__resource___win32rc)
-
-### 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@__resource___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C resource$(EXEEXT)
-@COND_PLATFORM_MAC_1@__resource___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___resource___os2_emxbindcmd = $(NM) resource$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep resource$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__resource___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___resource___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_OS2_1@__resource_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__resource_bundle___depname = resource_bundle
-@COND_TOOLKIT_COCOA@____resource_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	resource.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____resource_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	resource.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@__resource___win32rc = resource_resource_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 = $(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 resource$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: resource$(EXEEXT) $(__resource_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f resource$(EXEEXT)
-	rm -rf resource.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
-	$(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
-	$(__resource___mac_rezcmd)
-	$(__resource___mac_setfilecmd)
-	$(__resource___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p resource.app/Contents
-	mkdir -p resource.app/Contents/MacOS
-	mkdir -p resource.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/resource/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >resource.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >resource.app/Contents/PkgInfo
-	
-	
-	ln -f resource$(EXEEXT) resource.app/Contents/MacOS/resource
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns resource.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@resource_bundle: $(____resource_BUNDLE_TGT_REF_DEP)
-
-resource_resource.o: $(srcdir)/resource.cpp
-	$(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $(srcdir)/resource.cpp
-
-resource_resource_rc.o: $(srcdir)/resource.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean resource_bundle
diff --git a/contrib/samples/deprecated/resource/descrip.mms b/contrib/samples/deprecated/resource/descrip.mms
deleted file mode 100644
index 01ecdf67bf..0000000000
--- a/contrib/samples/deprecated/resource/descrip.mms
+++ /dev/null
@@ -1,47 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-.else
-CXX_DEFINE =
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-.ifdef __WXMOTIF__
-	$(MMS)$(MMSQUALIFIERS) resource.exe
-.else
-.ifdef __WXGTK__
-	$(MMS)$(MMSQUALIFIERS) resource_gtk.exe
-.endif
-.endif
-
-.ifdef __WXMOTIF__
-resource.exe : resource.obj
-	cxxlink resource,[--.lib]vms/opt
-.else
-.ifdef __WXGTK__
-resource_gtk.exe : resource.obj
-	cxxlink/exec=resource_gtk.exe resource,[--.lib]vms_gtk/opt
-.endif
-.endif
-
-resource.obj : resource.cpp
diff --git a/contrib/samples/deprecated/resource/dialog1.h b/contrib/samples/deprecated/resource/dialog1.h
deleted file mode 100644
index 99f31f9b1b..0000000000
--- a/contrib/samples/deprecated/resource/dialog1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * dialog1.h
- * Window identifiers file written by Dialog Editor
- */
-
-#define ID_TEXTCTRL104 104
-#define ID_STATICBOX101 101
-#define ID_DIALOG100 100
-#define ID_STATIC107 107
-#define ID_BUTTON108 108
-#define ID_BUTTON109 109
-#define ID_LISTBOX105 105
-#define ID_CHECKBOX106 106
-#define ID_RADIOBOX102 102
diff --git a/contrib/samples/deprecated/resource/dialog1.wxr b/contrib/samples/deprecated/resource/dialog1.wxr
deleted file mode 100644
index e94249bc36..0000000000
--- a/contrib/samples/deprecated/resource/dialog1.wxr
+++ /dev/null
@@ -1,26 +0,0 @@
-static char *dialog1 = "dialog(name = 'dialog1',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
-  title = 'Test dialog box',\
-  id = 100,\
-  x = 10, y = 10, width = 210, height = 145,\
-  background_colour = 'D6D6D6',\
-  use_dialog_units = 1,\
-  use_system_defaults = 1,\
-  font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
-  control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 200, 103,\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 60, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 80, 24, 67, 33, 'wxWindows rules!',\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [105, wxListBox, '', '0', 'listbox4', 80, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 150, 26, 50, 14, 0,\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [107, wxStaticText, 'My Message', '0', 'message10', 150, 57, 50, 12, '',\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [108, wxButton, 'Press me', '0', 'button7', 150, 81, 50, 13, '',\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
-  control = [109, wxButton, 'Cancel', '0', 'button8', 80, 119, 55, 17, '',\
-      [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).";
-
diff --git a/contrib/samples/deprecated/resource/makefile.bcc b/contrib/samples/deprecated/resource/makefile.bcc
deleted file mode 100644
index 6695f37bae..0000000000
--- a/contrib/samples/deprecated/resource/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-RESOURCE_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)
-RESOURCE_OBJECTS =  \
-	$(OBJS)\resource_resource.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)\resource.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)\resource.exe del $(OBJS)\resource.exe
-	-if exist $(OBJS)\resource.tds del $(OBJS)\resource.tds
-	-if exist $(OBJS)\resource.ilc del $(OBJS)\resource.ilc
-	-if exist $(OBJS)\resource.ild del $(OBJS)\resource.ild
-	-if exist $(OBJS)\resource.ilf del $(OBJS)\resource.ilf
-	-if exist $(OBJS)\resource.ils del $(OBJS)\resource.ils
-
-$(OBJS)\resource.exe: $(RESOURCE_OBJECTS)  $(OBJS)\resource_resource.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\resource_resource.res
-|
-
-$(OBJS)\resource_resource.obj: .\resource.cpp
-	$(CXX) -q -c -P -o$@ $(RESOURCE_CXXFLAGS) $**
-
-$(OBJS)\resource_resource.res: .\resource.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/resource/makefile.gcc b/contrib/samples/deprecated/resource/makefile.gcc
deleted file mode 100644
index f9a2846c57..0000000000
--- a/contrib/samples/deprecated/resource/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-RESOURCE_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)
-RESOURCE_OBJECTS =  \
-	$(OBJS)\resource_resource.o \
-	$(OBJS)\resource_resource_rc.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)\resource.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\resource.exe del $(OBJS)\resource.exe
-
-$(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource_rc.o
-	$(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__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)\resource_resource.o: ./resource.cpp
-	$(CXX) -c -o $@ $(RESOURCE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\resource_resource_rc.o: ./resource.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/deprecated/resource/makefile.unx b/contrib/samples/deprecated/resource/makefile.unx
deleted file mode 100644
index 1792f2e851..0000000000
--- a/contrib/samples/deprecated/resource/makefile.unx
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# File:		Makefile for samples
-# Author:	Robert Roebling
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = resource
-
-OBJECTS = $(PROGRAM).o
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean: 
-	rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/deprecated/resource/makefile.vc b/contrib/samples/deprecated/resource/makefile.vc
deleted file mode 100644
index c895c0f448..0000000000
--- a/contrib/samples/deprecated/resource/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-RESOURCE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\resource.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)
-RESOURCE_OBJECTS =  \
-	$(OBJS)\resource_resource.obj \
-	$(OBJS)\resource_resource.res
-
-### 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)\resource.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)\resource.exe del $(OBJS)\resource.exe
-	-if exist $(OBJS)\resource.ilk del $(OBJS)\resource.ilk
-	-if exist $(OBJS)\resource.pdb del $(OBJS)\resource.pdb
-
-$(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(RESOURCE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\resource_resource.obj: .\resource.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(RESOURCE_CXXFLAGS) $**
-
-$(OBJS)\resource_resource.res: .\resource.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/resource/makefile.vms b/contrib/samples/deprecated/resource/makefile.vms
deleted file mode 100644
index 65303ff0e2..0000000000
--- a/contrib/samples/deprecated/resource/makefile.vms
+++ /dev/null
@@ -1,38 +0,0 @@
-#************************************************************************
-# Makefile for resource under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 11.04.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = resource
-
-# Object modules of the application.
-OBJS = resource.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(MAIN).$(OBJ)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(MAIN).$(OBJ),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-resource.obj : resource.cc resource.h
-
diff --git a/contrib/samples/deprecated/resource/makefile.wat b/contrib/samples/deprecated/resource/makefile.wat
deleted file mode 100644
index a1452b9dcf..0000000000
--- a/contrib/samples/deprecated/resource/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-RESOURCE_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)
-RESOURCE_OBJECTS =  &
-	$(OBJS)\resource_resource.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\resource.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)\resource.exe del $(OBJS)\resource.exe
-
-$(OBJS)\resource.exe :  $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res
-	@%create $(OBJS)\resource.lbc
-	@%append $(OBJS)\resource.lbc option quiet
-	@%append $(OBJS)\resource.lbc name $^@
-	@%append $(OBJS)\resource.lbc option caseexact
-	@%append $(OBJS)\resource.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(RESOURCE_OBJECTS)) do @%append $(OBJS)\resource.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\resource.lbc library %i
-	@%append $(OBJS)\resource.lbc option resource=$(OBJS)\resource_resource.res
-	@for %i in () do @%append $(OBJS)\resource.lbc option stack=%i
-	wlink @$(OBJS)\resource.lbc
-
-$(OBJS)\resource_resource.obj :  .AUTODEPEND .\resource.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(RESOURCE_CXXFLAGS) $<
-
-$(OBJS)\resource_resource.res :  .AUTODEPEND .\resource.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/deprecated/resource/menu1.wxr b/contrib/samples/deprecated/resource/menu1.wxr
deleted file mode 100644
index 3536bb5a6c..0000000000
--- a/contrib/samples/deprecated/resource/menu1.wxr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-static char *menu1 = "menu(name = 'menu1',\
-  menu = \
-  [\
-    ['&File', 1, '', \
-      ['&Dialog box test', 2, ''],\
-      [],\
-      ['&Exit', 4, '']\
-    ],\
-    ['&Help', 5, '', \
-      ['&About', 6, '']\
-    ]\
-  ]).";
diff --git a/contrib/samples/deprecated/resource/resource.bkl b/contrib/samples/deprecated/resource/resource.bkl
deleted file mode 100644
index ea2cc2bf5e..0000000000
--- a/contrib/samples/deprecated/resource/resource.bkl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="resource" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            resource.cpp
-        </sources>
-        <contrib-lib>deprecated</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>resource.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp
deleted file mode 100644
index 7d0bb7b9c8..0000000000
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        resource.cpp
-// Purpose:     Dialog resource sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// 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/deprecated/setup.h"
-
-#if !wxUSE_WX_RESOURCES
-    #error "You should set wxUSE_WX_RESOURCES to 1 to compile this sample"
-#endif
-
-#if wxUSE_UNICODE
-// #error "This sample can't be compiled in Unicode mode."
-#endif // wxUSE_UNICODE
-
-#include "wx/deprecated/resource.h"
-
-#include <ctype.h>
-#include "resource.h"
-
-// If we wanted to demonstrate total platform independence,
-// then we'd use the dynamic file loading form for all platforms.
-// But this shows how to embed the wxWidgets resources
-// in the program code/executable for UNIX and Windows
-// platforms.
-
-// In order to get the ID of the controls defined in the
-// dialog, we include the header automatically generated
-// by DialogEd
-
-#include "dialog1.h"
-
-// If you have a Windows compiler that can cope with long strings,
-// then you can always use the #include form for simplicity.
-
-// NOTE: Borland's brc32.exe resource compiler doesn't recognize
-// the TEXT resource, for some reason, so either run-time file loading
-// or file inclusion should be used.
-
-#if defined(__WXMSW__) && !wxUSE_UNICODE
-// Under Windows, some compilers can't include
-// a whole .wxr file. So we use a .rc user-defined resource
-// instead. dialog1 will point to the whole .wxr 'file'.
-static wxChar *dialog1 = NULL;
-static wxChar *menu1 = NULL;
-#else
-// Other platforms should have sensible compilers that
-// cope with long strings.
-#include "dialog1.wxr"
-#include "menu1.wxr"
-#endif
-
-// Declare two frames
-MyFrame   *frame = (MyFrame *) NULL;
-
-IMPLEMENT_APP(MyApp)
-
-// Testing of ressources
-MyApp::MyApp()
-{
-}
-
-// The `main program' equivalent, creating the windows and returning the
-// main frame
-bool MyApp::OnInit(void)
-{
-#if defined(__WXMSW__) && !wxUSE_UNICODE
-    // Load the .wxr 'file' from a .rc resource, under Windows.
-    // note that the resource really is a char*, not a wxChar*!
-    dialog1 = wxLoadUserResource(wxT("dialog1"), wxT("WXRDATA"));
-    menu1 = wxLoadUserResource(wxT("menu1"), wxT("WXRDATA"));
-    // All resources in the file (only one in this case) get parsed
-    // by this call.
-    wxResourceParseString(dialog1);
-    wxResourceParseString(menu1);
-#else
-    // Simply parse the data pointed to by the variable dialog1.
-    // If there were several resources, there would be several
-    // variables, and this would need to be called several times.
-    wxResourceParseData(dialog1);
-    wxResourceParseData(menu1);
-#endif
-
-    // Create the main frame window
-    frame = new MyFrame( (wxFrame *) NULL, wxID_ANY,
-                         wxT("wxWidgets Resource Sample"),
-                         wxDefaultPosition, wxSize(300, 250) );
-
-#if wxUSE_STATUSBAR
-    // Give it a status line
-    frame->CreateStatusBar(2);
-#endif // wxUSE_STATUSBAR
-
-    wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1"));
-
-    // Associate the menu bar with the frame
-    frame->SetMenuBar(menu_bar);
-
-    // Make a panel
-    frame->panel = new MyPanel( frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400),
-                                0, wxT("MyMainFrame") );
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-MyApp::~MyApp()
-{
-#if defined(__WXMSW__) && !wxUSE_UNICODE
-    delete dialog1;
-    delete menu1;
-#endif
-}
-
-BEGIN_EVENT_TABLE(MyPanel, wxPanel)
-    EVT_LEFT_DOWN( MyPanel::OnClick)
-END_EVENT_TABLE()
-
-MyPanel::MyPanel
-(
-    wxWindow *parent, wxWindowID id, const wxPoint& pos,
-    const wxSize& size,
-    int style, const wxString &name
-) : wxPanel( parent, id, pos, size, style, name )
-{
-}
-
-void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event2) )
-{
-    MyFrame *frame = (MyFrame*)(wxTheApp->GetTopWindow());
-    wxCommandEvent event;
-    frame->OnTestDialog( event );
-}
-
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(RESOURCE_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
-    EVT_MENU(RESOURCE_TESTDIALOG, MyFrame::OnTestDialog)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-MyFrame::MyFrame
-(
-    wxWindow *parent, const wxWindowID id,
-    const wxString& title, const wxPoint& pos, const wxSize& size
-) : wxFrame(parent, id, title, pos, size)
-{
-    panel = (wxWindow *) NULL;
-}
-
-void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(wxT("wxWidgets resource sample.\n")
-                 wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
-                 wxICON_INFORMATION | wxOK);
-}
-
-void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
-{
-    Close(true);
-}
-
-void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
-{
-    MyDialog *dialog = new MyDialog;
-
-    if (wxLoadFromResource(dialog, this, wxT("dialog1")))
-    {
-        wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
-        if (text)
-        {
-            text->SetValue(wxT("wxWidgets resource demo"));
-        }
-
-        dialog->ShowModal();
-    }
-
-    dialog->Close(true);
-}
-
-BEGIN_EVENT_TABLE(MyDialog, wxDialog)
-    //EVT_BUTTON(RESOURCE_OK, MyDialog::OnOk)
-    EVT_BUTTON(ID_BUTTON109, MyDialog::OnCancel)
-END_EVENT_TABLE()
-
-
-void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event) )
-{
-    //  EndModal(RESOURCE_OK);
-}
-
-void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event) )
-{
-    EndModal(ID_BUTTON109);
-}
-
-
diff --git a/contrib/samples/deprecated/resource/resource.dsp b/contrib/samples/deprecated/resource/resource.dsp
deleted file mode 100644
index 3a5e8af9ee..0000000000
--- a/contrib/samples/deprecated/resource/resource.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="resource" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=resource - 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 "resource.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 "resource.mak" CFG="resource - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "resource - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "resource - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "resource - 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)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\resource.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\resource.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.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\resource.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\resource.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\resource.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.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\resource.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\resource.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\resource.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\resource.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\resource.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\resource.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\resource.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.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\resource.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\resource.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\resource.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.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\resource.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\resource.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\resource.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.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\resource.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\resource.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\resource.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\resource.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\resource.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\resource.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\resource.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\resource.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "resource - 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\resource"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\resource"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.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\resource.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\resource.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "resource - Win32 DLL Universal Unicode Release"
-# Name "resource - Win32 DLL Universal Unicode Debug"
-# Name "resource - Win32 DLL Universal Release"
-# Name "resource - Win32 DLL Universal Debug"
-# Name "resource - Win32 DLL Unicode Release"
-# Name "resource - Win32 DLL Unicode Debug"
-# Name "resource - Win32 DLL Release"
-# Name "resource - Win32 DLL Debug"
-# Name "resource - Win32 Universal Unicode Release"
-# Name "resource - Win32 Universal Unicode Debug"
-# Name "resource - Win32 Universal Release"
-# Name "resource - Win32 Universal Debug"
-# Name "resource - Win32 Unicode Release"
-# Name "resource - Win32 Unicode Debug"
-# Name "resource - Win32 Release"
-# Name "resource - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\resource.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/deprecated/resource/resource.h b/contrib/samples/deprecated/resource/resource.h
deleted file mode 100644
index d1ff2b0129..0000000000
--- a/contrib/samples/deprecated/resource/resource.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        resource.h
-// Purpose:     Dialog resource sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// Define a new application
-class MyApp: public wxApp
-{
-public:
-    MyApp();
-
-    virtual bool OnInit();
-
-    virtual ~MyApp();
-};
-
-class MyPanel: public wxPanel
-{
-public:
-    MyPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos,
-            const wxSize& size, int style, const wxString &name);
-    void OnClick(wxMouseEvent &event);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-class MyFrame: public wxFrame
-{
-public:
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos, const wxSize& size);
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnTestDialog(wxCommandEvent& event);
-
-    wxWindow *panel;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-class MyDialog : public wxDialog
-{
-public:
-    void OnOk(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-// the values should be the same as in menu.wxr file!
-enum
-{
-    RESOURCE_TESTDIALOG = 2,
-    RESOURCE_QUIT = 4,
-    RESOURCE_ABOUT = 6
-};
diff --git a/contrib/samples/deprecated/resource/resource.rc b/contrib/samples/deprecated/resource/resource.rc
deleted file mode 100644
index 55ff494812..0000000000
--- a/contrib/samples/deprecated/resource/resource.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "wx/msw/wx.rc"
-
-/* Comment out these lines for Borland C++ or GNU-WIN32 */
-/*
-dialog1 TEXT "dialog1.wxr"
-menu1 TEXT "menu1.wxr"
-*/
-dialog1 WXRDATA "dialog1.wxr"
-menu1 WXRDATA "menu1.wxr"
-
diff --git a/contrib/samples/deprecated/resource/resourceM5.xml b/contrib/samples/deprecated/resource/resourceM5.xml
deleted file mode 100644
index 452a857e76..0000000000
--- a/contrib/samples/deprecated/resource/resourceM5.xml
+++ /dev/null
@@ -1,3685 +0,0 @@
-<?xml version="1.0"?>
-<?codewarrior exportversion="1.0" ideversion="4.0"?>
-<!DOCTYPE PROJECT [
-
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?)>
-<!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?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?)>
-<!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>Classic Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>resource Classic Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Classic Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Debug</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000E2D755010000000000001000E2D7E60
-                    0002000000000000000000000E2D2DD000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>resource Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</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 "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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>:</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>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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>resource Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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 Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>resource Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>resource.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>Classic Release</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Classic Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Release</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>resource.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>wx</NAME>
-            <FILEREF>
-                <TARGETNAME>Carbon Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiff.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>zlib.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>png.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiffd.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>jpeg.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>MSL ANSI Libraries</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>console.stubs.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL RuntimePPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C++.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.CARBON.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>Win32 SDK</NAME>
-        </GROUP>
-        <GROUP><NAME>MacOS</NAME>
-            <GROUP><NAME>Carbon</NAME>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-            <GROUP><NAME>Classic</NAME>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/contrib/samples/deprecated/treelay/.cvsignore b/contrib/samples/deprecated/treelay/.cvsignore
deleted file mode 100644
index 5d32618de5..0000000000
--- a/contrib/samples/deprecated/treelay/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-treelayM5.mcp
-treelayM*Data
-*Classic?Debug*
-*Classic?Release*
-*Carbon?Debug*
-*Carbon?Release*
-treelay
diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
deleted file mode 100644
index 52a1a7c10e..0000000000
--- a/contrib/samples/deprecated/treelay/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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-TREELAY_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)
-TREELAY_OBJECTS =  \
-	$(__treelay_os2_lib_res) \
-	treelay_treelay.o \
-	$(__treelay___win32rc)
-
-### 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@__treelay___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C treelay$(EXEEXT)
-@COND_PLATFORM_MAC_1@__treelay___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___treelay___os2_emxbindcmd = $(NM) treelay$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep treelay$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__treelay___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treelay___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_OS2_1@__treelay_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__treelay_bundle___depname = treelay_bundle
-@COND_TOOLKIT_COCOA@____treelay_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	treelay.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____treelay_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	treelay.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@__treelay___win32rc = treelay_treelay_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 = $(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 treelay$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: treelay$(EXEEXT) $(__treelay_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f treelay$(EXEEXT)
-	rm -rf treelay.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
-	$(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
-	$(__treelay___mac_rezcmd)
-	$(__treelay___mac_setfilecmd)
-	$(__treelay___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p treelay.app/Contents
-	mkdir -p treelay.app/Contents/MacOS
-	mkdir -p treelay.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/treelay/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >treelay.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >treelay.app/Contents/PkgInfo
-	
-	
-	ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treelay.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@treelay_bundle: $(____treelay_BUNDLE_TGT_REF_DEP)
-
-treelay_treelay.o: $(srcdir)/treelay.cpp
-	$(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $(srcdir)/treelay.cpp
-
-treelay_treelay_rc.o: $(srcdir)/treelay.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean treelay_bundle
diff --git a/contrib/samples/deprecated/treelay/makefile.bcc b/contrib/samples/deprecated/treelay/makefile.bcc
deleted file mode 100644
index e2b26114e9..0000000000
--- a/contrib/samples/deprecated/treelay/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TREELAY_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)
-TREELAY_OBJECTS =  \
-	$(OBJS)\treelay_treelay.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)\treelay.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)\treelay.exe del $(OBJS)\treelay.exe
-	-if exist $(OBJS)\treelay.tds del $(OBJS)\treelay.tds
-	-if exist $(OBJS)\treelay.ilc del $(OBJS)\treelay.ilc
-	-if exist $(OBJS)\treelay.ild del $(OBJS)\treelay.ild
-	-if exist $(OBJS)\treelay.ilf del $(OBJS)\treelay.ilf
-	-if exist $(OBJS)\treelay.ils del $(OBJS)\treelay.ils
-
-$(OBJS)\treelay.exe: $(TREELAY_OBJECTS)  $(OBJS)\treelay_treelay.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(TREELAY_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\treelay_treelay.res
-|
-
-$(OBJS)\treelay_treelay.obj: .\treelay.cpp
-	$(CXX) -q -c -P -o$@ $(TREELAY_CXXFLAGS) $**
-
-$(OBJS)\treelay_treelay.res: .\treelay.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/treelay/makefile.gcc b/contrib/samples/deprecated/treelay/makefile.gcc
deleted file mode 100644
index 8256246ced..0000000000
--- a/contrib/samples/deprecated/treelay/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TREELAY_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)
-TREELAY_OBJECTS =  \
-	$(OBJS)\treelay_treelay.o \
-	$(OBJS)\treelay_treelay_rc.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)\treelay.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\treelay.exe del $(OBJS)\treelay.exe
-
-$(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay_rc.o
-	$(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__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)\treelay_treelay.o: ./treelay.cpp
-	$(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\treelay_treelay_rc.o: ./treelay.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/deprecated/treelay/makefile.unx b/contrib/samples/deprecated/treelay/makefile.unx
deleted file mode 100644
index 468f519c0c..0000000000
--- a/contrib/samples/deprecated/treelay/makefile.unx
+++ /dev/null
@@ -1,23 +0,0 @@
-# Purpose: makefile for treelay example (Unix)
-# Created: 2000-03-15
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = treelay
-
-OBJECTS = $(PROGRAM).o
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/deprecated/treelay/makefile.vc b/contrib/samples/deprecated/treelay/makefile.vc
deleted file mode 100644
index 9343611a03..0000000000
--- a/contrib/samples/deprecated/treelay/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-TREELAY_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\treelay.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)
-TREELAY_OBJECTS =  \
-	$(OBJS)\treelay_treelay.obj \
-	$(OBJS)\treelay_treelay.res
-
-### 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)\treelay.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)\treelay.exe del $(OBJS)\treelay.exe
-	-if exist $(OBJS)\treelay.ilk del $(OBJS)\treelay.ilk
-	-if exist $(OBJS)\treelay.pdb del $(OBJS)\treelay.pdb
-
-$(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(TREELAY_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\treelay_treelay.obj: .\treelay.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TREELAY_CXXFLAGS) $**
-
-$(OBJS)\treelay_treelay.res: .\treelay.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/deprecated/treelay/makefile.wat b/contrib/samples/deprecated/treelay/makefile.wat
deleted file mode 100644
index 5b031db8af..0000000000
--- a/contrib/samples/deprecated/treelay/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TREELAY_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)
-TREELAY_OBJECTS =  &
-	$(OBJS)\treelay_treelay.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\treelay.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)\treelay.exe del $(OBJS)\treelay.exe
-
-$(OBJS)\treelay.exe :  $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
-	@%create $(OBJS)\treelay.lbc
-	@%append $(OBJS)\treelay.lbc option quiet
-	@%append $(OBJS)\treelay.lbc name $^@
-	@%append $(OBJS)\treelay.lbc option caseexact
-	@%append $(OBJS)\treelay.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(TREELAY_OBJECTS)) do @%append $(OBJS)\treelay.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\treelay.lbc library %i
-	@%append $(OBJS)\treelay.lbc option resource=$(OBJS)\treelay_treelay.res
-	@for %i in () do @%append $(OBJS)\treelay.lbc option stack=%i
-	wlink @$(OBJS)\treelay.lbc
-
-$(OBJS)\treelay_treelay.obj :  .AUTODEPEND .\treelay.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TREELAY_CXXFLAGS) $<
-
-$(OBJS)\treelay_treelay.res :  .AUTODEPEND .\treelay.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/deprecated/treelay/mondrian.ico b/contrib/samples/deprecated/treelay/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/contrib/samples/deprecated/treelay/mondrian.ico and /dev/null differ
diff --git a/contrib/samples/deprecated/treelay/treelay.bkl b/contrib/samples/deprecated/treelay/treelay.bkl
deleted file mode 100644
index d6aab6e621..0000000000
--- a/contrib/samples/deprecated/treelay/treelay.bkl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="treelay" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            treelay.cpp
-        </sources>
-        <contrib-lib>deprecated</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>treelay.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/deprecated/treelay/treelay.cpp b/contrib/samples/deprecated/treelay/treelay.cpp
deleted file mode 100644
index a4f00f7782..0000000000
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        treelay.cpp
-// Purpose:     wxTreeLayout sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     7/4/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if !wxUSE_TREELAYOUT
-#error Please set wxUSE_TREELAYOUT to 1 in contrib/include/wx/deprecated/setup.h and recompile.
-#endif
-
-#include "wx/deprecated/treelay.h"
-
-#include "treelay.h"
-
-wxTreeLayoutStored *myTree = (wxTreeLayoutStored *) NULL;
-
-// A macro needed for some compilers (AIX) that need 'main' to be defined
-// in the application itself.
-IMPLEMENT_APP(MyApp)
-
-// The `main program' equivalent, creating the windows and returning the
-// main frame
-bool MyApp::OnInit()
-{
-  // Create the main frame window
-  MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxDefaultPosition, wxSize(400, 550));
-
-#if wxUSE_STATUSBAR
-  // Give it a status line
-  frame->CreateStatusBar(2);
-#endif // wxUSE_STATUSBAR
-
-  // Give it an icon
-#ifdef __WINDOWS__
-  wxIcon icon(_T("tree_icn"));
-  frame->SetIcon(icon);
-#endif
-
-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-  file_menu->Append(TEST_LEFT_RIGHT, _T("&Left to right"),                _T("Redraw left to right"));
-  file_menu->Append(TEST_TOP_BOTTOM, _T("&Top to bottom"),                _T("Redraw top to bottom"));
-  file_menu->AppendSeparator();
-  file_menu->Append(TEST_QUIT, _T("E&xit"),                _T("Quit program"));
-
-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(TEST_ABOUT, _T("&About"),              _T("About Tree Test"));
-
-  wxMenuBar* menu_bar = new wxMenuBar;
-
-  menu_bar->Append(file_menu, _T("&File"));
-  menu_bar->Append(help_menu, _T("&Help"));
-
-  // Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
-
-  MyCanvas *canvas = new MyCanvas(frame);
-
-  // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction
-  canvas->SetScrollbars(20, 20, 50, 50);
-  frame->canvas = canvas;
-
-  myTree = new wxTreeLayoutStored();
-
-  wxClientDC dc(canvas);
-  wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
-  dc.SetFont(font);
-  TreeTest(*myTree, dc);
-
-  frame->Show(true);
-
-#if wxUSE_STATUSBAR
-  frame->SetStatusText(_T("Hello, tree!"));
-#endif // wxUSE_STATUSBAR
-
-  // Return the main frame window
-  return true;
-}
-
-int MyApp::OnExit()
-{
-    if (myTree)
-    {
-        delete myTree;
-        myTree = (wxTreeLayoutStored *) NULL;
-    }
-
-    return 0;
-}
-
-void MyApp::TreeTest(wxTreeLayoutStored& tree, wxDC& dc)
-{
-  tree.Initialize(200);
-
-  tree.AddChild(_T("animal"));
-  tree.AddChild(_T("mammal"), _T("animal"));
-  tree.AddChild(_T("insect"), _T("animal"));
-  tree.AddChild(_T("bird"), _T("animal"));
-
-  tree.AddChild(_T("man"), _T("mammal"));
-  tree.AddChild(_T("cat"), _T("mammal"));
-  tree.AddChild(_T("dog"), _T("mammal"));
-  tree.AddChild(_T("giraffe"), _T("mammal"));
-  tree.AddChild(_T("elephant"), _T("mammal"));
-  tree.AddChild(_T("donkey"), _T("mammal"));
-  tree.AddChild(_T("horse"), _T("mammal"));
-
-  tree.AddChild(_T("fido"), _T("dog"));
-  tree.AddChild(_T("domestic cat"), _T("cat"));
-  tree.AddChild(_T("lion"), _T("cat"));
-  tree.AddChild(_T("tiger"), _T("cat"));
-  tree.AddChild(_T("felix"), _T("domestic cat"));
-  tree.AddChild(_T("socks"), _T("domestic cat"));
-
-  tree.AddChild(_T("beetle"), _T("insect"));
-  tree.AddChild(_T("earwig"), _T("insect"));
-  tree.AddChild(_T("eagle"), _T("bird"));
-  tree.AddChild(_T("bluetit"), _T("bird"));
-  tree.AddChild(_T("sparrow"), _T("bird"));
-  tree.AddChild(_T("blackbird"), _T("bird"));
-  tree.AddChild(_T("emu"), _T("bird"));
-  tree.AddChild(_T("crow"), _T("bird"));
-
-  tree.DoLayout(dc);
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-  EVT_MENU(TEST_QUIT, MyFrame::OnQuit)
-  EVT_MENU(TEST_ABOUT, MyFrame::OnAbout)
-  EVT_MENU(TEST_LEFT_RIGHT, MyFrame::OnLeftRight)
-  EVT_MENU(TEST_TOP_BOTTOM, MyFrame::OnTopBottom)
-  EVT_CLOSE(MyFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, wxID_ANY, title, pos, size)
-{
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-void MyFrame::OnLeftRight(wxCommandEvent& WXUNUSED(event))
-{
-      if (myTree)
-      {
-        myTree->SetOrientation(false);
-        wxClientDC dc(canvas);
-        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
-        dc.SetFont(font);
-        wxGetApp().TreeTest(*myTree, dc);
-        canvas->Refresh();
-      }
-}
-
-void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
-{
-      if (myTree)
-      {
-        myTree->SetOrientation(true);
-        wxClientDC dc(canvas);
-        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
-        dc.SetFont(font);
-        wxGetApp().TreeTest(*myTree, dc);
-        canvas->Refresh();
-      }
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-      (void)wxMessageBox(_T("wxWidgets tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-  Destroy();
-}
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent):
- wxScrolledWindow(parent, wxID_ANY)
-{
-    SetBackgroundColour(*wxWHITE);
-}
-
-// Define the repainting behaviour
-void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-    if (myTree)
-    {
-        wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
-        dc.SetFont(font);
-        myTree->Draw(dc);
-    }
-}
-
diff --git a/contrib/samples/deprecated/treelay/treelay.dsp b/contrib/samples/deprecated/treelay/treelay.dsp
deleted file mode 100644
index 12bf8261a2..0000000000
--- a/contrib/samples/deprecated/treelay/treelay.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="treelay" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=treelay - 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 "treelay.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 "treelay.mak" CFG="treelay - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "treelay - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "treelay - 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)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\treelay.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\treelay.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\treelay.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\treelay.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\treelay.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\treelay.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\treelay.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\treelay.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\treelay.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\treelay.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\treelay.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\treelay.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\treelay.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\treelay.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\treelay.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\treelay.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\treelay.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\treelay.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 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\treelay.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\treelay.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 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\treelay.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\treelay.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 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\treelay.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\treelay.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 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\treelay.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\treelay.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 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\treelay.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\treelay.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 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\treelay.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\treelay.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 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\treelay.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "treelay - 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\treelay"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\treelay"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\treelay.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\treelay.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 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\treelay.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "treelay - Win32 DLL Universal Unicode Release"
-# Name "treelay - Win32 DLL Universal Unicode Debug"
-# Name "treelay - Win32 DLL Universal Release"
-# Name "treelay - Win32 DLL Universal Debug"
-# Name "treelay - Win32 DLL Unicode Release"
-# Name "treelay - Win32 DLL Unicode Debug"
-# Name "treelay - Win32 DLL Release"
-# Name "treelay - Win32 DLL Debug"
-# Name "treelay - Win32 Universal Unicode Release"
-# Name "treelay - Win32 Universal Unicode Debug"
-# Name "treelay - Win32 Universal Release"
-# Name "treelay - Win32 Universal Debug"
-# Name "treelay - Win32 Unicode Release"
-# Name "treelay - Win32 Unicode Debug"
-# Name "treelay - Win32 Release"
-# Name "treelay - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\treelay.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\treelay.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/deprecated/treelay/treelay.h b/contrib/samples/deprecated/treelay/treelay.h
deleted file mode 100644
index 43d5593270..0000000000
--- a/contrib/samples/deprecated/treelay/treelay.h
+++ /dev/null
@@ -1,55 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        treelay.h
-// Purpose:     wxTreeLayout sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     7/4/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// Define a new application
-class MyApp: public wxApp
-{
-public:
-    virtual bool OnInit();
-    virtual int OnExit();
-    void TreeTest(wxTreeLayoutStored& tree, wxDC& dc);
-};
-
-DECLARE_APP(MyApp)
-
-class MyCanvas;
-
-class MyFrame: public wxFrame
-{
-  public:
-    MyCanvas *canvas;
-    MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size);
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnLeftRight(wxCommandEvent& event);
-    void OnTopBottom(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-// Define a new canvas which can receive some events
-class MyCanvas: public wxScrolledWindow
-{
-  public:
-    MyCanvas(wxWindow *frame);
-    void OnPaint(wxPaintEvent& event);
-    void OnEvent(wxMouseEvent& event);
-    void OnChar(wxKeyEvent& event);
-DECLARE_EVENT_TABLE()
-};
-
-#define TEST_QUIT      1
-#define TEST_ABOUT     2
-#define TEST_LEFT_RIGHT 3
-#define TEST_TOP_BOTTOM 4
-
diff --git a/contrib/samples/deprecated/treelay/treelay.rc b/contrib/samples/deprecated/treelay/treelay.rc
deleted file mode 100644
index 41e6896e8e..0000000000
--- a/contrib/samples/deprecated/treelay/treelay.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-tree_icn ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/deprecated/treelay/treelayM5.xml b/contrib/samples/deprecated/treelay/treelayM5.xml
deleted file mode 100644
index afb5ceb10f..0000000000
--- a/contrib/samples/deprecated/treelay/treelayM5.xml
+++ /dev/null
@@ -1,3685 +0,0 @@
-<?xml version="1.0"?>
-<?codewarrior exportversion="1.0" ideversion="4.0"?>
-<!DOCTYPE PROJECT [
-
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?)>
-<!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?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?)>
-<!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>Classic Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>treelay Classic Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Classic Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>Classic Debug</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000E2D755010000000000001000E2D7E60
-                    0002000000000000000000000E2D2DD000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>treelay Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</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 "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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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>:</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>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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>/wx/wx_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</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>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>treelay Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</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 "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</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>Recursive</NAME><VALUE>true</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>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>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </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 Release</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>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</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>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>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>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>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>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>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</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>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>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>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>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>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>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>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>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>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>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>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>ActivateBrowser</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>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <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>false</VALUE></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>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</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>1</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_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</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>
-
-                <!-- 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 "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>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</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_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>”ð</VALUE></SETTING>
-                    <SETTING><VALUE>	=ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>	=Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</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_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</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>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- 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>treelay Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</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>1061109567</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>
-
-                <!-- 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 "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>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>treelay.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>Classic Release</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Classic Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Release</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>treelay.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>wx</NAME>
-            <FILEREF>
-                <TARGETNAME>Carbon Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiff.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>zlib.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>png.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiffd.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>jpeg.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>MSL ANSI Libraries</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>console.stubs.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL RuntimePPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C++.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.CARBON.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>Win32 SDK</NAME>
-        </GROUP>
-        <GROUP><NAME>MacOS</NAME>
-            <GROUP><NAME>Carbon</NAME>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-            <GROUP><NAME>Classic</NAME>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
deleted file mode 100644
index 39f2876550..0000000000
--- a/contrib/samples/fl/Makefile.in
+++ /dev/null
@@ -1,462 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FL_DEMO1_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 -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO1_OBJECTS =  \
-	$(__fl) \
-	fl_demo1_fl_demo1.o \
-	$(__fl_demo1___win32rc)
-FL_DEMO2_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 -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO2_OBJECTS =  \
-	$(__fl) \
-	fl_demo2_fl_demo2.o \
-	$(__fl_demo2___win32rc)
-FL_SAMPLE1_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 -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS =  \
-	$(__fl) \
-	fl_sample1_fl_sample1.o \
-	$(__fl_sample1___win32rc)
-FL_SAMPLE2_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 -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS =  \
-	$(__fl) \
-	fl_sample2_fl_sample2.o \
-	$(__fl_sample2___win32rc)
-FL_SAMPLE3_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 -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS =  \
-	$(__fl) \
-	fl_sample3_fl_sample3.o \
-	$(__fl_sample3___win32rc)
-
-### 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@__fl_demo1___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C fl_demo1$(EXEEXT)
-@COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_5)
-COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd = $(NM) fl_demo1$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep fl_demo1$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__fl_demo1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle
-@COND_TOOLKIT_COCOA@____fl_demo1_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fl_demo1.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____fl_demo1_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fl_demo1.app/Contents/PkgInfo
-@COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o
-@COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C fl_demo2$(EXEEXT)
-@COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_6)
-COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd = $(NM) fl_demo2$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep fl_demo2$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__fl_demo2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle
-@COND_TOOLKIT_COCOA@____fl_demo2_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fl_demo2.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____fl_demo2_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fl_demo2.app/Contents/PkgInfo
-@COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o
-@COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C fl_sample1$(EXEEXT)
-@COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_7)
-COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd = $(NM) fl_sample1$(EXEEXT) \
-	| if grep -q pmwin.763 ; then emxbind -ep fl_sample1$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__fl_sample1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle
-@COND_TOOLKIT_COCOA@____fl_sample1_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fl_sample1.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____fl_sample1_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fl_sample1.app/Contents/PkgInfo
-@COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o
-@COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C fl_sample2$(EXEEXT)
-@COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_8)
-COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd = $(NM) fl_sample2$(EXEEXT) \
-	| if grep -q pmwin.763 ; then emxbind -ep fl_sample2$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__fl_sample2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle
-@COND_TOOLKIT_COCOA@____fl_sample2_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fl_sample2.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____fl_sample2_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fl_sample2.app/Contents/PkgInfo
-@COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o
-@COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C fl_sample3$(EXEEXT)
-@COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_9)
-COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd = $(NM) fl_sample3$(EXEEXT) \
-	| if grep -q pmwin.763 ; then emxbind -ep fl_sample3$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__fl_sample3___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__fl_sample3_bundle___depname = fl_sample3_bundle
-@COND_TOOLKIT_COCOA@____fl_sample3_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fl_sample3.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____fl_sample3_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fl_sample3.app/Contents/PkgInfo
-@COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
-	$(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
-	$(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
-	$(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-	fl_demo1$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
-	$(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
-	$(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
-	$(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-	fl_demo2$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
-	$(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
-	$(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
-	$(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-	fl_sample1$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
-	$(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
-	$(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
-	$(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-	fl_sample2$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
-	$(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \
-	$(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
-	$(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-	fl_sample3$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_2 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_3 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1_2 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1_3 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1_2 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1_3 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1_2 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1_3 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1_2 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1_3 = --define WXUSINGDLL
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_12 = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__fl = $(top_srcdir)/include/wx/os2/wx.res
-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)
-
-### Targets: ###
-
-all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) data_files
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f fl_demo1$(EXEEXT)
-	rm -rf fl_demo1.app
-	rm -f fl_demo2$(EXEEXT)
-	rm -rf fl_demo2.app
-	rm -f fl_sample1$(EXEEXT)
-	rm -rf fl_sample1.app
-	rm -f fl_sample2$(EXEEXT)
-	rm -rf fl_sample2.app
-	rm -f fl_sample3$(EXEEXT)
-	rm -rf fl_sample3.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
-	$(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)
-	$(__fl_demo1___mac_rezcmd)
-	$(__fl_demo1___mac_setfilecmd)
-	$(__fl_demo1___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fl_demo1.app/Contents
-	mkdir -p fl_demo1.app/Contents/MacOS
-	mkdir -p fl_demo1.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fl_demo1/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo1.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo
-	
-	
-	ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
-
-fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
-	$(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)
-	$(__fl_demo2___mac_rezcmd)
-	$(__fl_demo2___mac_setfilecmd)
-	$(__fl_demo2___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fl_demo2.app/Contents
-	mkdir -p fl_demo2.app/Contents/MacOS
-	mkdir -p fl_demo2.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fl_demo2/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo2.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo
-	
-	
-	ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
-
-fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
-	$(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)
-	$(__fl_sample1___mac_rezcmd)
-	$(__fl_sample1___mac_setfilecmd)
-	$(__fl_sample1___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fl_sample1.app/Contents
-	mkdir -p fl_sample1.app/Contents/MacOS
-	mkdir -p fl_sample1.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fl_sample1/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample1.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo
-	
-	
-	ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
-
-fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
-	$(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)
-	$(__fl_sample2___mac_rezcmd)
-	$(__fl_sample2___mac_setfilecmd)
-	$(__fl_sample2___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fl_sample2.app/Contents
-	mkdir -p fl_sample2.app/Contents/MacOS
-	mkdir -p fl_sample2.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fl_sample2/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample2.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo
-	
-	
-	ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
-
-fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
-	$(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)
-	$(__fl_sample3___mac_rezcmd)
-	$(__fl_sample3___mac_setfilecmd)
-	$(__fl_sample3___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fl_sample3.app/Contents
-	mkdir -p fl_sample3.app/Contents/MacOS
-	mkdir -p fl_sample3.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fl_sample3/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample3.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo
-	
-	
-	ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: $(____fl_sample3_BUNDLE_TGT_REF_DEP)
-
-data_files: 
-	@mkdir -p ./bitmaps
-	@for f in bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp; do \
-	if test ! -f ./bitmaps/$$f -a ! -d ./bitmaps/$$f ; \
-	then x=yep ; \
-	else x=`find $(srcdir)/bitmaps/$$f -newer ./bitmaps/$$f -print` ; \
-	fi; \
-	case "$$x" in ?*) \
-	cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ;; \
-	esac; \
-	done
-
-fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
-	$(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(srcdir)/fl_demo1.cpp
-
-fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
-
-fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
-	$(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $(srcdir)/fl_demo2.cpp
-
-fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
-
-fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp
-	$(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $(srcdir)/fl_sample1.cpp
-
-fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
-
-fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp
-	$(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $(srcdir)/fl_sample2.cpp
-
-fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
-
-fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp
-	$(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $(srcdir)/fl_sample3.cpp
-
-fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle data_files
diff --git a/contrib/samples/fl/bitmaps/bookmarks.bmp b/contrib/samples/fl/bitmaps/bookmarks.bmp
deleted file mode 100644
index 61cf99ee2b..0000000000
Binary files a/contrib/samples/fl/bitmaps/bookmarks.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/class_icon.bmp b/contrib/samples/fl/bitmaps/class_icon.bmp
deleted file mode 100644
index 8ab35e63b6..0000000000
Binary files a/contrib/samples/fl/bitmaps/class_icon.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/class_icon1.bmp b/contrib/samples/fl/bitmaps/class_icon1.bmp
deleted file mode 100644
index 18109c80f9..0000000000
Binary files a/contrib/samples/fl/bitmaps/class_icon1.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/copy.bmp b/contrib/samples/fl/bitmaps/copy.bmp
deleted file mode 100644
index a21608fc23..0000000000
Binary files a/contrib/samples/fl/bitmaps/copy.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/cut.bmp b/contrib/samples/fl/bitmaps/cut.bmp
deleted file mode 100644
index d41668ab3f..0000000000
Binary files a/contrib/samples/fl/bitmaps/cut.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/file_icon.bmp b/contrib/samples/fl/bitmaps/file_icon.bmp
deleted file mode 100644
index 496988c6de..0000000000
Binary files a/contrib/samples/fl/bitmaps/file_icon.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/folder_icon.bmp b/contrib/samples/fl/bitmaps/folder_icon.bmp
deleted file mode 100644
index feae18738a..0000000000
Binary files a/contrib/samples/fl/bitmaps/folder_icon.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/help_icon.bmp b/contrib/samples/fl/bitmaps/help_icon.bmp
deleted file mode 100644
index 548588a796..0000000000
Binary files a/contrib/samples/fl/bitmaps/help_icon.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/new.bmp b/contrib/samples/fl/bitmaps/new.bmp
deleted file mode 100644
index 371b34ade0..0000000000
Binary files a/contrib/samples/fl/bitmaps/new.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/nextmark.bmp b/contrib/samples/fl/bitmaps/nextmark.bmp
deleted file mode 100644
index 597818bd44..0000000000
Binary files a/contrib/samples/fl/bitmaps/nextmark.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/open.bmp b/contrib/samples/fl/bitmaps/open.bmp
deleted file mode 100644
index 35ad487487..0000000000
Binary files a/contrib/samples/fl/bitmaps/open.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/paste.bmp b/contrib/samples/fl/bitmaps/paste.bmp
deleted file mode 100644
index 73032d58b0..0000000000
Binary files a/contrib/samples/fl/bitmaps/paste.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/prevmark.bmp b/contrib/samples/fl/bitmaps/prevmark.bmp
deleted file mode 100644
index 83ad6f346f..0000000000
Binary files a/contrib/samples/fl/bitmaps/prevmark.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/res_icon.bmp b/contrib/samples/fl/bitmaps/res_icon.bmp
deleted file mode 100644
index 7077719210..0000000000
Binary files a/contrib/samples/fl/bitmaps/res_icon.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/save.bmp b/contrib/samples/fl/bitmaps/save.bmp
deleted file mode 100644
index 2da2da72ad..0000000000
Binary files a/contrib/samples/fl/bitmaps/save.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/saveall.bmp b/contrib/samples/fl/bitmaps/saveall.bmp
deleted file mode 100644
index 4413bcfe74..0000000000
Binary files a/contrib/samples/fl/bitmaps/saveall.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/search.bmp b/contrib/samples/fl/bitmaps/search.bmp
deleted file mode 100644
index 771adc406e..0000000000
Binary files a/contrib/samples/fl/bitmaps/search.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/start95_dp.bmp b/contrib/samples/fl/bitmaps/start95_dp.bmp
deleted file mode 100644
index d5187ef910..0000000000
Binary files a/contrib/samples/fl/bitmaps/start95_dp.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/start95_pr.bmp b/contrib/samples/fl/bitmaps/start95_pr.bmp
deleted file mode 100644
index da4aad3ed8..0000000000
Binary files a/contrib/samples/fl/bitmaps/start95_pr.bmp and /dev/null differ
diff --git a/contrib/samples/fl/bitmaps/tile.bmp b/contrib/samples/fl/bitmaps/tile.bmp
deleted file mode 100644
index 66901edf3d..0000000000
Binary files a/contrib/samples/fl/bitmaps/tile.bmp and /dev/null differ
diff --git a/contrib/samples/fl/fl.bkl b/contrib/samples/fl/fl.bkl
deleted file mode 100644
index 9747dfa47c..0000000000
--- a/contrib/samples/fl/fl.bkl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <template id="fl_sample"
-              template="wx_contrib_sample" template_append="wx_append">
-        <define>BMP_DIR="bitmaps/"</define>
-        <sources>$(id).cpp</sources>
-        <win32-res>$(id).rc</win32-res>
-        <contrib-lib>fl</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </template>
-
-    <exe id="fl_demo1" template="fl_sample"/>
-    <exe id="fl_demo2" template="fl_sample"/>
-    <exe id="fl_sample1" template="fl_sample"/>
-    <exe id="fl_sample2" template="fl_sample"/>
-    <exe id="fl_sample3" template="fl_sample"/>
-
-    <wx-data id="data_files">
-        <dstdir>$(BUILDDIR)/bitmaps</dstdir>
-        <srcdir>$(SRCDIR)/bitmaps</srcdir>
-        <files>
-            bookmarks.bmp
-            class_icon.bmp
-            class_icon1.bmp
-            copy.bmp
-            cut.bmp
-            file_icon.bmp
-            folder_icon.bmp
-            help_icon.bmp
-            new.bmp
-            nextmark.bmp
-            open.bmp
-            paste.bmp
-            prevmark.bmp
-            res_icon.bmp
-            save.bmp
-            saveall.bmp
-            search.bmp
-            start95_dp.bmp
-            start95_pr.bmp
-            tile.bmp
-        </files>
-    </wx-data>
-
-
-</makefile>
diff --git a/contrib/samples/fl/fl_demo1.cpp b/contrib/samples/fl/fl_demo1.cpp
deleted file mode 100644
index 5b568334f9..0000000000
--- a/contrib/samples/fl/fl_demo1.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_demo1.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"     // core API
-
-// extra plugins
-#include "wx/fl/barhintspl.h"    // bevel for bars with "X"s and grooves
-#include "wx/fl/rowdragpl.h"     // NC-look with draggable rows
-#include "wx/fl/cbcustom.h"      // customization plugin
-#include "wx/fl/hintanimpl.h"
-
-// beauty-care
-#include "wx/fl/gcupdatesmgr.h"  // smooth d&d
-#include "wx/fl/antiflickpl.h"   // double-buffered repaint of decorations
-#include "wx/fl/dyntbar.h"       // auto-layout toolbar
-#include "wx/fl/dyntbarhnd.h"    // control-bar dimension handler for it
-
-#include "fl_demo1.h"
-
-// comment it out if it breaks, (this is my workaround for MSDev 4.0 linker)
-
-char  wxDummyChar;
-
-
-IMPLEMENT_APP (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    MyFrame *frame = new MyFrame(NULL);
-
-    frame->SetBackgroundColour( wxColour(192,192,192) );
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append( NEW_TEST_LOAD, _("&Load layouts")  );
-    file_menu->Append( NEW_TEST_SAVE, _("&Store layouts") );
-    file_menu->Append( NEW_TEST_EXIT, _("E&xit") );
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu,   _("&File"));
-
-    frame->SetMenuBar(menu_bar);
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
-
-    frame->Show(true);
-
-    frame->mpClientWnd->Refresh();
-
-    SetTopWindow(frame);
-
-
-    wxMessageBox(_("Hello, this demo has a bunch of yet-not-fixed-bugs and missing functionality\n\
-The ONLY purpose is to demonstrate self-layouting toolbars,\nflat-bitmapped-buttons and 2-new FL-plugins \
-(cbRowDragPlugin & cbBarHintsPlugin)\n\n\
-BTW, disabled images and label-text are rendered at run-time") );
-
-    return true;
-}
-
-/***** Implementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE( MyFrame, wxFrame )
-    // EVT_CHAR_HOOK(MyFrame::OnKeyDown)
-    // EVT_PAINT( MyFrame::OnPaint )
-    EVT_MENU( NEW_TEST_SAVE, MyFrame::OnSave )
-    EVT_MENU( NEW_TEST_LOAD, MyFrame::OnLoad )
-    EVT_MENU( NEW_TEST_EXIT, MyFrame::OnExit )
-END_EVENT_TABLE()
-
-void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_T("Hey - you found a BIG question-mark !!"));
-}
-
-void MyFrame::OnSave( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("Hey - you found another BIG question-mark !!"));
-}
-
-void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
-{
-    Destroy();
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl =
-
-        new wxTextCtrl( this, wxID_ANY, value,
-        wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
-
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-
-    return pCtrl;
-}
-
-MyFrame::MyFrame(wxFrame *frame)
-    : wxFrame( frame, wxID_ANY, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxRESIZE_BORDER   | wxSYSTEM_MENU  | wxCAPTION | wxCLOSE_BOX,
-          wxT("freimas") )
-{
-    mpClientWnd = CreateTextCtrl( _("Client window") );
-
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-
-#if defined(__WXGTK__) || defined(__WXX11__)
-    cbCommonPaneProperties props;
-    mpLayout->GetPaneProperties( props );
-
-    props.mRealTimeUpdatesOn = false; // real-time OFF!!!
-
-    mpLayout->SetPaneProperties( props, wxALL_PANES );
-#endif
-
-    mpLayout->SetUpdatesManager( new cbGCUpdatesMgr() );
-
-    // this is now default...
-    //mpLayout->SetMargins( 1,1,1,1 ); // gaps for vertical/horizontal/right/left panes
-
-    // setup plugins for testing
-    mpLayout->PushDefaultPlugins();
-
-    mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // fancy "X"es and bevel for bars
-    mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbRowDragPlugin  ) );
-    mpLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) );
-    mpLayout->AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
-
-    // drop in some bars
-    cbDimInfo sizes0( 200,45, // when docked horizontally
-                      200,85, // when docked vertically
-                      175,35, // when floated
-                      false,  // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    );
-
-    cbDimInfo sizes1( 150,35, // when docked horizontally
-                      150,85, // when docked vertically
-                      175,35, // when floated
-                      true,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4       // horizontal gap (bar border)
-                    );
-
-    cbDimInfo sizes2( 195,35, // when docked horizontally
-                      185,37, // when docked vertically
-                      195,35, // when floated
-                      true,   // the bar is not fixed-size
-                      4,      // vertical gap (bar border)
-                      4,      // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl(_("Hello")),  // bar window
-                      sizes0, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      0,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      _("InfoViewer1"),            // name to refer in customization pop-ups
-                      true
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl(_("Bye")),    // bar window
-                      sizes0, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      1,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      _("InfoViewer2"),            // name to refer in customization pop-ups
-                      true
-                    );
-
-    mpLayout->AddBar( CreateTextCtrl(_("Fixed0")), // bar window
-                      sizes1, FL_ALIGN_TOP,     // alignment ( 0-top,1-bottom, etc)
-                      0,                        // insert into 0th row (vert. position)
-                      0,                        // offset from the start of row (in pixels)
-                      _("ToolBar1"),               // name to refer in customization pop-ups
-                      true
-                    );
-
-    wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
-
-    pToolBar->Create( this, wxID_ANY );
-
-    // 1001-1006 ids of command events fired by added tool-buttons
-
-    pToolBar->AddTool( 1001, wxString(wxT(BMP_DIR)) + wxT("new.bmp") );
-    pToolBar->AddSeparator();
-    pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
-    pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
-#if wxUSE_STATLINE
-    pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));
-#endif // wxUSE_STATLINE
-    pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
-    pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
-    pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
-
-
-    mpLayout->AddBar( pToolBar,             // bar window (can be NULL)
-                      sizes2, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
-                      0,                    // insert into 0th row (vert. position)
-                      0,                    // offset from the start of row (in pixels)
-                      wxT("ToolBar2"),           // name to refer in customization pop-ups
-                      false
-                    );
-
-    mpLayout->EnableFloating( true ); // off, thinking about wxGtk...
-}
-
-MyFrame::~MyFrame()
-{
-    if ( mpLayout)
-        delete mpLayout; // should be destroyed manually
-}
-
-#define LINE_SIZE 3
-#if wxUSE_STATLINE
-void wxMySeparatorLine::DoSetSize( int x, int y,
-                                   int width, int height,
-                                   int sizeFlags)
-{
-    if (width < height)
-    {
-        x += (width - LINE_SIZE) / 2;
-        width = LINE_SIZE;
-    }
-    else
-    {
-        y += (height - LINE_SIZE) / 2;
-        height = LINE_SIZE;
-    }
-
-    wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
-}
-#endif // wxUSE_STATLINE
diff --git a/contrib/samples/fl/fl_demo1.h b/contrib/samples/fl/fl_demo1.h
deleted file mode 100644
index 79626d5338..0000000000
--- a/contrib/samples/fl/fl_demo1.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __NEW_TEST_G__
-#define __NEW_TEST_G__
-
-#define NEW_TEST_SAVE 1101
-#define NEW_TEST_LOAD 1102
-#define NEW_TEST_EXIT 1103
-
-#include "wx/panel.h"
-#include "wx/statline.h"
-
-// Define a new application type
-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-class MyFrame: public wxFrame
-{
-public:
-    wxFrameLayout*  mpLayout;
-    wxTextCtrl*     mpClientWnd;
-
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-
-public:
-    MyFrame(wxFrame *frame);
-    virtual ~MyFrame();
-
-    bool OnClose(void) { Show(false); return true; }
-
-    void OnLoad( wxCommandEvent& event );
-    void OnSave( wxCommandEvent& event );
-    void OnExit( wxCommandEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#if wxUSE_STATLINE
-/*
- * Quick example of your own Separator class...
- */
-class wxMySeparatorLine : public wxStaticLine
-{
-public:
-    wxMySeparatorLine()
-    {}
-    wxMySeparatorLine( wxWindow *parent, wxWindowID id)
-        : wxStaticLine( parent, id)
-    {}
-
-protected:
-   virtual void DoSetSize( int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-};
-#endif // wxUSE_STATLINE
-
-#endif
-
diff --git a/contrib/samples/fl/fl_demo1.rc b/contrib/samples/fl/fl_demo1.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_demo1.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
deleted file mode 100644
index 3941e3581b..0000000000
--- a/contrib/samples/fl/fl_demo2.cpp
+++ /dev/null
@@ -1,984 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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
-
-// wxWidgets headers.
-#include "wx/treectrl.h"
-#include "wx/imaglist.h"
-#include "wx/notebook.h"
-
-// fl headers.
-#include "wx/fl/controlbar.h"
-#include "wx/fl/rowlayoutpl.h"
-#include "wx/fl/antiflickpl.h"
-#include "wx/fl/bardragpl.h"
-#include "wx/fl/cbcustom.h"
-#include "wx/fl/rowdragpl.h"
-
-// some extra fl plugins.
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#include "wx/fl/dyntbar.h"
-#include "wx/fl/dyntbarhnd.h"  // fl-dimension-handler for dynamic toolbar
-
-#include "fl_demo2.h"
-
-/***** Implementation for class MyApp *****/
-
-// Create a new application object
-IMPLEMENT_APP    (MyApp)
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{
-    // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, _("wxWidgets 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
-
-    // Give it an icon
-#ifdef __WINDOWS__
-    frame->SetIcon(wxIcon(wxT("mondrian")));
-#endif
-#ifdef __X__
-    frame->SetIcon(wxIcon(wxT("aiai.xbm")));
-#endif
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-    wxMenu *active_menu = new wxMenu;
-
-    file_menu->Append( ID_LOAD,  _("&Load layouts")  );
-    file_menu->Append( ID_STORE, _("&Store layouts") );
-    file_menu->AppendSeparator();
-
-    file_menu->Append( ID_AUTOSAVE, _("&Auto Save Layouts"), _("save layouts on exit"), wxITEM_CHECK );
-    file_menu->AppendSeparator();
-
-    file_menu->Append(MINIMAL_ABOUT, _("A&bout !"));
-    file_menu->Append(MINIMAL_QUIT, _("E&xit\tTab"));
-
-    //active_menu->Append( ID_SETTINGS, _("&Settings...\tCtrl") );
-    //active_menu->AppendSeparator();
-
-    active_menu->Append( ID_REMOVE,    _("&Remove Active") );
-    active_menu->Append( ID_REMOVEALL, _("Remove &All") );
-    active_menu->Append( ID_RECREATE,  _("Re&create") );
-    active_menu->AppendSeparator();
-
-    active_menu->Append( ID_FIRST,  _("Activate f&irst layout \tF1"), _("activate it"), wxITEM_CHECK );
-    active_menu->Append( ID_SECOND, _("Activate &second layout\tF2"), _("activate it"),  wxITEM_CHECK );
-    active_menu->Append( ID_THIRD,  _("Activate &third layout\tF3"), _("activate it"),   wxITEM_CHECK );
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu,   _("&File"));
-    menu_bar->Append(active_menu, _("Active &Layout"));
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
-
-    frame->SetMenuBar(menu_bar);
-
-    frame->SyncMenuBarItems();
-
-    // Show the frame
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-MyFrame::~MyFrame()
-{
-    // frame-layouts is not a windows (objects), thus should
-    // be cleaned up manually
-
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        if ( mLayouts[i] )
-            delete mLayouts[i];
-    }
-
-    if ( mpNestedLayout   )
-        delete mpNestedLayout;
-    if ( mpAboutBoxLayout )
-        delete mpAboutBoxLayout;
-}
-
-/***** Implementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( MINIMAL_QUIT,  MyFrame::OnQuit  )
-    EVT_MENU( MINIMAL_ABOUT, MyFrame::OnAbout )
-
-    EVT_MENU( ID_LOAD,      MyFrame::OnLoad      )
-    EVT_MENU( ID_STORE,     MyFrame::OnStore     )
-    EVT_MENU( ID_AUTOSAVE,  MyFrame::OnAutoSave  )
-    //EVT_MENU( ID_SETTINGS,  MyFrame::OnSettings  )
-    EVT_MENU( ID_REMOVE,    MyFrame::OnRemove    )
-    EVT_MENU( ID_REMOVEALL, MyFrame::OnRemoveAll )
-    EVT_MENU( ID_RECREATE,  MyFrame::OnRecreate  )
-    EVT_MENU( ID_FIRST,     MyFrame::OnFirst     )
-    EVT_MENU( ID_SECOND,    MyFrame::OnSecond    )
-    EVT_MENU( ID_THIRD,     MyFrame::OnThird     )
-
-    EVT_BUTTON( ID_SAY_ITSOK, MyFrame::OnSayItsOk )
-    EVT_BUTTON( ID_BTN_YES,   MyFrame::OnBtnYes )
-    EVT_BUTTON( ID_BTN_NO,    MyFrame::OnBtnNo )
-    EVT_BUTTON( ID_BTN_ESC,   MyFrame::OnBtnEsc )
-
-    EVT_CHAR_HOOK( MyFrame::OnChar )
-END_EVENT_TABLE()
-
-// My frame constructor
-
-MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
-    : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),
-    mpNestedLayout( NULL ),
-    mpAboutBoxLayout( NULL ),
-
-    mActiveLayoutNo( FIRST_LAYOUT ),
-    mAutoSave( true ),
-    mSavedAlready( false ),
-    mpClntWindow( NULL ),
-
-    mImageList( 16,16, false, 2 )
-{
-    int i;
-
-    mpInternalFrm = (wxPanel*)this;
-
-    mAboutBox.Create( this, wxID_ANY,  _T("About box in wxWidgets style..."),
-                      wxDefaultPosition,
-                      wxSize( 385,220),
-                      wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
-
-    for( i = 0; i != MAX_LAYOUTS; ++i )
-        mLayouts[i] = NULL;
-
-    // image-list is one of the few objects which
-    // currently cannot be serialized, create it first
-    // and use it as initial reference (IR)
-
-    wxBitmap bmp1,bmp2;
-
-    if ( wxFileExists( wxString(wxT(BMP_DIR)) + wxT("folder_icon.bmp") ) )
-        bmp1.LoadFile( wxString(wxT(BMP_DIR)) + wxT("folder_icon.bmp"), wxBITMAP_TYPE_BMP );
-
-    if ( wxFileExists( wxString(wxT(BMP_DIR)) + wxT("class_icon1.bmp") ) )
-        bmp2.LoadFile( wxString(wxT(BMP_DIR)) + wxT("class_icon1.bmp"), wxBITMAP_TYPE_BMP );
-
-    mImageList.Add( bmp1 );
-    mImageList.Add( bmp2 );
-
-    InitAboutBox();
-
-    // create multiple layouts
-
-    mpNestedLayout = 0;
-
-    mpClntWindow = CreateTxtCtrl(wxT("client window"));
-
-    // Create all layouts
-    for( i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        CreateLayout( i );
-    }
-    // hide others
-    for( i = SECOND_LAYOUT; i != MAX_LAYOUTS; ++i )
-    {
-        mLayouts[i]->HideBarWindows();
-    }
-
-    // activate first one
-    mLayouts[FIRST_LAYOUT]->Activate();
-    mActiveLayoutNo = FIRST_LAYOUT;
-}
-
-/*** event handlers ***/
-
-bool MyFrame::OnClose(void)
-{
-    //  USEFUL TRICK:: avoids flickering of application's frame
-    //                 when closing NN windows on exit:
-
-    Show(false);
-
-    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-    {
-    }
-    else
-    {
-        wxCommandEvent evt;
-        OnStore(evt);
-    }
-
-    mAboutBox.Destroy();
-    Destroy();
-
-    return true;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("Hey - you found a BIG question-mark !!"));
-}
-
-void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("Hey - you found another BIG question-mark !!"));
-}
-
-void MyFrame::OnAutoSave( wxCommandEvent& WXUNUSED(event) )
-{
-    mAutoSave = !mAutoSave;
-
-    wxCommandEvent evt;
-    OnStore(evt);
-
-    SyncMenuBarItems();
-}
-
-void MyFrame::OnRemove( wxCommandEvent& WXUNUSED(event) )
-{
-    RemoveLayout( mActiveLayoutNo );
-
-    Refresh();
-}
-
-void MyFrame::OnRemoveAll( wxCommandEvent& WXUNUSED(event) )
-{
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        RemoveLayout( i );
-    }
-
-    Refresh();
-}
-
-
-void MyFrame::OnRecreate( wxCommandEvent& event )
-{
-    OnRemove( event ); // first destroy active layout
-
-    CreateLayout( mActiveLayoutNo );
-
-    mLayouts[mActiveLayoutNo]->Activate();
-}
-
-void MyFrame::OnFirst( wxCommandEvent& WXUNUSED(event) )
-{
-    ActivateLayout( FIRST_LAYOUT );
-}
-
-void MyFrame::OnSecond( wxCommandEvent& WXUNUSED(event) )
-{
-    ActivateLayout( SECOND_LAYOUT );
-}
-
-void MyFrame::OnThird( wxCommandEvent& WXUNUSED(event) )
-{
-    ActivateLayout( THIRD_LAYOUT );
-}
-
-void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
-{
-    //  USEFUL TRICK:: avoids flickering of application's frame
-    //                 when closing NN windows on exit:
-
-    Show(false);
-
-    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-    {
-    }
-    else
-    {
-        wxCommandEvent evt;
-        OnStore(evt);
-    }
-
-    Destroy();
-}
-
-void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
-{
-    wxFont font;
-#ifdef __WXMSW__
-    font.SetFaceName(wxT("MS Sans Serif"));
-#else
-    font.SetFamily( wxSWISS );
-#endif
-
-    font.SetStyle( wxSLANT );
-    font.SetWeight( wxNORMAL );
-    font.SetPointSize( 8 );
-
-#ifdef __WXMSW__
-    font.RealizeResource();
-#endif
-
-    mAboutBox.Center( wxBOTH );
-    mAboutBox.Show(true);
-
-}
-
-void MyFrame::OnChar( wxKeyEvent& event )
-{
-    wxCommandEvent evt;
-
-    if ( event.m_keyCode == WXK_F1 )
-    {
-        OnFirst( evt );
-    }
-    else
-    {
-        if ( event.m_keyCode == WXK_F2 )
-        {
-            OnSecond( evt );
-        }
-        else
-        {
-            if ( event.m_keyCode == WXK_F3 )
-            {
-                OnThird( evt );
-            }
-            if ( event.m_keyCode == WXK_F4 && !event.AltDown() )
-            {
-                // "AI" :-)
-                wxMessageBox(_("There are only 3 layouts in this demo :-("));
-            }
-            else
-            {
-                if ( event.m_keyCode == WXK_TAB )
-                {
-                    //  USEFUL TRICK:: avoids flickering of application's frame
-                    //                 when closing NN windows on exit:
-
-                    Show(false);
-
-                    if ( (mAutoSave && mSavedAlready) || !mAutoSave )
-                    {
-                    }
-                    else
-                    {
-                        wxCommandEvent evt;
-                        OnStore(evt);
-                    }
-
-                    Destroy();
-                }
-                else
-                {
-                    event.Skip();
-                }
-            }
-        }
-    }
-}
-
-void MyFrame::OnSayItsOk( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("It's OK  :-)\n\n now click on the border around the button\n and try dragging it!") );
-}
-
-void MyFrame::OnBtnYes( wxCommandEvent& WXUNUSED(event) )
-{
-    mAboutBox.Show(false);
-}
-
-void MyFrame::OnBtnNo( wxCommandEvent& WXUNUSED(event) )
-{
-    mAboutBox.Show(false);
-}
-
-void MyFrame::OnBtnEsc( wxCommandEvent& WXUNUSED(event) )
-{
-    mAboutBox.Show(false);
-}
-
-/*** helper methods ***/
-
-void MyFrame::InitAboutBox()
-{
-    wxPanel* pArea = new wxPanel();
-
-    pArea->Create( &mAboutBox, wxID_ANY );
-
-    new wxStaticText(pArea, wxID_ANY, _("This is wxFrameLayout contribution demo."),
-        wxPoint(10, 10) );
-
-    new wxStaticText(pArea, wxID_ANY, _("Aleksandras Gluchovas (c) 1998"),
-        wxPoint(10, 30) );
-
-    new wxStaticText(pArea, wxID_ANY, _("<mailto:alex@soften.ktu.lt>"),
-        wxPoint(10, 50) );
-
-    mpAboutBoxLayout = new wxFrameLayout( &mAboutBox, pArea, true );
-
-    wxFrameLayout& layout = *mpAboutBoxLayout;
-
-    cbDimInfo sizes( 90,40,     // when docked horizontally
-                     45,55,     // when docked vertically
-                     90,40,     // when floated
-                     true, 4, 4 // true - bar is fixed-size
-                   );
-
-
-    wxButton* pYes = CreateButton(_("&Yes"),   &mAboutBox, ID_SAY_ITSOK );
-    wxButton* pNo  = CreateButton(_("&No"),    &mAboutBox, ID_BTN_NO );
-    wxButton* pEsc = CreateButton(_("Cancel"), &mAboutBox, ID_BTN_ESC );
-
-    layout.AddBar( pEsc, sizes,  FL_ALIGN_BOTTOM, 0, 20, _("cancel button"));
-    layout.AddBar( pNo,  sizes,  FL_ALIGN_BOTTOM, 0, 20, _("no button"));
-    layout.AddBar( pYes, sizes,  FL_ALIGN_BOTTOM, 0, 20, _("yes button"));
-
-    layout.mBorderPen.SetColour( 192, 192, 192 );
-    layout.SetMargins( 15, 15, 15, 15, wxALL_PANES );
-
-    cbCommonPaneProperties props;
-
-    layout.GetPaneProperties( props, FL_ALIGN_TOP );
-
-    props.mShow3DPaneBorderOn = false;
-
-    layout.SetPaneProperties( props, wxALL_PANES );
-
-    layout.Activate();
-
-    pYes->SetDefault();
-    pYes->SetFocus();
-}
-
-wxTextCtrl* MyFrame::CreateTxtCtrl( const wxString& txt, wxWindow* parent )
-{
-    return new wxTextCtrl( (parent != NULL ) ? parent : mpInternalFrm,
-                            wxID_ANY, txt, wxDefaultPosition, wxDefaultSize,
-                            wxTE_MULTILINE );
-}
-
-wxButton* MyFrame::CreateButton( const wxString& label,
-                                wxWindow* pParent, long id )
-{
-    return new wxButton( (pParent)?pParent : mpInternalFrm, id,
-                            label, wxPoint( 0,0 ), wxSize( 0,0 ) );
-}
-
-wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
-{
-    wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, wxID_ANY );
-
-    const wxTreeItemId rootid = pTree->AddRoot(label);
-
-    if ( label.StartsWith(_T("X")) )
-    {
-        pTree->AppendItem(rootid, _("Scully"));
-        pTree->AppendItem(rootid, _("Mulder"));
-    }
-    else
-    {
-        pTree->AppendItem(rootid, _("Leaf1"));
-        pTree->AppendItem(rootid, _("Leaf2"));
-    }
-
-    return pTree;
-}
-
-wxChoice* MyFrame::CreateChoice( const wxString& txt )
-{
-    wxString choice_strings[5];
-
-    choice_strings[0] = txt;
-    choice_strings[1] = _("Julian");
-    choice_strings[2] = _("Hattie");
-    choice_strings[3] = _("Ken");
-    choice_strings[4] = _("Dick");
-
-    wxChoice *choice = new wxChoice( mpInternalFrm, 301, wxDefaultPosition,
-                                        wxDefaultSize, 5, choice_strings);
-
-    choice->SetSelection(0);
-
-    return choice;
-}
-
-// helper
-
-void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* WXUNUSED(pParent) )
-{
-    cbDimInfo sizes2( 275,38,   // when docked horizontally
-                      45,275,   // when docked vertically
-                      80,30,    // when floated
-                      true,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    );
-
-    cbDimInfo sizes3( 275,55,   // when docked horizontally
-                      275,60,   // when docked vertically
-                      45,130,   // when floated
-                      true,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    );
-
-    cbDimInfo sizes4( 430,35,   // when docked horizontally
-                      44,375,   // when docked vertically
-                      80,100,   // when floated
-                      true,     // the bar is fixed-size
-                      4,        // vertical gap (bar border)
-                      4,        // horizontal gap (bar border)
-                      new cbDynToolBarDimHandler()
-                    );
-
-    wxDynamicToolBar* pTBar2 = new wxDynamicToolBar( mpInternalFrm, wxID_ANY );
-
-    wxChoice* pChoice = new wxChoice( pTBar2, wxID_ANY, wxDefaultPosition, wxSize( 140,25 ) );
-
-    pTBar2->AddTool( 1, pChoice );
-    pTBar2->AddTool( 2, wxString(wxT(BMP_DIR)) + wxT("search.bmp") );
-    //pTBar2->AddSeparator();
-    pTBar2->AddTool( 3, wxString(wxT(BMP_DIR)) + wxT("bookmarks.bmp") );
-    pTBar2->AddTool( 4, wxString(wxT(BMP_DIR)) + wxT("nextmark.bmp") );
-    pTBar2->AddTool( 5, wxString(wxT(BMP_DIR)) + wxT("prevmark.bmp") );
-
-    wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, wxID_ANY );
-
-    pTBar3->AddTool( 1, wxString(wxT(BMP_DIR)) + wxT("open.bmp"), wxBITMAP_TYPE_BMP, wxString(_(" Open ")) );
-    pTBar3->AddTool( 2, wxString(wxT(BMP_DIR)) + wxT("save.bmp"), wxBITMAP_TYPE_BMP, wxString(_(" Save ")) );
-    pTBar3->AddTool( 3, wxString(wxT(BMP_DIR)) + wxT("saveall.bmp"), wxBITMAP_TYPE_BMP, wxString(_(" Save All ")) );
-    //pTBar3->AddSeparator();
-    pTBar3->AddTool( 4, wxString(wxT(BMP_DIR)) + wxT("cut.bmp"),   wxBITMAP_TYPE_BMP, wxString(_(" Open ")) );
-    pTBar3->AddTool( 5, wxString(wxT(BMP_DIR)) + wxT("copy.bmp"),  wxBITMAP_TYPE_BMP, wxString(_(" Copy ")) );
-    pTBar3->AddTool( 6, wxString(wxT(BMP_DIR)) + wxT("paste.bmp"), wxBITMAP_TYPE_BMP, wxString(_(" Paste ")) );
-
-#ifdef __WXMSW__
-    pTBar3->EnableTool( 2, false );
-#endif
-
-    wxDynamicToolBar* pTBar4 = new wxDynamicToolBar( mpInternalFrm, wxID_ANY );
-
-    pTBar4->AddTool( 1, wxString(wxT(BMP_DIR)) + wxT("bookmarks.bmp"), wxBITMAP_TYPE_BMP, wxString(_("Bookmarks ")), true );
-    pTBar4->AddTool( 2, wxString(wxT(BMP_DIR)) + wxT("nextmark.bmp"),  wxBITMAP_TYPE_BMP, wxString(_("Next bookmark ")), true );
-    pTBar4->AddTool( 3, wxString(wxT(BMP_DIR)) + wxT("prevmark.bmp"),  wxBITMAP_TYPE_BMP, wxString(_("Prev bookmark ")), true );
-    //pTBar4->AddSeparator();
-    pTBar4->AddTool( 4, wxString(wxT(BMP_DIR)) + wxT("search.bmp"), wxBITMAP_TYPE_BMP, wxString(_("Search ")), true );
-
-#ifdef __WXMSW__
-    pTBar4->EnableTool( 4, false );
-#endif
-
-    layout.AddBar( pTBar2,
-                   sizes2, FL_ALIGN_TOP,
-                   0,
-                   0,
-                   wxT("Search"),
-                   true
-                 );
-
-    layout.AddBar( pTBar3,
-                   sizes3, FL_ALIGN_BOTTOM,
-                   0,
-                   0,
-                   wxT("Titled"),
-                   true
-                 );
-
-    layout.AddBar( pTBar4,
-                   sizes4, FL_ALIGN_BOTTOM,
-                   1,
-                   0,
-                   wxT("Bookmarks"),
-                   true
-                 );
-}
-
-wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
-{
-    bool isNested = (pParent != mpInternalFrm);
-
-    // check if we're creating nested layout
-    if ( isNested )
-    {
-        layout.mBorderPen.SetColour( 128,255,128 );
-
-        // if so, than make border smaller
-        for( int i = 0; i != MAX_PANES; ++i  )
-        {
-            cbDockPane& pane = *layout.GetPane( i );
-
-            pane.mTopMargin    = 5;
-            pane.mBottomMargin = 5;
-            pane.mLeftMargin   = 5;
-            pane.mRightMargin  = 5;
-        }
-    }
-
-    int cbWidth  = 200;
-    int cbHeight = ( isNested ) ? 50 : 150;
-
-    cbDimInfo sizes4( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, false );
-
-    cbWidth  = 75;
-    cbHeight = 31;
-
-    cbDimInfo sizes5( cbWidth,cbHeight,
-                      42,65,
-                      cbWidth,cbHeight, true,
-                      3,                       // vertical gap (bar border)
-                      3                        // horizontal gap (bar border)
-                    );
-
-    // create "workplace" window in the third layout
-    // SEB: originally here was a wxpp (wxWorkshop) class demotrated
-    //    wxTabbedWindow* pMiniTabArea = new wxTabbedWindow();
-    //    pMiniTabArea->Create( pParent, wxID_ANY );
-
-
-    wxTreeCtrl* pClassView = new wxTreeCtrl( pParent, wxID_ANY,
-                wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS );
-
-    pClassView->SetImageList( &mImageList );
-
-    wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWidgets 2.0 classes"), 0 );
-
-    pClassView->AppendItem( rootId, _("wxWin Dynamic classes (grabbed at run-time)"), 0 );
-    pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );
-
-    // now create "output" window
-    wxNotebook* pTabbedArea = new wxNotebook(pParent, wxID_ANY);
-    // SEB: originally here was a wxpp (wxWorkshop) class used
-    //    wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
-    //    pTabbedArea->Create( pParent, wxID_ANY );
-
-    wxPanel* pSheet3 = new wxPanel();
-    pSheet3->Create( pTabbedArea, wxID_ANY );
-    pSheet3->Show(false);
-
-    pTabbedArea->AddPage( CreateTxtCtrl(wxT("build"), pTabbedArea), wxT("Build"));
-    pTabbedArea->AddPage( CreateTxtCtrl(wxT("debug"), pTabbedArea), wxT("Debug"));
-    pTabbedArea->AddPage( pSheet3, wxT("is THIS recursive - or what !?"));
-    pTabbedArea->AddPage( CreateTxtCtrl(wxT("profile"), pTabbedArea), wxT("Profile"));
-
-    layout.AddBar( new StartButton95(pParent), sizes5, FL_ALIGN_TOP, 0, 0, wxT("Start...") );
-    layout.AddBar( pClassView, sizes4, FL_ALIGN_LEFT, 0, 0, wxT("Project Workplace") );
-    layout.AddBar( pTabbedArea, sizes4, FL_ALIGN_BOTTOM, 0, 50, wxT("Output") );
-
-    return pSheet3;
-}
-
-void MyFrame::DropInSomeBars( int layoutNo )
-{
-    /* create once... and forget! */
-
-    // setup dimension infos for various bar shapes
-
-    int cbWidth  = 90;
-    int cbHeight = 30;
-
-    if ( layoutNo == SECOND_LAYOUT )
-        cbHeight = 60;
-
-    wxFrameLayout& layout = *mLayouts[layoutNo];
-
-    cbDimInfo sizes( cbWidth,cbHeight, // when docked horizontally
-                     cbWidth,cbHeight, // when docked vertically
-                     cbWidth,cbHeight, // when floated
-                     true              // true - bar is fixed-size
-                   );
-
-    cbWidth  = 120;
-
-    cbDimInfo sizes1( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, false ); // false - bar is "flexible"
-
-    cbWidth  = 120;
-    cbHeight = 40;
-
-    cbDimInfo sizes3( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, true ); // -/-
-
-    cbWidth  = 200;
-    cbHeight = 150;
-
-    cbDimInfo sizes4( cbWidth,cbHeight,
-                      cbWidth,cbHeight,
-                      cbWidth,cbHeight, false ); // -/-
-
-    cbWidth  = 63;
-    cbHeight = 31;
-
-    cbDimInfo sizes5( cbWidth,cbHeight,
-                      cbHeight,cbWidth,
-                      cbWidth,cbHeight, true,
-                      3,                        // vertical gap (bar border)
-                      3                         // horizontal gap (bar border)
-                    ); // -/-
-
-
-    if ( layoutNo == FIRST_LAYOUT )
-    {
-        // add 4 fixed-size bars (`sizes' dim-info) and one "flexible" (with `sizes1' dim-info)
-
-        wxWindow* pGreenOne    = new MyTestPanel(mpInternalFrm);
-
-        pGreenOne->SetBackgroundColour( wxColour(128,255,128) );
-
-        layout.AddBar( pGreenOne,                      sizes,  FL_ALIGN_TOP,         0, 50, wxT("Bar1"), true );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_TOP,         2, 50, wxT("Bar2"), true );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_BOTTOM,      2, 50, wxT("Bar3"), true );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes,  FL_ALIGN_LEFT,        2, 50, wxT("Bar4"), true );
-        layout.AddBar( new MyTestPanel(mpInternalFrm), sizes1, wxCBAR_HIDDEN, 2, 50, wxT("Super-Bar"), true );
-    }
-    else
-    {
-        if ( layoutNo == SECOND_LAYOUT )
-        {
-            // show off various wx-controls in the second layout
-
-            layout.AddBar( CreateTxtCtrl(),                sizes,  FL_ALIGN_TOP,    0, 50,  wxT("Fixed text Area&0")     );
-            layout.AddBar( CreateButton(wxT("OK")),        sizes,  FL_ALIGN_TOP,    0, 100, wxT("First Button")    );
-            layout.AddBar( CreateTxtCtrl(),                sizes1, FL_ALIGN_BOTTOM, 0, 50,  wxT("First Tree")  );
-            layout.AddBar( CreateTreeCtrl(wxT("Root")),    sizes1, FL_ALIGN_LEFT,   0, 0,   wxT("TreeCtrl Window") );
-            layout.AddBar( CreateChoice(wxT("Choice 1")),  sizes3, FL_ALIGN_TOP,    0, 0,   wxT("Choice 1 (buggy)"), false, wxCBAR_HIDDEN );
-            layout.AddBar( CreateChoice(wxT("Choice 2")),  sizes3, FL_ALIGN_TOP,    0, 0,   wxT("Choice 2 (buggy)"), false, wxCBAR_HIDDEN );
-            layout.AddBar( CreateTreeCtrl(wxT("X-Files")), sizes1, FL_ALIGN_RIGHT,  0, 100, wxT("X-Files") );
-            layout.AddBar( CreateTxtCtrl(wxT("smaller1")), sizes3, FL_ALIGN_TOP,    0, 50,  wxT("smaller Area1")     );
-            layout.AddBar( CreateTxtCtrl(wxT("smaller2")), sizes3, FL_ALIGN_TOP,    0, 50,  wxT("sm&ller Area2")     );
-        }
-        else
-        {
-            if ( layoutNo == THIRD_LAYOUT  )
-            {
-#if defined(__WXGTK__) || defined(__WXX11__)
-                cbCommonPaneProperties props;
-                layout.GetPaneProperties( props );
-                props.mRealTimeUpdatesOn = false; // real-time OFF for gtk!!!
-                layout.SetPaneProperties( props, wxALL_PANES );
-#endif
-
-                layout.AddBar( CreateTxtCtrl(wxT("Tool1")), sizes3,  FL_ALIGN_TOP,  0, 50,  wxT("Fixed text Area1") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool2")), sizes3,  FL_ALIGN_TOP,  0, 50,  wxT("Fixed text Area2") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool3")), sizes3,  FL_ALIGN_TOP,  0, 50,  wxT("Fixed text Area3") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool4")), sizes3,  FL_ALIGN_TOP,  1, 50,  wxT("Fixed text Area4") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool5")), sizes3,  FL_ALIGN_TOP,  1, 50,  wxT("Fixed text Area5") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool6")), sizes3,  FL_ALIGN_TOP,  1, 50,  wxT("Fixed text Area6") );
-                layout.AddBar( CreateTxtCtrl(wxT("Tool7")), sizes3,  FL_ALIGN_TOP,  2,250,  wxT("Fixed text Area7") );
-
-                cbDimInfo sizes10( 175,35, // when docked horizontally
-                                   175,38, // when docked vertically
-                                   170,35, // when floated
-                                   true,   // the bar is not fixed-size
-                                   4,      // vertical gap (bar border)
-                                   4,      // horizontal gap (bar border)
-                                   new cbDynToolBarDimHandler()
-                                 );
-
-                wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
-
-                pToolBar->Create( mpInternalFrm, wxID_ANY );
-
-                // 1001-1006 ids of command events fired by added tool-buttons
-
-                pToolBar->AddTool( 1001, wxString(wxT(BMP_DIR)) + wxT("new.bmp") );
-                pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
-                pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
-
-                pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
-                pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
-                pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
-
-                layout.AddBar( pToolBar,              // bar window (can be NULL)
-                               sizes10, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
-                               0,                     // insert into 0th row (vert. position)
-                               0,                     // offset from the start of row (in pixels)
-                               wxT("Real-Toolbar"),        // name to refere in customization pop-ups
-                               false
-                             );
-
-                // create first "developement" layout
-                AddSearchToolbars( layout, mpInternalFrm);
-
-                wxWindow* pSheet3 = CreateDevLayout( layout, mpInternalFrm);
-
-                // create another ***secreat developement*** layout inside
-                // the third sheet of the outter one's output bar
-
-                mpNestedLayout = new wxFrameLayout( pSheet3,
-                    CreateTxtCtrl(wxT("\"Mobils in Mobile\" --C.Nemo"),pSheet3), false );
-
-                CreateDevLayout( *mpNestedLayout, pSheet3 );
-
-                mpNestedLayout->Activate();
-            }
-        }
-    }
-}
-
-void MyFrame::CreateLayout( int layoutNo )
-{
-    wxFrameLayout* pLayout = new wxFrameLayout( mpInternalFrm, mpClntWindow, false );
-
-    if ( layoutNo == THIRD_LAYOUT )
-    {
-        pLayout->PushDefaultPlugins();
-        pLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
-#if defined(__WXGTK__) || defined(__WXX11__)
-        pLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-#endif
-        pLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) );
-    }
-
-    mLayouts[layoutNo] = pLayout;
-
-    DropInSomeBars( layoutNo );
-}
-
-void MyFrame::RemoveLayout( int layoutNo )
-{
-    wxFrameLayout* pLayout = mLayouts[layoutNo];
-
-    if ( !pLayout )
-        return;
-
-    pLayout->HideBarWindows();
-
-    // destroy nested layout first
-
-    if ( layoutNo == THIRD_LAYOUT )
-    {
-        if ( mpNestedLayout )
-            delete mpNestedLayout;
-        mpNestedLayout = NULL;
-    }
-
-    // NOTE:: bar windows are NOT destroyed automatically by frame-layout
-
-    pLayout->DestroyBarWindows();
-
-    delete pLayout;
-
-    mLayouts[layoutNo] = NULL;
-
-    Refresh();
-}
-
-void MyFrame::SyncMenuBarItems()
-{
-    for( int i = 0; i != MAX_LAYOUTS; ++i )
-    {
-        GetMenuBar()->Check( ID_FIRST+i,  mActiveLayoutNo == FIRST_LAYOUT+i );
-    }
-
-    GetMenuBar()->Check( ID_AUTOSAVE,  mAutoSave  );
-}
-
-void MyFrame::ActivateLayout( int layoutNo )
-{
-    if ( layoutNo == mActiveLayoutNo )
-        return;
-
-    if ( mLayouts[mActiveLayoutNo] )
-        mLayouts[mActiveLayoutNo]->Deactivate();
-
-    mActiveLayoutNo = layoutNo;
-
-    if ( mLayouts[mActiveLayoutNo] )
-        mLayouts[mActiveLayoutNo]->Activate();
-    else
-        Refresh();
-
-    SyncMenuBarItems();
-}
-
-/***** Implementation for class StartButton95 (just for fun) *****/
-
-IMPLEMENT_DYNAMIC_CLASS( StartButton95, wxPanel )
-
-BEGIN_EVENT_TABLE( StartButton95, wxPanel )
-    EVT_LEFT_DOWN( StartButton95::OnMouseDown )
-    EVT_LEFT_UP  ( StartButton95::OnMouseUp   )
-    EVT_PAINT    ( StartButton95::OnPaint     )
-END_EVENT_TABLE()
-
-void StartButton95::OnMouseDown( wxMouseEvent& WXUNUSED(event) )
-{
-    m_bPressed = true;
-    Refresh();
-    CaptureMouse();
-}
-
-void StartButton95::OnMouseUp( wxMouseEvent& WXUNUSED(event) )
-{
-    // "this is not a bug"
-
-    SetCursor( wxCURSOR_WAIT );
-    GetParent()->SetCursor( wxCURSOR_WAIT );
-    ::wxSetCursor( wxCURSOR_WAIT );
-    wxSleep(1);
-
-    for( int i = 1; i != 6; ++i )
-    {
-        m_bPressed = (i % 2) != 0;
-        Refresh();
-        wxSleep(1);
-    }
-    GetParent()->Close();
-    //*((char*)(i)-3) = 'X'; // Aleks what's the meaning of this???
-}
-
-void StartButton95::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxBitmap* pBmp;
-
-    if ( m_bPressed )
-    {
-        if ( !m_PBmp.Ok() && wxFileExists( wxString(wxT(BMP_DIR)) + wxT("start95_pr.bmp") ) )
-
-            m_PBmp.LoadFile( wxString(wxT(BMP_DIR)) + wxT("start95_pr.bmp"), wxBITMAP_TYPE_BMP );
-
-        pBmp = &m_PBmp;
-    }
-    else
-    {
-        if ( !m_DBmp.Ok() && wxFileExists( wxString(wxT(BMP_DIR)) + wxT("start95_dp.bmp") ) )
-
-            m_DBmp.LoadFile( wxString(wxT(BMP_DIR)) + wxT("start95_dp.bmp"), wxBITMAP_TYPE_BMP );
-
-        pBmp = &m_DBmp;
-    }
-
-    if (!pBmp) return;
-    wxMemoryDC mdc;
-    wxPaintDC  dc(this);
-    mdc.SelectObject( *pBmp );
-
-    dc.Blit( 0,0, pBmp->GetWidth(), pBmp->GetHeight(), &mdc, 0,0, wxCOPY );
-
-    mdc.SelectObject( wxNullBitmap );
-}
diff --git a/contrib/samples/fl/fl_demo2.h b/contrib/samples/fl/fl_demo2.h
deleted file mode 100644
index aa546c9879..0000000000
--- a/contrib/samples/fl/fl_demo2.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __FLDEMO_G__
-#define __FLDEMO_G__
-
-// ID for the menu commands
-
-#define MINIMAL_QUIT    1
-#define MINIMAL_ABOUT 102
-
-#define ID_LOAD      103
-#define ID_STORE     104
-#define ID_AUTOSAVE  105
-//#define ID_SETTINGS  106
-#define ID_REMOVE    107
-#define ID_REMOVEALL 108
-#define ID_RECREATE  109
-#define ID_ACTIVATE  110
-#define ID_FIRST     111
-#define ID_SECOND    112
-#define ID_THIRD     113
-
-#define ID_SAY_ITSOK 114
-#define ID_BTN_YES   115
-#define ID_BTN_NO    116
-#define ID_BTN_ESC   117
-
-#define MAX_LAYOUTS   3
-
-#define FIRST_LAYOUT  0
-#define SECOND_LAYOUT 1
-#define THIRD_LAYOUT  2
-
-class wxFrameLayout;
-class wxObjectStorage;
-
-// FOR NOW::
-typedef wxPanel MyTestPanel;
-
-// Define a new application type
-
-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-};
-
-// Define a new frame type
-
-class MyFrame: public wxFrame
-{
-protected:
-
-    wxFrameLayout* mLayouts[MAX_LAYOUTS];
-
-    wxFrameLayout* mpNestedLayout;
-    wxFrameLayout* mpAboutBoxLayout;
-
-    int            mActiveLayoutNo;
-    bool           mAutoSave;
-    bool           mSavedAlready;
-
-    // container windows:
-
-    wxTextCtrl*    mpClntWindow;
-    wxPanel*       mpInternalFrm;
-
-    wxImageList    mImageList;
-
-    wxFrame       mAboutBox;
-
-    // helpers for control-creation
-
-    wxTextCtrl* CreateTxtCtrl ( const wxString& txt = wxT("wxTextCtrl"), wxWindow* parent = NULL  );
-    wxTreeCtrl* CreateTreeCtrl( const wxString& label = wxT("TreeCtrl") );
-    wxChoice*   CreateChoice  ( const wxString& txt = wxT("Choice1") );
-    wxButton*   CreateButton  ( const wxString& label = wxT("wxButton"), wxWindow* pParent = NULL, long id = ID_SAY_ITSOK );
-
-    // helpers for layout-creation
-
-    void AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent );
-    wxWindow* CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent );
-
-    void DropInSomeBars( int layoutNo );
-    void CreateLayout( int layoutNo );
-    void RemoveLayout( int layoutNo );
-
-    void InitAboutBox();
-
-    void ActivateLayout( int layoutNo );
-
-public: /* public */
-
-    MyFrame( wxFrame *frame, const wxChar *title, int x, int y, int w, int h);
-
-    ~MyFrame();
-
-    void SyncMenuBarItems();
-
-    // event handlers
-
-    bool OnClose(void);
-
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnAutoSave( wxCommandEvent& event );
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    //void OnSettings( wxCommandEvent& event );
-    void OnRemove( wxCommandEvent& event );
-    void OnRemoveAll( wxCommandEvent& event );
-    void OnRecreate( wxCommandEvent& event );
-    void OnFirst( wxCommandEvent& event );
-    void OnSecond( wxCommandEvent& event );
-    void OnThird( wxCommandEvent& event );
-
-    void OnSayItsOk( wxCommandEvent& event );
-    void OnBtnYes( wxCommandEvent& event );
-    void OnBtnNo( wxCommandEvent& event );
-    void OnBtnEsc( wxCommandEvent& event );
-
-    void OnChar( wxKeyEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-// Define a new button type, StartButton95 (Just for fun)
-
-class StartButton95 : public wxPanel
-{
-    DECLARE_DYNAMIC_CLASS( StartButton95 )
-
-    bool m_bPressed;
-    wxBitmap m_PBmp;
-    wxBitmap m_DBmp;
-
-public:
-    StartButton95(void) : m_bPressed(false) {}
-
-    StartButton95(wxWindow* parent)
-        : m_bPressed(false) { wxPanel::Create(parent,wxID_ANY); }
-
-    void OnMouseDown( wxMouseEvent& event );
-    void OnMouseUp( wxMouseEvent& event );
-    void OnPaint( wxPaintEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-
diff --git a/contrib/samples/fl/fl_demo2.rc b/contrib/samples/fl/fl_demo2.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_demo2.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/fl_fl_demo1.dsp b/contrib/samples/fl/fl_fl_demo1.dsp
deleted file mode 100644
index bf8e2a2e08..0000000000
--- a/contrib/samples/fl/fl_fl_demo1.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_fl_demo1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_demo1 - 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 "fl_fl_demo1.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_fl_demo1.mak" CFG="fl_demo1 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_demo1 - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo1 - 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)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo1 - 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\fl_demo1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fl_demo1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl_demo1 - Win32 DLL Universal Unicode Release"
-# Name "fl_demo1 - Win32 DLL Universal Unicode Debug"
-# Name "fl_demo1 - Win32 DLL Universal Release"
-# Name "fl_demo1 - Win32 DLL Universal Debug"
-# Name "fl_demo1 - Win32 DLL Unicode Release"
-# Name "fl_demo1 - Win32 DLL Unicode Debug"
-# Name "fl_demo1 - Win32 DLL Release"
-# Name "fl_demo1 - Win32 DLL Debug"
-# Name "fl_demo1 - Win32 Universal Unicode Release"
-# Name "fl_demo1 - Win32 Universal Unicode Debug"
-# Name "fl_demo1 - Win32 Universal Release"
-# Name "fl_demo1 - Win32 Universal Debug"
-# Name "fl_demo1 - Win32 Unicode Release"
-# Name "fl_demo1 - Win32 Unicode Debug"
-# Name "fl_demo1 - Win32 Release"
-# Name "fl_demo1 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fl_demo1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fl_demo1.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/fl/fl_fl_demo2.dsp b/contrib/samples/fl/fl_fl_demo2.dsp
deleted file mode 100644
index 3f8da7c3ba..0000000000
--- a/contrib/samples/fl/fl_fl_demo2.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_fl_demo2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_demo2 - 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 "fl_fl_demo2.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_fl_demo2.mak" CFG="fl_demo2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_demo2 - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_demo2 - 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)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_demo2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_demo2 - 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\fl_demo2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fl_demo2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_demo2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl_demo2 - Win32 DLL Universal Unicode Release"
-# Name "fl_demo2 - Win32 DLL Universal Unicode Debug"
-# Name "fl_demo2 - Win32 DLL Universal Release"
-# Name "fl_demo2 - Win32 DLL Universal Debug"
-# Name "fl_demo2 - Win32 DLL Unicode Release"
-# Name "fl_demo2 - Win32 DLL Unicode Debug"
-# Name "fl_demo2 - Win32 DLL Release"
-# Name "fl_demo2 - Win32 DLL Debug"
-# Name "fl_demo2 - Win32 Universal Unicode Release"
-# Name "fl_demo2 - Win32 Universal Unicode Debug"
-# Name "fl_demo2 - Win32 Universal Release"
-# Name "fl_demo2 - Win32 Universal Debug"
-# Name "fl_demo2 - Win32 Unicode Release"
-# Name "fl_demo2 - Win32 Unicode Debug"
-# Name "fl_demo2 - Win32 Release"
-# Name "fl_demo2 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fl_demo2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fl_demo2.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/fl/fl_fl_sample1.dsp b/contrib/samples/fl/fl_fl_sample1.dsp
deleted file mode 100644
index 7633ba10bc..0000000000
--- a/contrib/samples/fl/fl_fl_sample1.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_fl_sample1" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample1 - 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 "fl_fl_sample1.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_fl_sample1.mak" CFG="fl_sample1 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample1 - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample1 - 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)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample1.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample1 - 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\fl_sample1"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fl_sample1"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample1.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl_sample1 - Win32 DLL Universal Unicode Release"
-# Name "fl_sample1 - Win32 DLL Universal Unicode Debug"
-# Name "fl_sample1 - Win32 DLL Universal Release"
-# Name "fl_sample1 - Win32 DLL Universal Debug"
-# Name "fl_sample1 - Win32 DLL Unicode Release"
-# Name "fl_sample1 - Win32 DLL Unicode Debug"
-# Name "fl_sample1 - Win32 DLL Release"
-# Name "fl_sample1 - Win32 DLL Debug"
-# Name "fl_sample1 - Win32 Universal Unicode Release"
-# Name "fl_sample1 - Win32 Universal Unicode Debug"
-# Name "fl_sample1 - Win32 Universal Release"
-# Name "fl_sample1 - Win32 Universal Debug"
-# Name "fl_sample1 - Win32 Unicode Release"
-# Name "fl_sample1 - Win32 Unicode Debug"
-# Name "fl_sample1 - Win32 Release"
-# Name "fl_sample1 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fl_sample1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fl_sample1.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/fl/fl_fl_sample2.dsp b/contrib/samples/fl/fl_fl_sample2.dsp
deleted file mode 100644
index 9b9765775e..0000000000
--- a/contrib/samples/fl/fl_fl_sample2.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_fl_sample2" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample2 - 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 "fl_fl_sample2.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_fl_sample2.mak" CFG="fl_sample2 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample2 - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample2 - 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)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample2.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample2 - 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\fl_sample2"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fl_sample2"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample2.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl_sample2 - Win32 DLL Universal Unicode Release"
-# Name "fl_sample2 - Win32 DLL Universal Unicode Debug"
-# Name "fl_sample2 - Win32 DLL Universal Release"
-# Name "fl_sample2 - Win32 DLL Universal Debug"
-# Name "fl_sample2 - Win32 DLL Unicode Release"
-# Name "fl_sample2 - Win32 DLL Unicode Debug"
-# Name "fl_sample2 - Win32 DLL Release"
-# Name "fl_sample2 - Win32 DLL Debug"
-# Name "fl_sample2 - Win32 Universal Unicode Release"
-# Name "fl_sample2 - Win32 Universal Unicode Debug"
-# Name "fl_sample2 - Win32 Universal Release"
-# Name "fl_sample2 - Win32 Universal Debug"
-# Name "fl_sample2 - Win32 Unicode Release"
-# Name "fl_sample2 - Win32 Unicode Debug"
-# Name "fl_sample2 - Win32 Release"
-# Name "fl_sample2 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fl_sample2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fl_sample2.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/fl/fl_fl_sample3.dsp b/contrib/samples/fl/fl_fl_sample3.dsp
deleted file mode 100644
index ede1b3abce..0000000000
--- a/contrib/samples/fl/fl_fl_sample3.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fl_fl_sample3" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=fl_sample3 - 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 "fl_fl_sample3.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_fl_sample3.mak" CFG="fl_sample3 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fl_sample3 - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "fl_sample3 - 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)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_fl.lib wxmswuniv29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_fl.lib wxmswuniv29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_fl.lib wxmswuniv29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_fl.lib wxmswuniv29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_fl.lib wxmsw29u_core.lib wxbase29u.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_fl.lib wxmsw29ud_core.lib wxbase29ud.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_fl.lib wxmsw29_core.lib wxbase29.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\fl_sample3.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "fl_sample3 - 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\fl_sample3"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fl_sample3"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.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" /D BMP_DIR=\"bitmaps/\" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /D BMP_DIR=\"bitmaps/\" /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" /d BMP_DIR="bitmaps/"
-# 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" /d BMP_DIR="bitmaps/"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_fl.lib wxmsw29d_core.lib wxbase29d.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\fl_sample3.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "fl_sample3 - Win32 DLL Universal Unicode Release"
-# Name "fl_sample3 - Win32 DLL Universal Unicode Debug"
-# Name "fl_sample3 - Win32 DLL Universal Release"
-# Name "fl_sample3 - Win32 DLL Universal Debug"
-# Name "fl_sample3 - Win32 DLL Unicode Release"
-# Name "fl_sample3 - Win32 DLL Unicode Debug"
-# Name "fl_sample3 - Win32 DLL Release"
-# Name "fl_sample3 - Win32 DLL Debug"
-# Name "fl_sample3 - Win32 Universal Unicode Release"
-# Name "fl_sample3 - Win32 Universal Unicode Debug"
-# Name "fl_sample3 - Win32 Universal Release"
-# Name "fl_sample3 - Win32 Universal Debug"
-# Name "fl_sample3 - Win32 Unicode Release"
-# Name "fl_sample3 - Win32 Unicode Debug"
-# Name "fl_sample3 - Win32 Release"
-# Name "fl_sample3 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\fl_sample3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\fl_sample3.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/fl/fl_sample1.cpp b/contrib/samples/fl/fl_sample1.cpp
deleted file mode 100644
index aaa5ae945b..0000000000
--- a/contrib/samples/fl/fl_sample1.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_sample1.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     24/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"
-
-// plugins used
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#define ID_LOAD  102
-#define ID_STORE 103
-#define ID_QUIT  104
-
-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-protected:
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpClientWnd;
-    wxPanel*       mpInternalFrm;
-
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-
-public:
-    MyFrame( wxWindow* parent, const wxChar *title );
-    ~MyFrame();
-
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnQuit( wxCommandEvent& event );
-
-    bool OnClose(void) { return true; }
-
-    DECLARE_EVENT_TABLE()
-};
-
-/***** Implementation for class MyApp *****/
-
-IMPLEMENT_APP    (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    // wxWidgets boiler-plate:
-
-    MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append( ID_LOAD,  _("&Load layout")  );
-    file_menu->Append( ID_STORE, _("&Store layout")  );
-    file_menu->AppendSeparator();
-
-    file_menu->Append( ID_QUIT, _("E&xit") );
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, _("&File"));
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
-    frame->SetMenuBar(menu_bar);
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-/***** Immlementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
-    EVT_MENU( ID_STORE, MyFrame::OnStore )
-    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
-END_EVENT_TABLE()
-
-MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxRESIZE_BORDER   | wxSYSTEM_MENU  | wxCAPTION | wxCLOSE_BOX,
-          wxT("freimas") )
-{
-    mpInternalFrm = (wxPanel*)this;
-
-    mpClientWnd = CreateTextCtrl( _("Client window") );
-
-    // btw, creation of internal frame is needed for wxGtk version
-    // to act correctly (since menu-bar is a separate window there..)
-
-    mpLayout = new wxFrameLayout( mpInternalFrm, mpClientWnd );
-
-#if defined(__WXGTK__) || defined(__WXX11__)
-    // real-time dosn't work well under wxGtk yet
-    cbCommonPaneProperties props;
-    mpLayout->GetPaneProperties( props );
-
-    props.mRealTimeUpdatesOn = false; // off
-
-    mpLayout->SetPaneProperties( props, wxALL_PANES );
-#endif
-
-    mpLayout->PushDefaultPlugins();
-    mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
-    //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-
-    cbDimInfo sizes( 80,65, // when docked horizontally
-                     80,65, // when docked vertically
-                     80,30, // when floated
-                     true,  // the bar is fixed-size
-                     5,     // vertical gap (bar border)
-                     5      // horizontal gap (bar border)
-                   );
-
-    // drop-in 20 bars
-    for( int i = 1; i <= 20; ++i )
-    {
-        wxChar buf[4];
-        wxSprintf( buf, wxT("%d"), i );
-        wxString name = wxString(wxT("Bar-"));
-        name += buf;
-
-        sizes.mIsFixed = i % 5 > 0; // every fifth bar is not fixed-size
-
-        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
-
-        mpLayout->AddBar( CreateTextCtrl(name),// bar window
-                          sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                          0,                   // insert into 0th row (vert. position)
-                          0,                   // offset from the start of row (in pixels)
-                          name                 // name to refere in customization pop-ups
-                        );
-    }
-}
-
-MyFrame::~MyFrame()
-{
-    // layout is not a window, should be released manually
-    if ( mpLayout )
-        delete mpLayout;
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, wxID_ANY, value,
-                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
-
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-
-    return pCtrl;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(wxT("Hey - you found a BIG question-mark !!"));
-}
-
-void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(wxT("Hey - you found another BIG question-mark !!"));
-}
-
-void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
-{
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
-
-    Close(true);
-}
diff --git a/contrib/samples/fl/fl_sample1.rc b/contrib/samples/fl/fl_sample1.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_sample1.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/fl_sample2.cpp b/contrib/samples/fl/fl_sample2.cpp
deleted file mode 100644
index 74c4ede313..0000000000
--- a/contrib/samples/fl/fl_sample2.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_sample2.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     24/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"
-
-// plugins used
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#define ID_LOAD  102
-#define ID_STORE 103
-#define ID_QUIT  104
-
-
-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-protected:
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpClientWnd;
-
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-
-public:
-    MyFrame( wxWindow* parent, const wxChar *title );
-    ~MyFrame();
-
-    void populateMyFrame();
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnQuit( wxCommandEvent& event );
-
-    bool OnClose(void) { return true; }
-
-    DECLARE_EVENT_TABLE()
-};
-
-/***** Implementation for class MyApp *****/
-
-IMPLEMENT_APP    (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    // wxWidgets boiler-plate:
-
-    MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append( ID_LOAD,  _("&Load layout")  );
-    file_menu->Append( ID_STORE, _("&Store layout")  );
-    file_menu->AppendSeparator();
-
-    file_menu->Append( ID_QUIT, _("E&xit") );
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, _("&File"));
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
-    frame->SetMenuBar(menu_bar);
-
-    frame->Show(true);
-    SetTopWindow(frame);
-    frame->populateMyFrame();
-
-    return true;
-}
-
-/***** Immlementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
-    EVT_MENU( ID_STORE, MyFrame::OnStore )
-    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
-END_EVENT_TABLE()
-
-MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxRESIZE_BORDER   | wxSYSTEM_MENU  | wxCAPTION | wxCLOSE_BOX,
-          wxT("freimas") )
-{
-}
-
-void MyFrame::populateMyFrame()
-{
-    mpClientWnd = CreateTextCtrl( _("Client window") );
-
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-
-    ///  mpLayout->PushDefaultPlugins();
-    ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
-    ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-
-    cbDimInfo sizes( 80,65,     // when docked horizontally
-                     80,165,    // when docked vertically
-                     180,30,    // when floated
-                     true,      // the bar is fixed-size
-                     5,         // vertical gap (bar border)
-                     5          // horizontal gap (bar border)
-                   );
-
-    // drop-in 20 bars
-    for( int i = 1; i <= 10; ++i )
-    {
-        wxSleep(1);
-        wxYield(); // CHECK!
-
-        wxChar buf[4];
-        wxSprintf( buf, wxT("%d"), i );
-        wxString name = wxString(wxT("Bar-"));
-        name += buf;
-
-        //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size
-
-        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
-        //      mpLayout->AddBar( CreateTextCtrl(name), // bar window
-        mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name), // bar window
-                          sizes, i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
-                          0,                    // insert into 0th row (vert. position)
-                          0,                    // offset from the start of row (in pixels)
-                          name                  // name to refere in customization pop-ups
-                        );
-
-        mpLayout->RecalcLayout(true);
-
-        // Layout();
-        // Refresh();
-    }
-}
-
-MyFrame::~MyFrame()
-{
-    // layout is not a window, should be released manually
-    if ( mpLayout )
-        delete mpLayout;
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value,
-                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
-
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-
-    return pCtrl;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(wxT("Hey - you found a BIG question-mark !!"));
-}
-
-void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(wxT("Hey - you found another BIG question-mark !!"));
-}
-
-void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
-{
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
-
-    Close(true);
-}
diff --git a/contrib/samples/fl/fl_sample2.rc b/contrib/samples/fl/fl_sample2.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_sample2.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/fl_sample3.cpp b/contrib/samples/fl/fl_sample3.cpp
deleted file mode 100644
index 60816e9503..0000000000
--- a/contrib/samples/fl/fl_sample3.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fl_sample3.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: Sebastian Haase (June 21, 2001)
-// Created:     24/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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/textctrl.h"
-
-// fl headers
-#include "wx/fl/controlbar.h"
-
-// plugins used
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/hintanimpl.h"
-
-#define ID_LOAD  102
-#define ID_STORE 103
-#define ID_QUIT  104
-
-#define ID_BUTT 145
-#define ID_BUTT2 146
-
-class MyApp: public wxApp
-{
-public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-protected:
-    wxFrameLayout* mpLayout;
-    wxWindow*      mpClientWnd;
-
-    wxButton * my_butt;
-
-    wxTextCtrl* CreateTextCtrl( const wxString& value );
-public:
-    MyFrame( wxWindow* parent, const wxChar *title );
-    ~MyFrame();
-
-    void OnLoad( wxCommandEvent& event );
-    void OnStore( wxCommandEvent& event );
-    void OnQuit( wxCommandEvent& event );
-
-    void OnButt( wxCommandEvent& event );
-    void OnButt2( wxCommandEvent& event );
-    bool OnClose(void) { return true; }
-
-    DECLARE_EVENT_TABLE()
-};
-
-/***** Implementation for class MyApp *****/
-
-IMPLEMENT_APP    (MyApp)
-
-bool MyApp::OnInit(void)
-{
-    // wxWidgets boiler-plate:
-
-    MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append( ID_LOAD,  _("&Load layout")  );
-    file_menu->Append( ID_STORE, _("&Store layout")  );
-    file_menu->AppendSeparator();
-
-    file_menu->Append( ID_QUIT, _("E&xit") );
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, _("&File"));
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(3);
-#endif // wxUSE_STATUSBAR
-    frame->SetMenuBar(menu_bar);
-
-    frame->Show(true);
-    SetTopWindow(frame);
-
-    return true;
-}
-
-/***** Immlementation for class MyFrame *****/
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
-    EVT_MENU( ID_STORE, MyFrame::OnStore )
-    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
-    EVT_BUTTON( ID_BUTT, MyFrame::OnButt )
-    EVT_BUTTON( ID_BUTT2, MyFrame::OnButt2 )
-END_EVENT_TABLE()
-
-MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
-    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
-          wxSize( 700, 500 ),
-          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
-          wxRESIZE_BORDER   | wxSYSTEM_MENU  | wxCAPTION | wxCLOSE_BOX,
-          wxT("freimas") )
-{
-
-    mpClientWnd = new wxWindow(this, wxID_ANY);
-    mpLayout = new wxFrameLayout( this, mpClientWnd );
-
-    ///  mpLayout->PushDefaultPlugins();
-    ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
-    ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
-
-    cbDimInfo sizes( 80,65,     // when docked horizontally
-                     80,165,    // when docked vertically
-                     180,30,    // when floated
-                     true,      // the bar is fixed-size
-                     5,         // vertical gap (bar border)
-                     5          // horizontal gap (bar border)
-                   );
-
-
-    // drop-in some bars
-
-    for( int i = 1; i <= 11; ++i )
-    {
-        wxChar buf[4];
-        wxSprintf( buf, wxT("%d"), i );
-        wxString name = wxString(wxT("Bar-"));
-        name += buf;
-
-        sizes.mIsFixed = (i !=3); // every fifth bar is not fixed-size
-
-        if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
-        //      mpLayout->AddBar( CreateTextCtrl(name), // bar window
-        if(i != 4 && i!= 5 && i!=11) {
-            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name), // bar window
-                              sizes,
-                              i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
-                              0,             // insert into 0th row (vert. position)
-                              0,             // offset from the start of row (in pixels)
-                              name           // name to refere in customization pop-ups
-                            );
-        } else if(i==4){
-            mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name), // bar window
-                              cbDimInfo( 100,100, 100,100, 100,100, true, 5, 5),
-                              i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
-                              0,             // insert into 0th row (vert. position)
-                              0,             // offset from the start of row (in pixels)
-                              name           // name to refere in customization pop-ups
-                            );
-        } else if(i==5) {
-            my_butt = new wxButton(this, ID_BUTT, name);
-            mpLayout->AddBar( my_butt,       // bar window
-                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5),
-                              i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
-                              0,             // insert into 0th row (vert. position)
-                              0,             // offset from the start of row (in pixels)
-                              name           // name to refere in customization pop-ups
-                            );
-        } else if(i==11) {
-            mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+wxT("_2")),
-                              cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5),
-                              i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
-                              0,             // insert into 0th row (vert. position)
-                              0,             // offset from the start of row (in pixels)
-                              name           // name to refere in customization pop-ups
-                            );
-        }
-
-        //      mpLayout->RecalcLayout(true);
-        //        Layout();
-        //        Refresh();
-    }
-}
-
-MyFrame::~MyFrame()
-{
-    // layout is not a window, should be released manually
-    if ( mpLayout )
-        delete mpLayout;
-}
-
-wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
-{
-    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value,
-                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
-
-    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
-
-    return pCtrl;
-}
-
-void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("Hey - you found a BIG question-mark !!"));
-}
-
-void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )
-{
-    wxMessageBox(_("Hey - you found another BIG question-mark !!"));
-}
-
-void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
-{
-    Show( false ); // TRICK:: hide it, to avoid flickered destruction
-
-    Close(true);
-}
-
-void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) )
-{
-    static int i =0;
-
-    // cbBarInfo* FindBarByName( const wxString& name );
-
-    switch(i % 2) {
-    case 0:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1")));
-            if(x)
-                mpLayout->InverseVisibility(x);
-            else
-                wxBell();
-            break;
-        }
-    case 1:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-6")));
-            if(x)
-            {
-                if(i % 4 == 1)
-                {
-                    mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
-                    //mpLayout->RecalcLayout(true);
-                    mpLayout->RepositionFloatedBar(x);
-                }
-                else
-                {
-                    mpLayout->SetBarState(x, 0, true);
-                    //mpLayout->RecalcLayout(true);
-                    //mpLayout->RepositionFloatedBar(x);
-                }
-                //  //  //  x->mState = wxCBAR_FLOATING;
-                //  //  //  mpLayout->ApplyBarProperties(x);
-            }
-            else
-            {
-                wxBell();
-            }
-
-            break;
-        }
-    }
-    i++;
-}
-
-void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
-{
-    static int i =0;
-
-    // cbBarInfo* FindBarByName( const wxString& name );
-
-    switch(i % 2) {
-    case 0:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1")));
-            if(x)
-            {
-                for(int a=0;a<MAX_BAR_STATES;a++)
-                {
-                    x->mDimInfo.mSizes[a].x = 200;
-                    x->mDimInfo.mSizes[a].y = 200;
-                }
-                x->mpBarWnd->SetSize(200,200);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
-                mpLayout->SetBarState(x, 0, true);                // HACK !!!
-                wxYield();                                        // HACK !!! needed to resize BEFORE redraw
-                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
-            }
-            else
-            {
-                wxBell();
-            }
-
-            break;
-        }
-    case 1:
-        {
-            cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1")));
-            if(x)
-            {
-                //mpLayout->InverseVisibility(x);
-                for(int a=0;a<MAX_BAR_STATES;a++)
-                {
-                    // see cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
-                    x->mDimInfo.mSizes[a].x = 10 + 2 + 2*x->mDimInfo.mHorizGap;
-                    x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap;
-                }
-                x->mpBarWnd->SetSize(10,10);
-                mpLayout->SetBarState(x, wxCBAR_FLOATING, true);  // HACK !!!
-                mpLayout->SetBarState(x, 0, true);                // HACK !!!
-                wxYield();                                        // HACK !!! needed to resize BEFORE redraw
-                mpLayout->RefreshNow( true );                     // HACK !!! needed to trigger redraw
-
-                // mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
-                // mpLayout->RecalcLayout(true);
-                // mpLayout->RepositionFloatedBar(x);
-                // mpLayout->RecalcLayout(true);
-                // mpLayout->RepositionFloatedBar(x);
-                // mpLayout->SetBarState(x, 0, true);
-                // wxYield();
-                // mpLayout->RefreshNow( true );
-                // mpLayout->RecalcLayout(true);
-            }
-            else
-            {
-                wxBell();
-            }
-
-            break;
-        }
-    }
-    i++;
-}
diff --git a/contrib/samples/fl/fl_sample3.rc b/contrib/samples/fl/fl_sample3.rc
deleted file mode 100644
index 626b82f58a..0000000000
--- a/contrib/samples/fl/fl_sample3.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-/* mondrian ICON "mondrian.ico" */
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/fl/makefile.bcc b/contrib/samples/fl/makefile.bcc
deleted file mode 100644
index 3324af66c6..0000000000
--- a/contrib/samples/fl/makefile.bcc
+++ /dev/null
@@ -1,343 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -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 -DBMP_DIR=\"bitmaps/\" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO1_OBJECTS =  \
-	$(OBJS)\fl_demo1_fl_demo1.obj
-FL_DEMO2_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -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 -DBMP_DIR=\"bitmaps/\" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO2_OBJECTS =  \
-	$(OBJS)\fl_demo2_fl_demo2.obj
-FL_SAMPLE1_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -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 -DBMP_DIR=\"bitmaps/\" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS =  \
-	$(OBJS)\fl_sample1_fl_sample1.obj
-FL_SAMPLE2_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -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 -DBMP_DIR=\"bitmaps/\" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS =  \
-	$(OBJS)\fl_sample2_fl_sample2.obj
-FL_SAMPLE3_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) $(__THREADSFLAG_7) -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 -DBMP_DIR=\"bitmaps/\" \
-	$(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS =  \
-	$(OBJS)\fl_sample3_fl_sample3.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 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_3 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_3 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_12 = -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_12 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_12 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_12 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_12 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_12 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_12 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_12 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_12 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_12 = -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)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-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)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
-	-if exist $(OBJS)\fl_demo1.tds del $(OBJS)\fl_demo1.tds
-	-if exist $(OBJS)\fl_demo1.ilc del $(OBJS)\fl_demo1.ilc
-	-if exist $(OBJS)\fl_demo1.ild del $(OBJS)\fl_demo1.ild
-	-if exist $(OBJS)\fl_demo1.ilf del $(OBJS)\fl_demo1.ilf
-	-if exist $(OBJS)\fl_demo1.ils del $(OBJS)\fl_demo1.ils
-	-if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
-	-if exist $(OBJS)\fl_demo2.tds del $(OBJS)\fl_demo2.tds
-	-if exist $(OBJS)\fl_demo2.ilc del $(OBJS)\fl_demo2.ilc
-	-if exist $(OBJS)\fl_demo2.ild del $(OBJS)\fl_demo2.ild
-	-if exist $(OBJS)\fl_demo2.ilf del $(OBJS)\fl_demo2.ilf
-	-if exist $(OBJS)\fl_demo2.ils del $(OBJS)\fl_demo2.ils
-	-if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
-	-if exist $(OBJS)\fl_sample1.tds del $(OBJS)\fl_sample1.tds
-	-if exist $(OBJS)\fl_sample1.ilc del $(OBJS)\fl_sample1.ilc
-	-if exist $(OBJS)\fl_sample1.ild del $(OBJS)\fl_sample1.ild
-	-if exist $(OBJS)\fl_sample1.ilf del $(OBJS)\fl_sample1.ilf
-	-if exist $(OBJS)\fl_sample1.ils del $(OBJS)\fl_sample1.ils
-	-if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
-	-if exist $(OBJS)\fl_sample2.tds del $(OBJS)\fl_sample2.tds
-	-if exist $(OBJS)\fl_sample2.ilc del $(OBJS)\fl_sample2.ilc
-	-if exist $(OBJS)\fl_sample2.ild del $(OBJS)\fl_sample2.ild
-	-if exist $(OBJS)\fl_sample2.ilf del $(OBJS)\fl_sample2.ilf
-	-if exist $(OBJS)\fl_sample2.ils del $(OBJS)\fl_sample2.ils
-	-if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-	-if exist $(OBJS)\fl_sample3.tds del $(OBJS)\fl_sample3.tds
-	-if exist $(OBJS)\fl_sample3.ilc del $(OBJS)\fl_sample3.ilc
-	-if exist $(OBJS)\fl_sample3.ild del $(OBJS)\fl_sample3.ild
-	-if exist $(OBJS)\fl_sample3.ilf del $(OBJS)\fl_sample3.ilf
-	-if exist $(OBJS)\fl_sample3.ils del $(OBJS)\fl_sample3.ils
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS)  $(OBJS)\fl_demo1_fl_demo1.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo1_fl_demo1.res
-|
-
-$(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS)  $(OBJS)\fl_demo2_fl_demo2.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo2_fl_demo2.res
-|
-
-$(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS)  $(OBJS)\fl_sample1_fl_sample1.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample1_fl_sample1.res
-|
-
-$(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS)  $(OBJS)\fl_sample2_fl_sample2.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample2_fl_sample2.res
-|
-
-$(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS)  $(OBJS)\fl_sample3_fl_sample3.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample3_fl_sample3.res
-|
-
-data_files: 
-	if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
-	for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
-	$(CXX) -q -c -P -o$@ $(FL_DEMO1_CXXFLAGS) $**
-
-$(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
-	$(CXX) -q -c -P -o$@ $(FL_DEMO2_CXXFLAGS) $**
-
-$(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
-	$(CXX) -q -c -P -o$@ $(FL_SAMPLE1_CXXFLAGS) $**
-
-$(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
-	$(CXX) -q -c -P -o$@ $(FL_SAMPLE2_CXXFLAGS) $**
-
-$(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
-	$(CXX) -q -c -P -o$@ $(FL_SAMPLE3_CXXFLAGS) $**
-
-$(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_12) -i.\..\..\..\samples -dNOPCH -i.\..\..\include -dBMP_DIR="bitmaps/" $**
-
diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc
deleted file mode 100644
index d91c9fe816..0000000000
--- a/contrib/samples/fl/makefile.gcc
+++ /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.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 \
-	-DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO1_OBJECTS =  \
-	$(OBJS)\fl_demo1_fl_demo1.o \
-	$(OBJS)\fl_demo1_fl_demo1_rc.o
-FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 \
-	-DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_DEMO2_OBJECTS =  \
-	$(OBJS)\fl_demo2_fl_demo2.o \
-	$(OBJS)\fl_demo2_fl_demo2_rc.o
-FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 \
-	-DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE1_OBJECTS =  \
-	$(OBJS)\fl_sample1_fl_sample1.o \
-	$(OBJS)\fl_sample1_fl_sample1_rc.o
-FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 \
-	-DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE2_OBJECTS =  \
-	$(OBJS)\fl_sample2_fl_sample2.o \
-	$(OBJS)\fl_sample2_fl_sample2_rc.o
-FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 \
-	-DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-FL_SAMPLE3_OBJECTS =  \
-	$(OBJS)\fl_sample3_fl_sample3.o \
-	$(OBJS)\fl_sample3_fl_sample3_rc.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 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_12 = --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_12 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_12 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_12 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_12 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_12 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_12 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_12 = --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_12 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_12 = --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)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
-	-if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
-	-if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
-	-if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
-	-if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1_rc.o
-	$(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl  $(__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)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2_rc.o
-	$(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl  $(__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)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1_rc.o
-	$(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl  $(__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)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2_rc.o
-	$(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl  $(__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)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3_rc.o
-	$(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl  $(__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_files: 
-	if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
-	for %%f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.o: ./fl_demo1.cpp
-	$(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_demo1_fl_demo1_rc.o: ./fl_demo1.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_demo2_fl_demo2.o: ./fl_demo2.cpp
-	$(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_demo2_fl_demo2_rc.o: ./fl_demo2.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample1_fl_sample1.o: ./fl_sample1.cpp
-	$(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample1_fl_sample1_rc.o: ./fl_sample1.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample2_fl_sample2.o: ./fl_sample2.cpp
-	$(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample2_fl_sample2_rc.o: ./fl_sample2.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-$(OBJS)\fl_sample3_fl_sample3.o: ./fl_sample3.cpp
-	$(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\fl_sample3_fl_sample3_rc.o: ./fl_sample3.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
-
-.PHONY: all clean data_files
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/fl/makefile.vc b/contrib/samples/fl/makefile.vc
deleted file mode 100644
index 598cd9e64b..0000000000
--- a/contrib/samples/fl/makefile.vc
+++ /dev/null
@@ -1,442 +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 = 29
-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)
-FL_DEMO1_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO) /Fd$(OBJS)\fl_demo1.pdb $(____DEBUGRUNTIME) \
-	$(__OPTIMIZEFLAG) $(__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 \
-	/DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-	$(CXXFLAGS)
-FL_DEMO1_OBJECTS =  \
-	$(OBJS)\fl_demo1_fl_demo1.obj \
-	$(OBJS)\fl_demo1_fl_demo1.res
-FL_DEMO2_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO) /Fd$(OBJS)\fl_demo2.pdb $(____DEBUGRUNTIME) \
-	$(__OPTIMIZEFLAG) $(__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 \
-	/DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-	$(CXXFLAGS)
-FL_DEMO2_OBJECTS =  \
-	$(OBJS)\fl_demo2_fl_demo2.obj \
-	$(OBJS)\fl_demo2_fl_demo2.res
-FL_SAMPLE1_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO) /Fd$(OBJS)\fl_sample1.pdb $(____DEBUGRUNTIME) \
-	$(__OPTIMIZEFLAG) $(__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 \
-	/DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-	$(CXXFLAGS)
-FL_SAMPLE1_OBJECTS =  \
-	$(OBJS)\fl_sample1_fl_sample1.obj \
-	$(OBJS)\fl_sample1_fl_sample1.res
-FL_SAMPLE2_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO) /Fd$(OBJS)\fl_sample2.pdb $(____DEBUGRUNTIME) \
-	$(__OPTIMIZEFLAG) $(__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 \
-	/DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-	$(CXXFLAGS)
-FL_SAMPLE2_OBJECTS =  \
-	$(OBJS)\fl_sample2_fl_sample2.obj \
-	$(OBJS)\fl_sample2_fl_sample2.res
-FL_SAMPLE3_CXXFLAGS = /M$(__RUNTIME_LIBS_64)$(__DEBUGRUNTIME) /DWIN32 \
-	$(__DEBUGINFO) /Fd$(OBJS)\fl_sample3.pdb $(____DEBUGRUNTIME) \
-	$(__OPTIMIZEFLAG) $(__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 \
-	/DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
-	$(CXXFLAGS)
-FL_SAMPLE3_OBJECTS =  \
-	$(OBJS)\fl_sample3_fl_sample3.obj \
-	$(OBJS)\fl_sample3_fl_sample3.res
-
-### 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 "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_22 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_22 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_36 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_36 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_50 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_50 = $(__THREADSFLAG)
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_64 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_64 = $(__THREADSFLAG)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_4 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_4 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3 = /d _DEBUG
-!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 _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG = T
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG = /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_12 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_12 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_12 = /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_12 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_12 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_12 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_12 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_12 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_12 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_12 = /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_12 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_12 = /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)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-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)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
-	-if exist $(OBJS)\fl_demo1.ilk del $(OBJS)\fl_demo1.ilk
-	-if exist $(OBJS)\fl_demo1.pdb del $(OBJS)\fl_demo1.pdb
-	-if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
-	-if exist $(OBJS)\fl_demo2.ilk del $(OBJS)\fl_demo2.ilk
-	-if exist $(OBJS)\fl_demo2.pdb del $(OBJS)\fl_demo2.pdb
-	-if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
-	-if exist $(OBJS)\fl_sample1.ilk del $(OBJS)\fl_sample1.ilk
-	-if exist $(OBJS)\fl_sample1.pdb del $(OBJS)\fl_sample1.pdb
-	-if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
-	-if exist $(OBJS)\fl_sample2.ilk del $(OBJS)\fl_sample2.ilk
-	-if exist $(OBJS)\fl_sample2.pdb del $(OBJS)\fl_sample2.pdb
-	-if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-	-if exist $(OBJS)\fl_sample3.ilk del $(OBJS)\fl_sample3.ilk
-	-if exist $(OBJS)\fl_sample3.pdb del $(OBJS)\fl_sample3.pdb
-
-$(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FL_DEMO1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FL_DEMO2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FL_SAMPLE1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FL_SAMPLE2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FL_SAMPLE3_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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_files: 
-	if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
-	for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO1_CXXFLAGS) $**
-
-$(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO2_CXXFLAGS) $**
-
-$(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE1_CXXFLAGS) $**
-
-$(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE2_CXXFLAGS) $**
-
-$(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
-$(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE3_CXXFLAGS) $**
-
-$(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3) $(__NO_VC_CRTDBG_p_12)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) $(__GFXCTX_DEFINE_p_12) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_12) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include /d BMP_DIR="bitmaps/" $**
-
diff --git a/contrib/samples/fl/makefile.wat b/contrib/samples/fl/makefile.wat
deleted file mode 100644
index 2d5313a39c..0000000000
--- a/contrib/samples/fl/makefile.wat
+++ /dev/null
@@ -1,383 +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 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO = -d2
-!endif
-__DEBUGINFO_4 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_4 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_4 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_4 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_4 = debug all
-!endif
-__OPTIMIZEFLAG =
-!ifeq BUILD debug
-__OPTIMIZEFLAG = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG = -ot -ox
-!endif
-__THREADSFLAG =
-!ifeq USE_THREADS 0
-__THREADSFLAG = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG = -bm
-!endif
-__RUNTIME_LIBS =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS = 
-!endif
-__RTTIFLAG =
-!ifeq USE_RTTI 0
-__RTTIFLAG = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG = -xr
-!endif
-__EXCEPTIONSFLAG =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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 &
-	-dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FL_DEMO1_OBJECTS =  &
-	$(OBJS)\fl_demo1_fl_demo1.obj
-FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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 &
-	-dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FL_DEMO2_OBJECTS =  &
-	$(OBJS)\fl_demo2_fl_demo2.obj
-FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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 &
-	-dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FL_SAMPLE1_OBJECTS =  &
-	$(OBJS)\fl_sample1_fl_sample1.obj
-FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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 &
-	-dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FL_SAMPLE2_OBJECTS =  &
-	$(OBJS)\fl_sample2_fl_sample2.obj
-FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-	$(__RUNTIME_LIBS) -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 &
-	-dBMP_DIR="bitmaps/" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
-FL_SAMPLE3_OBJECTS =  &
-	$(OBJS)\fl_sample3_fl_sample3.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
-
-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)\fl_demo1.exe del $(OBJS)\fl_demo1.exe
-	-if exist $(OBJS)\fl_demo2.exe del $(OBJS)\fl_demo2.exe
-	-if exist $(OBJS)\fl_sample1.exe del $(OBJS)\fl_sample1.exe
-	-if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
-	-if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
-
-$(OBJS)\fl_demo1.exe :  $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
-	@%create $(OBJS)\fl_demo1.lbc
-	@%append $(OBJS)\fl_demo1.lbc option quiet
-	@%append $(OBJS)\fl_demo1.lbc name $^@
-	@%append $(OBJS)\fl_demo1.lbc option caseexact
-	@%append $(OBJS)\fl_demo1.lbc $(LDFLAGS) $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FL_DEMO1_OBJECTS)) do @%append $(OBJS)\fl_demo1.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_demo1.lbc library %i
-	@%append $(OBJS)\fl_demo1.lbc option resource=$(OBJS)\fl_demo1_fl_demo1.res
-	@for %i in () do @%append $(OBJS)\fl_demo1.lbc option stack=%i
-	wlink @$(OBJS)\fl_demo1.lbc
-
-$(OBJS)\fl_demo2.exe :  $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
-	@%create $(OBJS)\fl_demo2.lbc
-	@%append $(OBJS)\fl_demo2.lbc option quiet
-	@%append $(OBJS)\fl_demo2.lbc name $^@
-	@%append $(OBJS)\fl_demo2.lbc option caseexact
-	@%append $(OBJS)\fl_demo2.lbc $(LDFLAGS) $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FL_DEMO2_OBJECTS)) do @%append $(OBJS)\fl_demo2.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_demo2.lbc library %i
-	@%append $(OBJS)\fl_demo2.lbc option resource=$(OBJS)\fl_demo2_fl_demo2.res
-	@for %i in () do @%append $(OBJS)\fl_demo2.lbc option stack=%i
-	wlink @$(OBJS)\fl_demo2.lbc
-
-$(OBJS)\fl_sample1.exe :  $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
-	@%create $(OBJS)\fl_sample1.lbc
-	@%append $(OBJS)\fl_sample1.lbc option quiet
-	@%append $(OBJS)\fl_sample1.lbc name $^@
-	@%append $(OBJS)\fl_sample1.lbc option caseexact
-	@%append $(OBJS)\fl_sample1.lbc $(LDFLAGS) $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FL_SAMPLE1_OBJECTS)) do @%append $(OBJS)\fl_sample1.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample1.lbc library %i
-	@%append $(OBJS)\fl_sample1.lbc option resource=$(OBJS)\fl_sample1_fl_sample1.res
-	@for %i in () do @%append $(OBJS)\fl_sample1.lbc option stack=%i
-	wlink @$(OBJS)\fl_sample1.lbc
-
-$(OBJS)\fl_sample2.exe :  $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
-	@%create $(OBJS)\fl_sample2.lbc
-	@%append $(OBJS)\fl_sample2.lbc option quiet
-	@%append $(OBJS)\fl_sample2.lbc name $^@
-	@%append $(OBJS)\fl_sample2.lbc option caseexact
-	@%append $(OBJS)\fl_sample2.lbc $(LDFLAGS) $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FL_SAMPLE2_OBJECTS)) do @%append $(OBJS)\fl_sample2.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample2.lbc library %i
-	@%append $(OBJS)\fl_sample2.lbc option resource=$(OBJS)\fl_sample2_fl_sample2.res
-	@for %i in () do @%append $(OBJS)\fl_sample2.lbc option stack=%i
-	wlink @$(OBJS)\fl_sample2.lbc
-
-$(OBJS)\fl_sample3.exe :  $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
-	@%create $(OBJS)\fl_sample3.lbc
-	@%append $(OBJS)\fl_sample3.lbc option quiet
-	@%append $(OBJS)\fl_sample3.lbc name $^@
-	@%append $(OBJS)\fl_sample3.lbc option caseexact
-	@%append $(OBJS)\fl_sample3.lbc $(LDFLAGS) $(__DEBUGINFO_4)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FL_SAMPLE3_OBJECTS)) do @%append $(OBJS)\fl_sample3.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.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)\fl_sample3.lbc library %i
-	@%append $(OBJS)\fl_sample3.lbc option resource=$(OBJS)\fl_sample3_fl_sample3.res
-	@for %i in () do @%append $(OBJS)\fl_sample3.lbc option stack=%i
-	wlink @$(OBJS)\fl_sample3.lbc
-
-data_files : .SYMBOLIC 
-	if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
-	for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
-
-$(OBJS)\fl_demo1_fl_demo1.obj :  .AUTODEPEND .\fl_demo1.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $<
-
-$(OBJS)\fl_demo1_fl_demo1.res :  .AUTODEPEND .\fl_demo1.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 -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_demo2_fl_demo2.obj :  .AUTODEPEND .\fl_demo2.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $<
-
-$(OBJS)\fl_demo2_fl_demo2.res :  .AUTODEPEND .\fl_demo2.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 -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample1_fl_sample1.obj :  .AUTODEPEND .\fl_sample1.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $<
-
-$(OBJS)\fl_sample1_fl_sample1.res :  .AUTODEPEND .\fl_sample1.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 -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample2_fl_sample2.obj :  .AUTODEPEND .\fl_sample2.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $<
-
-$(OBJS)\fl_sample2_fl_sample2.res :  .AUTODEPEND .\fl_sample2.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 -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
-$(OBJS)\fl_sample3_fl_sample3.obj :  .AUTODEPEND .\fl_sample3.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $<
-
-$(OBJS)\fl_sample3_fl_sample3.res :  .AUTODEPEND .\fl_sample3.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 -dNOPCH -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
-
diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in
deleted file mode 100644
index 314e8e0a46..0000000000
--- a/contrib/samples/foldbar/extended/Makefile.in
+++ /dev/null
@@ -1,207 +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_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-EXTENDED_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)
-EXTENDED_OBJECTS =  \
-	$(__extended_os2_lib_res) \
-	extended_extended.o \
-	$(__extended___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@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@__extended___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C extended$(EXEEXT)
-@COND_PLATFORM_MAC_1@__extended___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___extended___os2_emxbindcmd = $(NM) extended$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep extended$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__extended___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___extended___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_OS2_1@__extended_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__extended_bundle___depname = extended_bundle
-@COND_TOOLKIT_COCOA@____extended_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	extended.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____extended_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	extended.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-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@__extended___win32rc = extended_extended_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 = $(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 extended$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: extended$(EXEEXT) $(__extended_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f extended$(EXEEXT)
-	rm -rf extended.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc)
-	$(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
-	$(__extended___mac_rezcmd)
-	$(__extended___mac_setfilecmd)
-	$(__extended___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p extended.app/Contents
-	mkdir -p extended.app/Contents/MacOS
-	mkdir -p extended.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/extended/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >extended.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >extended.app/Contents/PkgInfo
-	
-	
-	ln -f extended$(EXEEXT) extended.app/Contents/MacOS/extended
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns extended.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@extended_bundle: $(____extended_BUNDLE_TGT_REF_DEP)
-
-extended_extended.o: $(srcdir)/extended.cpp
-	$(CXXC) -c -o $@ $(EXTENDED_CXXFLAGS) $(srcdir)/extended.cpp
-
-extended_extended_rc.o: $(srcdir)/extended.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean extended_bundle
diff --git a/contrib/samples/foldbar/extended/extended.bkl b/contrib/samples/foldbar/extended/extended.bkl
deleted file mode 100644
index 8eb0558884..0000000000
--- a/contrib/samples/foldbar/extended/extended.bkl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="extended" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            extended.cpp
-        </sources>
-        <contrib-lib>foldbar</contrib-lib>
-        <wx-lib>adv</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>extended.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/foldbar/extended/extended.cpp b/contrib/samples/foldbar/extended/extended.cpp
deleted file mode 100644
index 9151d06f9f..0000000000
--- a/contrib/samples/foldbar/extended/extended.cpp
+++ /dev/null
@@ -1,540 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        expended.cpp
-// Purpose:     Layout/foldpanelbar sample
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     24/07/2004
-// Copyright:   (c) Jorgen Bodde based upon FoldPanelBarTest (c) Julian Smart
-// 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"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/laywin.h"
-#include "wx/spinctrl.h"
-#include "wx/slider.h"
-
-#include "sample.xpm"
-
-#include "extended.h"
-
-MyFrame *frame = NULL;
-wxList my_children;
-
-IMPLEMENT_APP(MyApp)
-
-// For drawing lines in a canvas
-long xpos = -1;
-long ypos = -1;
-
-int winNumber = 1;
-
-// Initialise this in OnInit, not statically
-bool MyApp::OnInit(void)
-{
-    // Create the main frame window
-
-    frame = new MyFrame(NULL, wxID_ANY, _T("FoldPanelBar Extended Demo"), wxDefaultPosition, wxSize(500, 600),
-                        wxDEFAULT_FRAME_STYLE |
-                        wxNO_FULL_REPAINT_ON_RESIZE |
-                        wxHSCROLL | wxVSCROLL);
-
-    frame->SetIcon(wxIcon(sample_xpm));
-
-    // Associate the menu bar with the frame
-    frame->SetMenuBar(CreateMenuBar(false));
-
-    frame->CreateStatusBar();
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
-    EVT_MENU(FPBTEST_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(FPBTEST_NEW_WINDOW, MyFrame::OnNewWindow)
-    EVT_SIZE(MyFrame::OnSize)
-    EVT_MENU(FPBTEST_QUIT, MyFrame::OnQuit)
-    EVT_MENU(FPBTEST_TOGGLE_WINDOW, MyFrame::OnToggleWindow)
-    EVT_SASH_DRAGGED_RANGE(ID_WINDOW_TOP, ID_WINDOW_BOTTOM, MyFrame::OnFoldPanelBarDrag)
-    EVT_MENU(FPB_BOTTOM_STICK, MyFrame::OnCreateBottomStyle)
-    EVT_MENU(FPB_SINGLE_FOLD, MyFrame::OnCreateNormalStyle)
-    EVT_BUTTON(ID_COLLAPSEME, MyFrame::OnCollapseMe)
-    EVT_BUTTON(ID_APPLYTOALL, MyFrame::OnExpandMe)
-    EVT_SCROLL(MyFrame::OnSlideColour)
-    EVT_RADIOBUTTON(ID_USE_HGRADIENT, MyFrame::OnStyleChange)
-    EVT_RADIOBUTTON(ID_USE_VGRADIENT, MyFrame::OnStyleChange)
-    EVT_RADIOBUTTON(ID_USE_SINGLE, MyFrame::OnStyleChange)
-    EVT_RADIOBUTTON(ID_USE_RECTANGLE, MyFrame::OnStyleChange)
-    EVT_RADIOBUTTON(ID_USE_FILLED_RECTANGLE, MyFrame::OnStyleChange)
-END_EVENT_TABLE()
-
-
-// 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)
-  , m_flags(0)
-{
-    m_leftWindow1 = new wxSashLayoutWindow(this, ID_WINDOW_LEFT1,
-                                wxDefaultPosition, wxSize(200, 30),
-                                wxNO_BORDER | wxSW_3D | wxCLIP_CHILDREN);
-
-    m_leftWindow1->SetDefaultSize(wxSize(160, 1000));
-    m_leftWindow1->SetOrientation(wxLAYOUT_VERTICAL);
-    m_leftWindow1->SetAlignment(wxLAYOUT_LEFT);
-    m_leftWindow1->SetSashVisible(wxSASH_RIGHT, true);
-    m_leftWindow1->SetExtraBorderSize(0);
-
-    m_pnl = NULL;
-    ReCreateFoldPanel(0);
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    (void)wxMessageBox(_T("wxWidgets 2.0 FoldPanelBar Demo\nAuthor: Julian Smart (c) 1998"), _T("About FoldPanelBar Demo"));
-}
-
-void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
-{
-    m_leftWindow1->Show(!m_leftWindow1->IsShown());
-#if wxUSE_MDI_ARCHITECTURE
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-}
-
-void MyFrame::OnFoldPanelBarDrag(wxSashEvent& event)
-{
-    if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
-        return;
-
-    if(event.GetId() == ID_WINDOW_LEFT1)
-        m_leftWindow1->SetDefaultSize(wxSize(event.GetDragRect().width, 1000));
-
-#if wxUSE_MDI_ARCHITECTURE
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-
-    // Leaves bits of itself behind sometimes
-    GetClientWindow()->Refresh();
-}
-
-void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
-{
-    // Make another frame, containing a canvas
-    MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
-                                    wxPoint(10, 10), wxSize(300, 300),
-                                    wxDEFAULT_FRAME_STYLE |
-                                    wxNO_FULL_REPAINT_ON_RESIZE);
-
-    subframe->SetTitle(wxString::Format(_T("Canvas Frame %d"), winNumber));
-    winNumber ++;
-
-    // Give it a status line
-    subframe->CreateStatusBar();
-
-    // Associate the menu bar with the frame
-    subframe->SetMenuBar(CreateMenuBar(true));
-
-    int width, height;
-    subframe->GetClientSize(&width, &height);
-    MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
-    canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
-    subframe->canvas = canvas;
-
-    // Give it scrollbars
-    canvas->SetScrollbars(20, 20, 50, 50);
-
-    subframe->Show(true);
-}
-
-void MyFrame::ReCreateFoldPanel(int fpb_flags)
-{
-    // delete earlier panel
-    m_leftWindow1->DestroyChildren();
-
-    // recreate the foldpanelbar
-
-    m_pnl = new wxFoldPanelBar(m_leftWindow1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFPB_DEFAULT_STYLE, fpb_flags);
-
-    wxFoldPanel item = m_pnl->AddFoldPanel(_T("Caption colours"), false);
-
-    m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Adjust the first colour")),
-                              wxFPB_ALIGN_WIDTH, 5, 20);
-
-    // RED color spin control
-    m_rslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_rslider1, wxFPB_ALIGN_WIDTH,
-                              2, 20);
-
-    // GREEN color spin control
-    m_gslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_gslider1, wxFPB_ALIGN_WIDTH,
-                              0, 20);
-
-    // BLUE color spin control
-    m_bslider1 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_bslider1, wxFPB_ALIGN_WIDTH,
-                              0, 20);
-
-    m_pnl->AddFoldPanelSeperator(item);
-
-    m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Adjust the second colour")),
-                              wxFPB_ALIGN_WIDTH, 5, 20);
-
-    // RED color spin control
-    m_rslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_rslider2, wxFPB_ALIGN_WIDTH,
-                              2, 20);
-
-    // GREEN color spin control
-    m_gslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_gslider2, wxFPB_ALIGN_WIDTH,
-                              0, 20);
-
-    // BLUE color spin control
-    m_bslider2 = new wxSlider(item.GetParent(), wxID_ANY, 0, 0, 255);
-    m_pnl->AddFoldPanelWindow(item, m_bslider2, wxFPB_ALIGN_WIDTH,
-                              0, 20);
-
-    m_pnl->AddFoldPanelSeperator(item);
-
-    m_btn = new wxButton(item.GetParent(), ID_APPLYTOALL, _T("Apply to all"));
-    m_pnl->AddFoldPanelWindow(item, m_btn);
-
-    // read back current gradients and set the sliders
-    // for the colour which is now taken as default
-
-    wxCaptionBarStyle style = m_pnl->GetCaptionStyle(item);
-    wxColour col = style.GetFirstColour();
-    m_rslider1->SetValue(col.Red());
-    m_gslider1->SetValue(col.Green());
-    m_bslider1->SetValue(col.Blue());
-
-    col = style.GetSecondColour();
-    m_rslider2->SetValue(col.Red());
-    m_gslider2->SetValue(col.Green());
-    m_bslider2->SetValue(col.Blue());
-
-    // put down some caption styles from which the user can
-    // select to show how the current or all caption bars will look like
-
-    item = m_pnl->AddFoldPanel(_T("Caption style"), false);
-
-    wxRadioButton *currStyle =  new wxRadioButton(item.GetParent(), ID_USE_VGRADIENT, _T("&Vertical gradient"));
-    m_pnl->AddFoldPanelWindow(item, currStyle,  wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-    currStyle->SetValue(true);
-
-    m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_HGRADIENT, _T("&Horizontal gradient")),
-                              wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-    m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_SINGLE, _T("&Single colour")),
-                              wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-    m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_RECTANGLE, _T("&Rectangle box")),
-                              wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-    m_pnl->AddFoldPanelWindow(item, new wxRadioButton(item.GetParent(), ID_USE_FILLED_RECTANGLE, _T("&Filled rectangle box")),
-                              wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
-    m_pnl->AddFoldPanelSeperator(item);
-
-    m_single = new wxCheckBox(item.GetParent(), wxID_ANY, _T("&Only this caption"));
-    m_pnl->AddFoldPanelWindow(item, m_single, wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
-
-    // one more panel to finish it
-
-    wxCaptionBarStyle cs;
-    cs.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
-
-    item = m_pnl->AddFoldPanel(_T("Misc stuff"), true, cs);
-
-    m_pnl->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, _T("Collapse All")));
-
-    m_pnl->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Enter some comments")),
-                             wxFPB_ALIGN_WIDTH, 5, 20);
-
-    m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comments")),
-                             wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 10);
-
-    m_leftWindow1->SizeWindows();
-
-}
-
-void MyFrame::OnCreateBottomStyle(wxCommandEvent& event)
-{
-    // recreate with style collapse to bottom, which means
-    // all panels that are collapsed are placed at the bottom,
-    // or normal
-
-    if(event.IsChecked())
-        m_flags |= wxFPB_COLLAPSE_TO_BOTTOM;
-    else
-        m_flags &= ~wxFPB_COLLAPSE_TO_BOTTOM;
-
-    ReCreateFoldPanel(m_flags);
-}
-
-void MyFrame::OnCreateNormalStyle(wxCommandEvent& event)
-{
-    // receate with style where only one panel at the time is
-    // allowed to be opened
-
-    // TODO: Not yet implemented!
-
-    if(event.IsChecked())
-        m_flags |= wxFPB_SINGLE_FOLD;
-    else
-        m_flags &= ~wxFPB_SINGLE_FOLD;
-
-    ReCreateFoldPanel(m_flags);
-}
-
-void MyFrame::OnCollapseMe(wxCommandEvent &WXUNUSED(event))
-{
-    wxFoldPanel item(0);
-    for(size_t i = 0; i < m_pnl->GetCount(); i++)
-    {
-        item = m_pnl->Item(i);
-        m_pnl->Collapse(item);
-    }
-}
-
-void MyFrame::OnExpandMe(wxCommandEvent &WXUNUSED(event))
-{
-    wxColour col1((unsigned char)m_rslider1->GetValue(),
-                  (unsigned char)m_gslider1->GetValue(),
-                  (unsigned char)m_bslider1->GetValue()),
-             col2((unsigned char)m_rslider2->GetValue(),
-                  (unsigned char)m_gslider2->GetValue(),
-                  (unsigned char)m_bslider2->GetValue());
-
-    wxCaptionBarStyle style;
-
-    style.SetFirstColour(col1);
-    style.SetSecondColour(col2);
-
-    m_pnl->ApplyCaptionStyleAll(style);
-}
-
-wxMenuBar *CreateMenuBar(bool with_window)
-{
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(FPBTEST_NEW_WINDOW, _T("&New window"));
-    if(with_window)
-        file_menu->Append(FPBTEST_CHILD_QUIT, _T("&Close child"));
-
-    file_menu->AppendSeparator();
-    file_menu->Append(FPBTEST_QUIT, _T("&Exit"));
-
-    wxMenu *option_menu = 0;
-    if(with_window)
-    {
-        // Dummy option
-        option_menu = new wxMenu;
-        option_menu->Append(FPBTEST_REFRESH, _T("&Refresh picture"));
-    }
-
-    // make fold panel menu
-
-    wxMenu *fpb_menu = new wxMenu;
-    fpb_menu->AppendCheckItem(FPB_BOTTOM_STICK, _T("Create with &wxFPB_COLLAPSE_TO_BOTTOM"));
-    //fpb_menu->AppendCheckItem(FPB_SINGLE_FOLD, _T("Create with &wxFPB_SINGLE_FOLD"));
-
-    fpb_menu->AppendSeparator();
-    fpb_menu->Append(FPBTEST_TOGGLE_WINDOW, _T("&Toggle FoldPanelBar"));
-
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append(FPBTEST_ABOUT, _T("&About"));
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, _T("&File"));
-    menu_bar->Append(fpb_menu, _T("&FoldPanel"));
-    if(option_menu)
-        menu_bar->Append(option_menu, _T("&Options"));
-    menu_bar->Append(help_menu, _T("&Help"));
-
-    return menu_bar;
-}
-
-void MyFrame::OnSlideColour(wxScrollEvent &WXUNUSED(event))
-{
-    wxColour col1((unsigned char)m_rslider1->GetValue(),
-                  (unsigned char)m_gslider1->GetValue(),
-                  (unsigned char)m_bslider1->GetValue()),
-             col2((unsigned char)m_rslider2->GetValue(),
-                  (unsigned char)m_gslider2->GetValue(),
-                  (unsigned char)m_bslider2->GetValue());
-    //m_btn->SetBackgroundColour(col);
-
-    wxCaptionBarStyle style;
-
-    style.SetFirstColour(col1);
-    style.SetSecondColour(col2);
-
-    wxFoldPanel item = m_pnl->Item(0);
-    m_pnl->ApplyCaptionStyle(item, style);
-}
-
-void MyFrame::OnStyleChange(wxCommandEvent &event)
-{
-    wxCaptionBarStyle style;
-    switch(event.GetId())
-    {
-    case ID_USE_HGRADIENT:
-        style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_H);
-        break;
-
-    case ID_USE_VGRADIENT:
-        style.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
-        break;
-
-    case ID_USE_SINGLE:
-        style.SetCaptionStyle(wxCAPTIONBAR_SINGLE);
-        break;
-
-    case ID_USE_RECTANGLE:
-        style.SetCaptionStyle(wxCAPTIONBAR_RECTANGLE);
-        break;
-
-    case ID_USE_FILLED_RECTANGLE:
-        style.SetCaptionStyle(wxCAPTIONBAR_FILLED_RECTANGLE);
-        break;
-
-    default:
-        break;
-    }
-
-    if(m_single->GetValue())
-    {
-        wxFoldPanel item = m_pnl->Item(1);
-        m_pnl->ApplyCaptionStyle(item, style);
-    }
-    else
-    {
-        m_pnl->ApplyCaptionStyleAll(style);
-    }
-}
-
-/* ----------------------------------------------------------------------------------------------- */
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
-         :wxScrolledWindow(parent, wxID_ANY, pos, size,
-                           wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE)
-{
-    SetBackgroundColour(* wxWHITE);
-}
-
-// Define the repainting behaviour
-void MyCanvas::OnDraw(wxDC& dc)
-{
-    dc.SetFont(*wxSWISS_FONT);
-    dc.SetPen(*wxGREEN_PEN);
-    dc.DrawLine(0, 0, 200, 200);
-    dc.DrawLine(200, 0, 0, 200);
-
-    dc.SetBrush(*wxCYAN_BRUSH);
-    dc.SetPen(*wxRED_PEN);
-    dc.DrawRectangle(100, 100, 100, 50);
-    dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
-
-    dc.DrawEllipse(250, 250, 100, 50);
-#if wxUSE_SPLINES
-    dc.DrawSpline(50, 200, 50, 100, 200, 10);
-#endif // wxUSE_SPLINES
-    dc.DrawLine(50, 230, 200, 230);
-    dc.DrawText(_T("This is a test string"), 50, 230);
-
-    wxPoint points[3];
-    points[0].x = 200; points[0].y = 300;
-    points[1].x = 100; points[1].y = 400;
-    points[2].x = 300; points[2].y = 400;
-
-    dc.DrawPolygon(3, points);
-}
-
-// This implements a tiny doodling program! Drag the mouse using
-// the left button.
-void MyCanvas::OnEvent(wxMouseEvent& event)
-{
-    wxClientDC dc(this);
-    PrepareDC(dc);
-
-    wxPoint pt(event.GetLogicalPosition(dc));
-
-    if (xpos > -1 && ypos > -1 && event.Dragging())
-    {
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(xpos, ypos, pt.x, pt.y);
-    }
-    xpos = pt.x;
-    ypos = pt.y;
-}
-
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-#if wxUSE_MDI_ARCHITECTURE
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-#endif // wxUSE_MDI_ARCHITECTURE
-}
-
-// Note that FPBTEST_NEW_WINDOW and FPBTEST_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(FPBTEST_CHILD_QUIT, MyChild::OnQuit)
-END_EVENT_TABLE()
-
-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
-                 const wxPoint& pos, const wxSize& size,
-                 const long style)
-        :wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)
-{
-    canvas = NULL;
-    my_children.Append(this);
-}
-
-MyChild::~MyChild(void)
-{
-    my_children.DeleteObject(this);
-}
-
-void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-void MyChild::OnActivate(wxActivateEvent& event)
-{
-    if (event.GetActive() && canvas)
-        canvas->SetFocus();
-}
diff --git a/contrib/samples/foldbar/extended/extended.dsp b/contrib/samples/foldbar/extended/extended.dsp
deleted file mode 100644
index 4c2b1222d7..0000000000
--- a/contrib/samples/foldbar/extended/extended.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="extended" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=extended - 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 "extended.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 "extended.mak" CFG="extended - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "extended - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "extended - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "extended - 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)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\extended.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\extended.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 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\extended.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\extended.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 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\extended.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\extended.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 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\extended.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\extended.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 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\extended.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\extended.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 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\extended.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\extended.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 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\extended.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\extended.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 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\extended.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\extended.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 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\extended.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\extended.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 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\extended.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\extended.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 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\extended.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\extended.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 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\extended.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\extended.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 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\extended.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\extended.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 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\extended.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\extended.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 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\extended.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\extended.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 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\extended.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "extended - 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\extended"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\extended"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\extended.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\extended.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 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\extended.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "extended - Win32 DLL Universal Unicode Release"
-# Name "extended - Win32 DLL Universal Unicode Debug"
-# Name "extended - Win32 DLL Universal Release"
-# Name "extended - Win32 DLL Universal Debug"
-# Name "extended - Win32 DLL Unicode Release"
-# Name "extended - Win32 DLL Unicode Debug"
-# Name "extended - Win32 DLL Release"
-# Name "extended - Win32 DLL Debug"
-# Name "extended - Win32 Universal Unicode Release"
-# Name "extended - Win32 Universal Unicode Debug"
-# Name "extended - Win32 Universal Release"
-# Name "extended - Win32 Universal Debug"
-# Name "extended - Win32 Unicode Release"
-# Name "extended - Win32 Unicode Debug"
-# Name "extended - Win32 Release"
-# Name "extended - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\extended.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\extended.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/foldbar/extended/extended.h b/contrib/samples/foldbar/extended/extended.h
deleted file mode 100644
index 4a891e6f10..0000000000
--- a/contrib/samples/foldbar/extended/extended.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        extended.h
-// Purpose:     Layout/foldpanelbar sample
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     24/07/2004
-// Copyright:   Jorgen Bodde based upon FoldPanelBar sample (c) Julian Smart
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/toolbar.h"
-#include "wx/foldbar/foldpanelbar.h"
-
-wxMenuBar *CreateMenuBar(bool with_window);
-
-enum
-{
-    ID_COLLAPSEME = 10000,
-    ID_APPLYTOALL,
-    ID_USE_HGRADIENT,
-    ID_USE_VGRADIENT,
-    ID_USE_SINGLE,
-    ID_USE_RECTANGLE,
-    ID_USE_FILLED_RECTANGLE
-};
-
-// Define a new application
-class MyApp: public wxApp
-{
-  public:
-    bool OnInit(void);
-};
-
-class MyCanvas: public wxScrolledWindow
-{
-  public:
-    MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-    virtual void OnDraw(wxDC& dc);
-    void OnEvent(wxMouseEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-// Define a new frame
-class MyFrame: public wxMDIParentFrame
-{
-  public:
-
-    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
-    void OnSize(wxSizeEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnNewWindow(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnToggleWindow(wxCommandEvent& event);
-    void OnFoldPanelBarDrag(wxSashEvent& event);
-    void OnCreateBottomStyle(wxCommandEvent& event);
-    void OnCreateNormalStyle(wxCommandEvent& event);
-
-    void OnCollapseMe(wxCommandEvent &event);
-    void OnExpandMe(wxCommandEvent &event);
-
-    void OnSlideColour(wxScrollEvent &event);
-
-    void OnStyleChange(wxCommandEvent &event);
-
-protected:
-    wxSashLayoutWindow* m_leftWindow1;
-
-private:
-    void ReCreateFoldPanel(int fpb_flags);
-    wxFoldPanelBar *m_pnl;
-    wxButton *m_btn;
-    wxCheckBox *m_single;
-    wxSlider *m_rslider1, *m_gslider1, *m_bslider1, *m_rslider2, *m_gslider2, *m_bslider2;
-    int m_flags;
-
-DECLARE_EVENT_TABLE()
-};
-
-class MyChild: public wxMDIChildFrame
-{
-  public:
-    MyCanvas *canvas;
-    MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-    ~MyChild(void);
-    void OnActivate(wxActivateEvent& event);
-    void OnQuit(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#define FPBTEST_QUIT          1
-#define FPBTEST_NEW_WINDOW    2
-#define FPBTEST_REFRESH       3
-#define FPBTEST_CHILD_QUIT    4
-#define FPBTEST_ABOUT         5
-#define FPBTEST_TOGGLE_WINDOW 6
-#define FPB_BOTTOM_STICK      7
-#define FPB_SINGLE_FOLD       8
-
-#define ID_WINDOW_TOP       100
-#define ID_WINDOW_LEFT1     101
-#define ID_WINDOW_LEFT2     102
-#define ID_WINDOW_BOTTOM    103
-
diff --git a/contrib/samples/foldbar/extended/extended.rc b/contrib/samples/foldbar/extended/extended.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/contrib/samples/foldbar/extended/extended.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/contrib/samples/foldbar/extended/makefile.bcc b/contrib/samples/foldbar/extended/makefile.bcc
deleted file mode 100644
index 1355aa38a9..0000000000
--- a/contrib/samples/foldbar/extended/makefile.bcc
+++ /dev/null
@@ -1,247 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_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)
-EXTENDED_OBJECTS =  \
-	$(OBJS)\extended_extended.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_ADV_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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)\extended.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)\extended.exe del $(OBJS)\extended.exe
-	-if exist $(OBJS)\extended.tds del $(OBJS)\extended.tds
-	-if exist $(OBJS)\extended.ilc del $(OBJS)\extended.ilc
-	-if exist $(OBJS)\extended.ild del $(OBJS)\extended.ild
-	-if exist $(OBJS)\extended.ilf del $(OBJS)\extended.ilf
-	-if exist $(OBJS)\extended.ils del $(OBJS)\extended.ils
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS)  $(OBJS)\extended_extended.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(EXTENDED_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\extended_extended.res
-|
-
-$(OBJS)\extended_extended.obj: .\extended.cpp
-	$(CXX) -q -c -P -o$@ $(EXTENDED_CXXFLAGS) $**
-
-$(OBJS)\extended_extended.res: .\extended.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/extended/makefile.gcc b/contrib/samples/foldbar/extended/makefile.gcc
deleted file mode 100644
index 771f50f170..0000000000
--- a/contrib/samples/foldbar/extended/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_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)
-EXTENDED_OBJECTS =  \
-	$(OBJS)\extended_extended.o \
-	$(OBJS)\extended_extended_rc.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_ADV_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-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)\extended.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\extended.exe del $(OBJS)\extended.exe
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS) $(OBJS)\extended_extended_rc.o
-	$(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\extended_extended.o: ./extended.cpp
-	$(CXX) -c -o $@ $(EXTENDED_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\extended_extended_rc.o: ./extended.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/foldbar/extended/makefile.vc b/contrib/samples/foldbar/extended/makefile.vc
deleted file mode 100644
index 2d7c98d268..0000000000
--- a/contrib/samples/foldbar/extended/makefile.vc
+++ /dev/null
@@ -1,322 +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 = 29
-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)
-EXTENDED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\extended.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)
-EXTENDED_OBJECTS =  \
-	$(OBJS)\extended_extended.obj \
-	$(OBJS)\extended_extended.res
-
-### 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_ADV_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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)\extended.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)\extended.exe del $(OBJS)\extended.exe
-	-if exist $(OBJS)\extended.ilk del $(OBJS)\extended.ilk
-	-if exist $(OBJS)\extended.pdb del $(OBJS)\extended.pdb
-
-$(OBJS)\extended.exe: $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(EXTENDED_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\extended_extended.obj: .\extended.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(EXTENDED_CXXFLAGS) $**
-
-$(OBJS)\extended_extended.res: .\extended.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/extended/makefile.wat b/contrib/samples/foldbar/extended/makefile.wat
deleted file mode 100644
index e5ab9b96fd..0000000000
--- a/contrib/samples/foldbar/extended/makefile.wat
+++ /dev/null
@@ -1,277 +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_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-EXTENDED_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)
-EXTENDED_OBJECTS =  &
-	$(OBJS)\extended_extended.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\extended.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)\extended.exe del $(OBJS)\extended.exe
-
-$(OBJS)\extended.exe :  $(EXTENDED_OBJECTS) $(OBJS)\extended_extended.res
-	@%create $(OBJS)\extended.lbc
-	@%append $(OBJS)\extended.lbc option quiet
-	@%append $(OBJS)\extended.lbc name $^@
-	@%append $(OBJS)\extended.lbc option caseexact
-	@%append $(OBJS)\extended.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(EXTENDED_OBJECTS)) do @%append $(OBJS)\extended.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\extended.lbc library %i
-	@%append $(OBJS)\extended.lbc option resource=$(OBJS)\extended_extended.res
-	@for %i in () do @%append $(OBJS)\extended.lbc option stack=%i
-	wlink @$(OBJS)\extended.lbc
-
-$(OBJS)\extended_extended.obj :  .AUTODEPEND .\extended.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(EXTENDED_CXXFLAGS) $<
-
-$(OBJS)\extended_extended.res :  .AUTODEPEND .\extended.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in
deleted file mode 100644
index 834b787191..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ /dev/null
@@ -1,207 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FOLDTEST_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)
-FOLDTEST_OBJECTS =  \
-	$(__foldtest_os2_lib_res) \
-	foldtest_foldpanelbartest.o \
-	foldtest_foldtestpanel.o \
-	foldtest_layouttest.o \
-	foldtest_test.o \
-	$(__foldtest___win32rc)
-
-### 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@__foldtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C foldtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__foldtest___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___foldtest___os2_emxbindcmd = $(NM) foldtest$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep foldtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__foldtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___foldtest___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_OS2_1@__foldtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__foldtest_bundle___depname = foldtest_bundle
-@COND_TOOLKIT_COCOA@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	foldtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____foldtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	foldtest.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@__foldtest___win32rc = \
-@COND_PLATFORM_WIN32_1@	foldtest_foldpanelbartest_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 = $(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 foldtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: foldtest$(EXEEXT) $(__foldtest_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f foldtest$(EXEEXT)
-	rm -rf foldtest.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
-	$(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(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)
-	$(__foldtest___mac_rezcmd)
-	$(__foldtest___mac_setfilecmd)
-	$(__foldtest___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p foldtest.app/Contents
-	mkdir -p foldtest.app/Contents/MacOS
-	mkdir -p foldtest.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/foldtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >foldtest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >foldtest.app/Contents/PkgInfo
-	
-	
-	ln -f foldtest$(EXEEXT) foldtest.app/Contents/MacOS/foldtest
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns foldtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@foldtest_bundle: $(____foldtest_BUNDLE_TGT_REF_DEP)
-
-foldtest_foldpanelbartest.o: $(srcdir)/foldpanelbartest.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldpanelbartest.cpp
-
-foldtest_foldtestpanel.o: $(srcdir)/foldtestpanel.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldtestpanel.cpp
-
-foldtest_layouttest.o: $(srcdir)/layouttest.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/layouttest.cpp
-
-foldtest_test.o: $(srcdir)/test.cpp
-	$(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/test.cpp
-
-foldtest_foldpanelbartest_rc.o: $(srcdir)/foldpanelbartest.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean foldtest_bundle
diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
deleted file mode 100644
index 2a17ea90f5..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbartest.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/foldbar/foldpanelbar.h"
-#include "foldtestpanel.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#include "sample.xpm"
-
-// ----------------------------------------------------------------------------
-// MyApp Class
-// ----------------------------------------------------------------------------
-
-class MyApp : public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Class
-// ----------------------------------------------------------------------------
-
-class MyAppFrame : public wxFrame
-{
-public:
-    MyAppFrame(const wxString& title,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxDEFAULT_FRAME_STYLE);
-
-private:
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnOrientation(wxCommandEvent& event);
-
-    // extra handlers for the bar, to show how it works
-
-    void OnCollapseMe(wxCommandEvent &event);
-    void OnExpandMe(wxCommandEvent &event);
-
-private:
-    wxMenuBar *CreateMenuBar();
-    void CreateFoldBar(bool vertical = true);
-    wxFoldPanelBar *m_pnl;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-enum
-{
-    // menu items
-    FoldPanelBarTest_Quit = wxID_EXIT,
-    FoldPanelBarTest_About = wxID_ABOUT,
-    ID_COLLAPSEME = wxID_HIGHEST,
-    ID_EXPANDME,
-    FoldPanelBarTest_Horizontal,
-    FoldPanelBarTest_Vertical
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyAppFrame, wxFrame)
-    EVT_MENU(FoldPanelBarTest_Quit,       MyAppFrame::OnQuit)
-    EVT_MENU(FoldPanelBarTest_About,      MyAppFrame::OnAbout)
-    EVT_MENU(FoldPanelBarTest_Horizontal, MyAppFrame::OnOrientation)
-    EVT_MENU(FoldPanelBarTest_Vertical,   MyAppFrame::OnOrientation)
-    EVT_BUTTON(ID_COLLAPSEME,             MyAppFrame::OnCollapseMe)
-    EVT_BUTTON(ID_EXPANDME,               MyAppFrame::OnExpandMe)
-END_EVENT_TABLE()
-
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// MyApp Implementation
-// ----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
-    MyAppFrame *frame = new MyAppFrame(_T("FoldPanelBarTest wxWidgets Test Application"));
-
-    SetTopWindow(frame);
-
-    frame->Show(true);
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// MyAppFrame Implementation
-// ----------------------------------------------------------------------------
-
-MyAppFrame::MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
-       : wxFrame(NULL, wxID_ANY, title, pos, size, style), m_pnl(NULL)
-{
-    SetIcon(wxIcon(sample_xpm));
-
-    SetMenuBar(CreateMenuBar());
-
-    CreateFoldBar();
-
-    CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWidgets!"));
-}
-
-wxMenuBar *MyAppFrame::CreateMenuBar()
-{
-    wxMenu *menuFile = new wxMenu;
-    menuFile->Append(FoldPanelBarTest_Horizontal, _T("&Horizontal\tAlt-H"));
-    menuFile->Append(FoldPanelBarTest_Vertical, _T("&Vertical\tAlt-V"));
-    menuFile->AppendSeparator();
-    menuFile->Append(FoldPanelBarTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(FoldPanelBarTest_About, _T("&About...\tF1"), _T("Show about dialog"));
-
-    wxMenuBar *value = new wxMenuBar();
-    value->Append(menuFile, _T("&File"));
-    value->Append(helpMenu, _T("&Help"));
-
-    return value;
-}
-
-void MyAppFrame::CreateFoldBar(bool vertical)
-{
-    if (vertical)
-        SetSize(200,500);
-    else
-        SetSize(900,200);
-
-    wxFoldPanelBar *bar = new wxFoldPanelBar(this,
-                                             wxID_ANY,
-                                             wxDefaultPosition,
-                                             wxDefaultSize,
-                                             wxFPB_DEFAULT_STYLE | ( vertical ? wxFPB_VERTICAL : wxFPB_HORIZONTAL ) ,
-                                             wxFPB_COLLAPSE_TO_BOTTOM);
-
-    wxFoldPanel item = bar->AddFoldPanel(_T("Test me"), false);
-    bar->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_COLLAPSEME, _T("Collapse Me")));
-
-    item = bar->AddFoldPanel(_T("Test me too!"), true);
-    bar->AddFoldPanelWindow(item, new wxButton(item.GetParent(), ID_EXPANDME, _T("Expand first one")));
-    bar->AddFoldPanelSeperator(item);
-    bar->AddFoldPanelWindow(item, new FoldTestPanel(item.GetParent(), wxID_ANY));
-
-    bar->AddFoldPanelSeperator(item);
-
-    bar->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
-
-    item = bar->AddFoldPanel(_T("Some opinions ..."), false);
-    bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("I like this")));
-    if( vertical)
-    {
-        // do not add this for horizontal for better presentation
-        bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And also this")));
-        bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("And gimme this too")));
-    }
-
-    bar->AddFoldPanelSeperator(item);
-
-    bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("Check this too if you like")));
-    if( vertical)
-    {
-        // do not add this for horizontal for better presentation
-        bar->AddFoldPanelWindow(item, new wxCheckBox(item.GetParent(), wxID_ANY, _T("What about this")));
-    }
-
-    item = bar->AddFoldPanel(_T("Choose one ..."), false);
-    bar->AddFoldPanelWindow(item, new wxStaticText(item.GetParent(), wxID_ANY, _T("Enter your comment")));
-    bar->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, _T("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
-
-    if (m_pnl) m_pnl->Destroy();
-
-    m_pnl = bar;
-
-    wxSize size = GetClientSize();
-    m_pnl->SetSize( 0, 0, size.GetWidth(), size.GetHeight() );
-}
-
-void MyAppFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MyAppFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( _T("This is the About dialog of the FoldPanelBarTest application.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, _T("About FoldPanelBarTest"), wxOK | wxICON_INFORMATION, this);
-}
-
-void MyAppFrame::OnOrientation(wxCommandEvent& event)
-{
-    CreateFoldBar(event.GetId()==FoldPanelBarTest_Vertical);
-}
-
-void MyAppFrame::OnCollapseMe(wxCommandEvent &WXUNUSED(event))
-{
-    wxFoldPanel item = m_pnl->Item(0);
-    m_pnl->Collapse(item);
-}
-
-void MyAppFrame::OnExpandMe(wxCommandEvent &WXUNUSED(event))
-{
-    m_pnl->Expand(m_pnl->Item(0));
-    m_pnl->Collapse(m_pnl->Item(1));
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl b/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
deleted file mode 100644
index 5498b90463..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="foldtest" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            foldpanelbartest.cpp
-            foldtestpanel.cpp
-            layouttest.cpp
-            test.cpp
-        </sources>
-        <contrib-lib>foldbar</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>foldpanelbartest.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.dsp b/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
deleted file mode 100644
index 1911213eea..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.dsp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foldtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=foldtest - 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 "foldtest.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 "foldtest.mak" CFG="foldtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "foldtest - 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)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\foldtest.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\foldtest.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 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\foldtest.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\foldtest.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 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\foldtest.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\foldtest.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 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\foldtest.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\foldtest.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 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\foldtest.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\foldtest.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 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\foldtest.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\foldtest.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 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\foldtest.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\foldtest.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 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\foldtest.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\foldtest.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 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\foldtest.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\foldtest.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 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_foldbar.lib wxmswuniv29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\foldtest.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\foldtest.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 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_foldbar.lib wxmswuniv29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\foldtest.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\foldtest.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 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_foldbar.lib wxmswuniv29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\foldtest.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\foldtest.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 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_foldbar.lib wxmswuniv29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\foldtest.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\foldtest.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 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_foldbar.lib wxmsw29u_core.lib wxbase29u.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\foldtest.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\foldtest.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 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_foldbar.lib wxmsw29ud_core.lib wxbase29ud.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\foldtest.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\foldtest.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 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_foldbar.lib wxmsw29_core.lib wxbase29.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\foldtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "foldtest - 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\foldtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\foldtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\foldtest.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\foldtest.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 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_foldbar.lib wxmsw29d_core.lib wxbase29d.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\foldtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "foldtest - Win32 DLL Universal Unicode Release"
-# Name "foldtest - Win32 DLL Universal Unicode Debug"
-# Name "foldtest - Win32 DLL Universal Release"
-# Name "foldtest - Win32 DLL Universal Debug"
-# Name "foldtest - Win32 DLL Unicode Release"
-# Name "foldtest - Win32 DLL Unicode Debug"
-# Name "foldtest - Win32 DLL Release"
-# Name "foldtest - Win32 DLL Debug"
-# Name "foldtest - Win32 Universal Unicode Release"
-# Name "foldtest - Win32 Universal Unicode Debug"
-# Name "foldtest - Win32 Universal Release"
-# Name "foldtest - Win32 Universal Debug"
-# Name "foldtest - Win32 Unicode Release"
-# Name "foldtest - Win32 Unicode Debug"
-# Name "foldtest - Win32 Release"
-# Name "foldtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldpanelbartest.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\foldtestpanel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\layouttest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
deleted file mode 100644
index 0da5fcabc2..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldtestpanel.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-////@begin includes
-////@end includes
-
-#include "foldtestpanel.h"
-
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * FoldTestPanel type definition
- */
-
-IMPLEMENT_CLASS( FoldTestPanel, wxPanel )
-
-/*!
- * FoldTestPanel event table definition
- */
-BEGIN_EVENT_TABLE( FoldTestPanel, wxPanel )
-
-////@begin FoldTestPanel event table entries
-////@end FoldTestPanel event table entries
-
-    //EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
-    EVT_CAPTIONBAR(wxID_ANY, FoldTestPanel::OnCaptionPanel)
-
-
-END_EVENT_TABLE()
-
-/*!
- * FoldTestPanel constructors
- */
-
-FoldTestPanel::FoldTestPanel( )
-{
-    delete m_images;
-}
-
-FoldTestPanel::FoldTestPanel( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * FoldTestPanel creator
- */
-
-bool FoldTestPanel::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin FoldTestPanel member initialisation
-    blaat = NULL;
-////@end FoldTestPanel member initialisation
-
-////@begin FoldTestPanel creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxPanel::Create( parent, id, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end FoldTestPanel creation
-    return true;
-}
-
-/*!
- * Control creation for FoldTestPanel
- */
-
-void FoldTestPanel::CreateControls()
-{
-
-////@begin FoldTestPanel content construction
-
-    FoldTestPanel* item1 = this;
-
-    wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
-    blaat = item2;
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    /* wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL ); */
-    wxPanel* item3 = new wxPanel( item1, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL );
-    item2->Add(item3, 1, wxGROW|wxADJUST_MINSIZE, 5);
-    wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
-    item3->SetSizer(item4);
-    item3->SetAutoLayout(true);
-    wxString item5Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item5 = new wxChoice( item3, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item5Strings, 0 );
-    item4->Add(item5, 0, wxGROW|wxALL, 5);
-    wxTextCtrl* item6 = new wxTextCtrl( item3, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-    item4->Add(item6, 1, wxGROW|wxALL, 5);
-    wxRadioButton* item7 = new wxRadioButton( item3, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item7->SetValue(true);
-    item4->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item8 = new wxRadioButton( item3, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->SetValue(false);
-    item4->Add(item8, 0, wxALIGN_LEFT|wxALL, 5);
-////@end FoldTestPanel content construction
-}
-
-void FoldTestPanel::OnCaptionPanel(wxCaptionBarEvent &WXUNUSED(event))
-{
-    // TODO: What else
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool FoldTestPanel::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap FoldTestPanel::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin FoldTestPanel bitmap retrieval
-    return wxNullBitmap;
-////@end FoldTestPanel bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon FoldTestPanel::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin FoldTestPanel icon retrieval
-    return wxNullIcon;
-////@end FoldTestPanel icon retrieval
-}
-
diff --git a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h b/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
deleted file mode 100644
index 8fc1de6699..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/foldtestpanel.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldtestpanel.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _FOLDTESTPANEL_H_
-#define _FOLDTESTPANEL_H_
-
-/*!
- * Includes
- */
-
-#include "wx/foldbar/foldpanelbar.h"
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_TESTPANEL 10000
-#define SYMBOL_FOLDTESTPANEL_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_FOLDTESTPANEL_TITLE _("FoldTestPanel")
-#define SYMBOL_FOLDTESTPANEL_IDNAME ID_TESTPANEL
-#define SYMBOL_FOLDTESTPANEL_SIZE wxSize(400, 300)
-#define SYMBOL_FOLDTESTPANEL_POSITION wxDefaultPosition
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_TEXTCTRL 10016
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * FoldTestPanel class declaration
- */
-
-class FoldTestPanel: public wxPanel
-{
-    DECLARE_CLASS( FoldTestPanel )
-    DECLARE_EVENT_TABLE()
-
-private:
-    wxImageList *m_images;
-    wxRect m_oldsize;
-
-    void OnCaptionPanel(wxCaptionBarEvent &event);
-
-public:
-    /// Constructors
-    FoldTestPanel( );
-    FoldTestPanel( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_FOLDTESTPANEL_IDNAME, const wxString& caption = SYMBOL_FOLDTESTPANEL_TITLE, const wxPoint& pos = SYMBOL_FOLDTESTPANEL_POSITION, const wxSize& size = SYMBOL_FOLDTESTPANEL_SIZE, long style = SYMBOL_FOLDTESTPANEL_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin FoldTestPanel event handler declarations
-
-////@end FoldTestPanel event handler declarations
-
-////@begin FoldTestPanel member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end FoldTestPanel member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin FoldTestPanel member variables
-    wxBoxSizer* blaat;
-////@end FoldTestPanel member variables
-};
-
-#endif
-    // _FOLDTESTPANEL_H_
diff --git a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp b/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
deleted file mode 100644
index b9d6814cd8..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        layouttest.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     25/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-////@begin includes
-////@end includes
-
-#include "layouttest.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * LayoutTest type definition
- */
-
-IMPLEMENT_CLASS( LayoutTest, wxPanel )
-
-/*!
- * LayoutTest event table definition
- */
-
-BEGIN_EVENT_TABLE( LayoutTest, wxPanel )
-
-////@begin LayoutTest event table entries
-////@end LayoutTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * LayoutTest constructors
- */
-
-LayoutTest::LayoutTest( )
-{
-}
-
-LayoutTest::LayoutTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * LayoutTest creator
- */
-
-bool LayoutTest::Create( wxWindow* parent, wxWindowID id, const wxString& WXUNUSED(caption), const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin LayoutTest member initialisation
-////@end LayoutTest member initialisation
-
-////@begin LayoutTest creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxPanel::Create( parent, id, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end LayoutTest creation
-    return true;
-}
-
-/*!
- * Control creation for LayoutTest
- */
-
-void LayoutTest::CreateControls()
-{
-////@begin LayoutTest content construction
-
-    LayoutTest* item1 = this;
-
-    wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    wxStaticText* item3 = new wxStaticText( item1, wxID_STATIC, _("lbaaaaaa"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetBackgroundColour(wxColour(139, 139, 139));
-    item2->Add(item3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxPanel* item4 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 80), wxTAB_TRAVERSAL );
-    item2->Add(item4, 0, wxGROW, 5);
-    wxBoxSizer* item5 = new wxBoxSizer(wxVERTICAL);
-    item4->SetSizer(item5);
-    item4->SetAutoLayout(true);
-    wxStaticText* item6 = new wxStaticText( item4, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add(item6, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    wxButton* item7 = new wxButton( item4, ID_BUTTON, _("Button"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add(item7, 0, wxALIGN_LEFT|wxALL, 5);
-////@end LayoutTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool LayoutTest::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap LayoutTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin LayoutTest bitmap retrieval
-    return wxNullBitmap;
-////@end LayoutTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon LayoutTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin LayoutTest icon retrieval
-    return wxNullIcon;
-////@end LayoutTest icon retrieval
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/layouttest.h b/contrib/samples/foldbar/foldpanelbar/layouttest.h
deleted file mode 100644
index 6e80fe6e9f..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/layouttest.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        layouttest.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     25/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _LAYOUTTEST_H_
-#define _LAYOUTTEST_H_
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_LAYOUTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_LAYOUTTEST_TITLE _("Layout Test")
-#define SYMBOL_LAYOUTTEST_IDNAME ID_DIALOG
-#define SYMBOL_LAYOUTTEST_SIZE wxSize(400, 300)
-#define SYMBOL_LAYOUTTEST_POSITION wxDefaultPosition
-#define ID_PANEL1 10006
-#define ID_BUTTON 10007
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * LayoutTest class declaration
- */
-
-class LayoutTest: public wxPanel
-{
-    DECLARE_CLASS( LayoutTest )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    LayoutTest( );
-    LayoutTest( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_LAYOUTTEST_IDNAME, const wxString& caption = SYMBOL_LAYOUTTEST_TITLE, const wxPoint& pos = SYMBOL_LAYOUTTEST_POSITION, const wxSize& size = SYMBOL_LAYOUTTEST_SIZE, long style = SYMBOL_LAYOUTTEST_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin LayoutTest event handler declarations
-
-////@end LayoutTest event handler declarations
-
-////@begin LayoutTest member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end LayoutTest member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin LayoutTest member variables
-////@end LayoutTest member variables
-};
-
-#endif
-    // _LAYOUTTEST_H_
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.bcc b/contrib/samples/foldbar/foldpanelbar/makefile.bcc
deleted file mode 100644
index fd522d80cd..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.bcc
+++ /dev/null
@@ -1,247 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_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)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.obj \
-	$(OBJS)\foldtest_foldtestpanel.obj \
-	$(OBJS)\foldtest_layouttest.obj \
-	$(OBJS)\foldtest_test.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)\foldtest.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)\foldtest.exe del $(OBJS)\foldtest.exe
-	-if exist $(OBJS)\foldtest.tds del $(OBJS)\foldtest.tds
-	-if exist $(OBJS)\foldtest.ilc del $(OBJS)\foldtest.ilc
-	-if exist $(OBJS)\foldtest.ild del $(OBJS)\foldtest.ild
-	-if exist $(OBJS)\foldtest.ilf del $(OBJS)\foldtest.ilf
-	-if exist $(OBJS)\foldtest.ils del $(OBJS)\foldtest.ils
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS)  $(OBJS)\foldtest_foldpanelbartest.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(FOLDTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)\foldtest_foldpanelbartest.res
-|
-
-$(OBJS)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
-	$(CXX) -q -c -P -o$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.gcc b/contrib/samples/foldbar/foldpanelbar/makefile.gcc
deleted file mode 100644
index b7ef62fd90..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_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)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.o \
-	$(OBJS)\foldtest_foldtestpanel.o \
-	$(OBJS)\foldtest_layouttest.o \
-	$(OBJS)\foldtest_test.o \
-	$(OBJS)\foldtest_foldpanelbartest_rc.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)\foldtest.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest_rc.o
-	$(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar  $(__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)\foldtest_foldpanelbartest.o: ./foldpanelbartest.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_foldtestpanel.o: ./foldtestpanel.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_layouttest.o: ./layouttest.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_test.o: ./test.cpp
-	$(CXX) -c -o $@ $(FOLDTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\foldtest_foldpanelbartest_rc.o: ./foldpanelbartest.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.vc b/contrib/samples/foldbar/foldpanelbar/makefile.vc
deleted file mode 100644
index c018f10a61..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/makefile.vc
+++ /dev/null
@@ -1,322 +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 = 29
-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)
-FOLDTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\foldtest.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)
-FOLDTEST_OBJECTS =  \
-	$(OBJS)\foldtest_foldpanelbartest.obj \
-	$(OBJS)\foldtest_foldtestpanel.obj \
-	$(OBJS)\foldtest_layouttest.obj \
-	$(OBJS)\foldtest_test.obj \
-	$(OBJS)\foldtest_foldpanelbartest.res
-
-### 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)\foldtest.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)\foldtest.exe del $(OBJS)\foldtest.exe
-	-if exist $(OBJS)\foldtest.ilk del $(OBJS)\foldtest.ilk
-	-if exist $(OBJS)\foldtest.pdb del $(OBJS)\foldtest.pdb
-
-$(OBJS)\foldtest.exe: $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(FOLDTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)\foldtest_foldpanelbartest.obj: .\foldpanelbartest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldtestpanel.obj: .\foldtestpanel.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_layouttest.obj: .\layouttest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_test.obj: .\test.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(FOLDTEST_CXXFLAGS) $**
-
-$(OBJS)\foldtest_foldpanelbartest.res: .\foldpanelbartest.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.wat b/contrib/samples/foldbar/foldpanelbar/makefile.wat
deleted file mode 100644
index 7ab47b2fbc..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FOLDTEST_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)
-FOLDTEST_OBJECTS =  &
-	$(OBJS)\foldtest_foldpanelbartest.obj &
-	$(OBJS)\foldtest_foldtestpanel.obj &
-	$(OBJS)\foldtest_layouttest.obj &
-	$(OBJS)\foldtest_test.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\foldtest.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)\foldtest.exe del $(OBJS)\foldtest.exe
-
-$(OBJS)\foldtest.exe :  $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.res
-	@%create $(OBJS)\foldtest.lbc
-	@%append $(OBJS)\foldtest.lbc option quiet
-	@%append $(OBJS)\foldtest.lbc name $^@
-	@%append $(OBJS)\foldtest.lbc option caseexact
-	@%append $(OBJS)\foldtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)\foldtest.lbc library %i
-	@%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res
-	@for %i in () do @%append $(OBJS)\foldtest.lbc option stack=%i
-	wlink @$(OBJS)\foldtest.lbc
-
-$(OBJS)\foldtest_foldpanelbartest.obj :  .AUTODEPEND .\foldpanelbartest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldtestpanel.obj :  .AUTODEPEND .\foldtestpanel.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_layouttest.obj :  .AUTODEPEND .\layouttest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_test.obj :  .AUTODEPEND .\test.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
-
-$(OBJS)\foldtest_foldpanelbartest.res :  .AUTODEPEND .\foldpanelbartest.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/foldbar/foldpanelbar/test.cpp b/contrib/samples/foldbar/foldpanelbar/test.cpp
deleted file mode 100644
index 28eff21b5d..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/test.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     27/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-////@begin includes
-////@end includes
-
-#include "test.h"
-
-////@begin XPM images
-////@end XPM images
-
-/*!
- * TestTest type definition
- */
-
-IMPLEMENT_CLASS( TestTest, wxDialog )
-
-/*!
- * TestTest event table definition
- */
-
-BEGIN_EVENT_TABLE( TestTest, wxDialog )
-
-////@begin TestTest event table entries
-////@end TestTest event table entries
-
-END_EVENT_TABLE()
-
-/*!
- * TestTest constructors
- */
-
-TestTest::TestTest( )
-{
-}
-
-TestTest::TestTest( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-    Create(parent, id, caption, pos, size, style);
-}
-
-/*!
- * TestTest creator
- */
-
-bool TestTest::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin TestTest member initialisation
-    blaat = NULL;
-    blaat = NULL;
-////@end TestTest member initialisation
-
-////@begin TestTest creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxDialog::Create( parent, id, caption, pos, size, style );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end TestTest creation
-    return true;
-}
-
-/*!
- * Control creation for TestTest
- */
-
-void TestTest::CreateControls()
-{
-////@begin TestTest content construction
-
-    TestTest* item1 = this;
-
-    wxFlexGridSizer* item2 = new wxFlexGridSizer(2, 1, 0, 0);
-    item2->AddGrowableRow(0);
-    item2->AddGrowableCol(0);
-    item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
-    wxPanel* item3 = new wxPanel( item1, ID_PANEL7, wxDefaultPosition, wxSize(100, 50), wxNO_BORDER|wxTAB_TRAVERSAL );
-    item2->Add(item3, 1, wxGROW|wxGROW|wxADJUST_MINSIZE, 5);
-    wxBoxSizer* item4 = new wxBoxSizer(wxVERTICAL);
-    item3->SetSizer(item4);
-    item3->SetAutoLayout(true);
-    wxPanel* item5 = new wxPanel( item3, ID_PANEL6, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item4->Add(item5, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxFlexGridSizer* item6 = new wxFlexGridSizer(2, 1, 0, 0);
-    item6->AddGrowableRow(1);
-    item6->AddGrowableCol(0);
-    item5->SetSizer(item6);
-    item5->SetAutoLayout(true);
-    wxStaticText* item7 = new wxStaticText( item5, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item6->Add(item7, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxPanel* item8 = new wxPanel( item5, ID_PANEL3, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    item6->Add(item8, 1, wxGROW|wxGROW|wxALL, 5);
-    wxBoxSizer* item9 = new wxBoxSizer(wxVERTICAL);
-    blaat = item9;
-    item8->SetSizer(item9);
-    item8->SetAutoLayout(true);
-    wxPanel* item10 = new wxPanel( item8, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item9->Add(item10, 1, wxGROW, 5);
-    wxBoxSizer* item11 = new wxBoxSizer(wxVERTICAL);
-    item10->SetSizer(item11);
-    item10->SetAutoLayout(true);
-    wxString item12Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item12 = new wxChoice( item10, ID_CHOICE, wxDefaultPosition, wxDefaultSize, 3, item12Strings, 0 );
-    item11->Add(item12, 0, wxGROW|wxALL, 5);
-    wxRadioButton* item13 = new wxRadioButton( item10, ID_RADIOBUTTON, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->SetValue(true);
-    item11->Add(item13, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item14 = new wxRadioButton( item10, ID_RADIOBUTTON1, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetValue(false);
-    item11->Add(item14, 0, wxALIGN_LEFT|wxALL, 5);
-    wxPanel* item15 = new wxPanel( item3, ID_PANEL2, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item4->Add(item15, 1, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
-    wxFlexGridSizer* item16 = new wxFlexGridSizer(2, 1, 0, 0);
-    item16->AddGrowableRow(1);
-    item16->AddGrowableCol(0);
-    item15->SetSizer(item16);
-    item15->SetAutoLayout(true);
-    wxStaticText* item17 = new wxStaticText( item15, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add(item17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL|wxADJUST_MINSIZE|wxFIXED_MINSIZE, 5);
-    wxPanel* item18 = new wxPanel( item15, ID_PANEL4, wxDefaultPosition, wxSize(100, 80), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    item16->Add(item18, 0, wxGROW|wxGROW|wxALL, 5);
-    wxBoxSizer* item19 = new wxBoxSizer(wxVERTICAL);
-    blaat = item19;
-    item18->SetSizer(item19);
-    item18->SetAutoLayout(true);
-    wxPanel* item20 = new wxPanel( item18, ID_PANEL5, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
-    item19->Add(item20, 1, wxGROW, 5);
-    wxBoxSizer* item21 = new wxBoxSizer(wxVERTICAL);
-    item20->SetSizer(item21);
-    item20->SetAutoLayout(true);
-    wxString item22Strings[] = {
-        _("One"),
-        _("Two"),
-        _("Three")
-    };
-    wxChoice* item22 = new wxChoice( item20, ID_CHOICE1, wxDefaultPosition, wxDefaultSize, 3, item22Strings, 0 );
-    item21->Add(item22, 0, wxGROW|wxALL, 5);
-    wxRadioButton* item23 = new wxRadioButton( item20, ID_RADIOBUTTON2, _("I like this"), wxDefaultPosition, wxDefaultSize, 0 );
-    item23->SetValue(true);
-    item21->Add(item23, 0, wxALIGN_LEFT|wxALL, 5);
-    wxRadioButton* item24 = new wxRadioButton( item20, ID_RADIOBUTTON3, _("I hate it"), wxDefaultPosition, wxDefaultSize, 0 );
-    item24->SetValue(false);
-    item21->Add(item24, 0, wxALIGN_LEFT|wxALL, 5);
-    wxPanel* item25 = new wxPanel( item1, ID_PANEL1, wxDefaultPosition, wxSize(100, 20), wxNO_BORDER|wxTAB_TRAVERSAL );
-    item25->SetBackgroundColour(wxColour(98, 98, 98));
-    item2->Add(item25, 0, wxGROW|wxGROW|wxFIXED_MINSIZE, 5);
-////@end TestTest content construction
-}
-
-/*!
- * Should we show tooltips?
- */
-
-bool TestTest::ShowToolTips()
-{
-    return true;
-}
-
-/*!
- * Get bitmap resources
- */
-
-wxBitmap TestTest::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin TestTest bitmap retrieval
-    return wxNullBitmap;
-////@end TestTest bitmap retrieval
-}
-
-/*!
- * Get icon resources
- */
-
-wxIcon TestTest::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin TestTest icon retrieval
-    return wxNullIcon;
-////@end TestTest icon retrieval
-}
diff --git a/contrib/samples/foldbar/foldpanelbar/test.h b/contrib/samples/foldbar/foldpanelbar/test.h
deleted file mode 100644
index d2ea1075fc..0000000000
--- a/contrib/samples/foldbar/foldpanelbar/test.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        test.h
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by:
-// Created:     27/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TEST_H_
-#define _TEST_H_
-
-/*!
- * Includes
- */
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_DIALOG 10001
-#define SYMBOL_TESTTEST_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_TESTTEST_TITLE _("Test Me")
-#define SYMBOL_TESTTEST_IDNAME ID_DIALOG
-#define SYMBOL_TESTTEST_SIZE wxSize(400, 200)
-#define SYMBOL_TESTTEST_POSITION wxDefaultPosition
-#define ID_PANEL7 10015
-#define ID_PANEL6 10014
-#define ID_PANEL3 10008
-#define ID_PANEL 10002
-#define ID_CHOICE 10003
-#define ID_RADIOBUTTON 10004
-#define ID_RADIOBUTTON1 10005
-#define ID_PANEL2 10007
-#define ID_PANEL4 10009
-#define ID_PANEL5 10010
-#define ID_CHOICE1 10011
-#define ID_RADIOBUTTON2 10012
-#define ID_RADIOBUTTON3 10013
-#define ID_PANEL1 10006
-////@end control identifiers
-
-/*!
- * Compatibility
- */
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-#ifndef wxFIXED_MINSIZE
-#define wxFIXED_MINSIZE 0
-#endif
-
-/*!
- * TestTest class declaration
- */
-
-class TestTest: public wxDialog
-{
-    DECLARE_CLASS( TestTest )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    TestTest( );
-    TestTest( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_TESTTEST_IDNAME, const wxString& caption = SYMBOL_TESTTEST_TITLE, const wxPoint& pos = SYMBOL_TESTTEST_POSITION, const wxSize& size = SYMBOL_TESTTEST_SIZE, long style = SYMBOL_TESTTEST_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin TestTest event handler declarations
-
-////@end TestTest event handler declarations
-
-////@begin TestTest member function declarations
-
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end TestTest member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin TestTest member variables
-    wxBoxSizer* blaat;
-////@end TestTest member variables
-};
-
-#endif
-    // _TEST_H_
diff --git a/contrib/samples/gizmos/Makefile.in b/contrib/samples/gizmos/Makefile.in
deleted file mode 100644
index 25e545a2a9..0000000000
--- a/contrib/samples/gizmos/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id$
-
-CONTRIB_SAMPLES=editlbox dynsash dynsash_switch multicell splittree led
-
-all:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
deleted file mode 100644
index 313cbc05db..0000000000
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ /dev/null
@@ -1,198 +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_HTML = @EXTRALIBS_HTML@
-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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DYNSASH_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)
-DYNSASH_OBJECTS =  \
-	$(__dynsash___win32rc) \
-	$(__dynsash_os2_lib_res) \
-	dynsash_dynsash.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@__dynsash___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C dynsash$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dynsash___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___dynsash___os2_emxbindcmd = $(NM) dynsash$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep dynsash$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dynsash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynsash___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@__dynsash___win32rc = dynsash_sample_rc.o
-@COND_PLATFORM_OS2_1@__dynsash_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle
-@COND_TOOLKIT_COCOA@____dynsash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	dynsash.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dynsash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	dynsash.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-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 dynsash$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: dynsash$(EXEEXT) $(__dynsash_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f dynsash$(EXEEXT)
-	rm -rf dynsash.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
-	$(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
-	$(__dynsash___mac_rezcmd)
-	$(__dynsash___mac_setfilecmd)
-	$(__dynsash___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dynsash.app/Contents
-	mkdir -p dynsash.app/Contents/MacOS
-	mkdir -p dynsash.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dynsash/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >dynsash.app/Contents/PkgInfo
-	
-	
-	ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dynsash_bundle: $(____dynsash_BUNDLE_TGT_REF_DEP)
-
-dynsash_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
-
-dynsash_dynsash.o: $(srcdir)/dynsash.cpp
-	$(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $(srcdir)/dynsash.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dynsash_bundle
diff --git a/contrib/samples/gizmos/dynsash/dynsash.bkl b/contrib/samples/gizmos/dynsash/dynsash.bkl
deleted file mode 100644
index c4c2618ab1..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="dynsash" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            dynsash.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/dynsash/dynsash.cpp b/contrib/samples/gizmos/dynsash/dynsash.cpp
deleted file mode 100644
index e24229b4c3..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynsash.cpp
-// Purpose:     Test the wxDynamicSash class by creating a dynamic sash which
-//              contains an HTML view
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/gizmos/dynamicsash.h"
-#include "wx/html/htmlwin.h"
-#include "wx/image.h"
-#include "wx/cmdline.h"
-
-class Demo : public wxApp
-{
-public:
-    bool OnInit();
-};
-
-class SashHtmlWindow : public wxHtmlWindow
-{
-public:
-    SashHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxHW_SCROLLBAR_NEVER,
-                   const wxString& name = wxT("sashHtmlWindow"));
-
-    wxSize DoGetBestSize() const;
-
-private:
-    void OnSplit(wxDynamicSashSplitEvent& event);
-
-    wxWindow *m_dyn_sash;
-};
-
-IMPLEMENT_APP(Demo)
-
-const wxChar *HTML_content =
-wxT("<P><H1>wxDynamicSashWindow demo</H1>")
-wxT("<P>Here is an example of how you can use <TT>wxDynamicSashWindow</TT> to allow your users to ")
-wxT("dynamically split and unify the views of your windows.  Try dragging out a few splits ")
-wxT("and then reunifying the window.")
-wxT("<P>Also, see the <TT>dynsash_switch</TT> sample for an example of an application which ")
-wxT("manages the scrollbars provided by <TT>wxDynamicSashWindow</TT> itself.");
-
-bool Demo::OnInit()
-{
-    wxInitAllImageHandlers();
-
-    wxFrame *frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Demo"));
-    frame->SetSize(480, 480);
-
-    wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, wxID_ANY);
-    wxHtmlWindow *html = new SashHtmlWindow(sash, wxID_ANY);
-    html->SetPage(HTML_content);
-
-    frame->Show();
-
-    return true;
-}
-
-
-SashHtmlWindow::SashHtmlWindow(wxWindow *parent, wxWindowID id,
-                               const wxPoint& pos,
-                               const wxSize& size,
-                               long style,
-                               const wxString& name)
-              : wxHtmlWindow(parent, id, pos, size, style, name)
-{
-    Connect(wxEVT_DYNAMIC_SASH_SPLIT,
-            wxDynamicSashSplitEventHandler(SashHtmlWindow::OnSplit));
-
-    m_dyn_sash = parent;
-}
-
-wxSize SashHtmlWindow::DoGetBestSize() const
-{
-    wxHtmlContainerCell *cell = GetInternalRepresentation();
-    wxSize size = GetSize();
-
-    if (cell)
-    {
-        cell->Layout(size.GetWidth());
-        return wxSize(cell->GetWidth(), cell->GetHeight());
-    }
-
-    return wxHtmlWindow::GetBestSize();
-}
-
-void SashHtmlWindow::OnSplit(wxDynamicSashSplitEvent& WXUNUSED(event))
-{
-    wxHtmlWindow *html = new SashHtmlWindow(m_dyn_sash, wxID_ANY);
-    html->SetPage(HTML_content);
-}
diff --git a/contrib/samples/gizmos/dynsash/dynsash.dsp b/contrib/samples/gizmos/dynsash/dynsash.dsp
deleted file mode 100644
index 81fff5672b..0000000000
--- a/contrib/samples/gizmos/dynsash/dynsash.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dynsash" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=dynsash - 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 "dynsash.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 "dynsash.mak" CFG="dynsash - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dynsash - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash - 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)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash.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\dynsash.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.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\dynsash.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash.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\dynsash.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 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.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\dynsash.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dynsash.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\dynsash.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 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.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\dynsash.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 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dynsash.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\dynsash.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 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.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\dynsash.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 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash.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\dynsash.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.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\dynsash.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash.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\dynsash.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 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_html.lib wxmswuniv29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.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\dynsash.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_html.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dynsash.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\dynsash.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 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.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\dynsash.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 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dynsash.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\dynsash.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 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_html.lib wxmsw29_core.lib wxbase29.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\dynsash.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash - 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\dynsash"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\dynsash"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.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\dynsash.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 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_html.lib wxmsw29d_core.lib wxbase29d.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\dynsash.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "dynsash - Win32 DLL Universal Unicode Release"
-# Name "dynsash - Win32 DLL Universal Unicode Debug"
-# Name "dynsash - Win32 DLL Universal Release"
-# Name "dynsash - Win32 DLL Universal Debug"
-# Name "dynsash - Win32 DLL Unicode Release"
-# Name "dynsash - Win32 DLL Unicode Debug"
-# Name "dynsash - Win32 DLL Release"
-# Name "dynsash - Win32 DLL Debug"
-# Name "dynsash - Win32 Universal Unicode Release"
-# Name "dynsash - Win32 Universal Unicode Debug"
-# Name "dynsash - Win32 Universal Release"
-# Name "dynsash - Win32 Universal Debug"
-# Name "dynsash - Win32 Unicode Release"
-# Name "dynsash - Win32 Unicode Debug"
-# Name "dynsash - Win32 Release"
-# Name "dynsash - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dynsash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.bcc b/contrib/samples/gizmos/dynsash/makefile.bcc
deleted file mode 100644
index 15ebb15822..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.bcc
+++ /dev/null
@@ -1,239 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_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)
-DYNSASH_OBJECTS =  \
-	$(OBJS)\dynsash_dynsash.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_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!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)\dynsash.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)\dynsash.exe del $(OBJS)\dynsash.exe
-	-if exist $(OBJS)\dynsash.tds del $(OBJS)\dynsash.tds
-	-if exist $(OBJS)\dynsash.ilc del $(OBJS)\dynsash.ilc
-	-if exist $(OBJS)\dynsash.ild del $(OBJS)\dynsash.ild
-	-if exist $(OBJS)\dynsash.ilf del $(OBJS)\dynsash.ilf
-	-if exist $(OBJS)\dynsash.ils del $(OBJS)\dynsash.ils
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS)  $(OBJS)\dynsash_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(DYNSASH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib  $(__WXLIB_HTML_p)  $(__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)\dynsash_sample.res
-|
-
-$(OBJS)\dynsash_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)\dynsash_dynsash.obj: .\dynsash.cpp
-	$(CXX) -q -c -P -o$@ $(DYNSASH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.gcc b/contrib/samples/gizmos/dynsash/makefile.gcc
deleted file mode 100644
index 7518273716..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.gcc
+++ /dev/null
@@ -1,237 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_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)
-DYNSASH_OBJECTS =  \
-	$(OBJS)\dynsash_sample_rc.o \
-	$(OBJS)\dynsash_dynsash.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_HTML_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-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)\dynsash.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\dynsash.exe del $(OBJS)\dynsash.exe
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample_rc.o
-	$(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__WXLIB_HTML_p)  $(__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)\dynsash_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)\dynsash_dynsash.o: ./dynsash.cpp
-	$(CXX) -c -o $@ $(DYNSASH_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/dynsash/makefile.vc b/contrib/samples/gizmos/dynsash/makefile.vc
deleted file mode 100644
index 40a6ad9553..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.vc
+++ /dev/null
@@ -1,314 +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 = 29
-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)
-DYNSASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\dynsash.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)
-DYNSASH_OBJECTS =  \
-	$(OBJS)\dynsash_sample.res \
-	$(OBJS)\dynsash_dynsash.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_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!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)\dynsash.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)\dynsash.exe del $(OBJS)\dynsash.exe
-	-if exist $(OBJS)\dynsash.ilk del $(OBJS)\dynsash.ilk
-	-if exist $(OBJS)\dynsash.pdb del $(OBJS)\dynsash.pdb
-
-$(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(DYNSASH_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib  $(__WXLIB_HTML_p)  $(__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)\dynsash_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)\dynsash_dynsash.obj: .\dynsash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DYNSASH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash/makefile.wat b/contrib/samples/gizmos/dynsash/makefile.wat
deleted file mode 100644
index 2517cb0499..0000000000
--- a/contrib/samples/gizmos/dynsash/makefile.wat
+++ /dev/null
@@ -1,267 +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_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_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)
-DYNSASH_OBJECTS =  &
-	$(OBJS)\dynsash_dynsash.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\dynsash.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)\dynsash.exe del $(OBJS)\dynsash.exe
-
-$(OBJS)\dynsash.exe :  $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
-	@%create $(OBJS)\dynsash.lbc
-	@%append $(OBJS)\dynsash.lbc option quiet
-	@%append $(OBJS)\dynsash.lbc name $^@
-	@%append $(OBJS)\dynsash.lbc option caseexact
-	@%append $(OBJS)\dynsash.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(DYNSASH_OBJECTS)) do @%append $(OBJS)\dynsash.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib  $(__WXLIB_HTML_p)  $(__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)\dynsash.lbc library %i
-	@%append $(OBJS)\dynsash.lbc option resource=$(OBJS)\dynsash_sample.res
-	@for %i in () do @%append $(OBJS)\dynsash.lbc option stack=%i
-	wlink @$(OBJS)\dynsash.lbc
-
-$(OBJS)\dynsash_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)\dynsash_dynsash.obj :  .AUTODEPEND .\dynsash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
deleted file mode 100644
index f4ac584a38..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ /dev/null
@@ -1,198 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DYNSASH_SWITCH_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)
-DYNSASH_SWITCH_OBJECTS =  \
-	$(__dynsash_switch___win32rc) \
-	$(__dynsash_switch_os2_lib_res) \
-	dynsash_switch_dynsash_switch.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@__dynsash_switch___mac_setfilecmd \
-@COND_PLATFORM_MAC_1@	= $(SETFILE) -a C dynsash_switch$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \
-@COND_PLATFORM_MAC_1@	$(__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___dynsash_switch___os2_emxbindcmd = $(NM) \
-	dynsash_switch$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
-	dynsash_switch$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dynsash_switch___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynsash_switch___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@__dynsash_switch___win32rc = \
-@COND_PLATFORM_WIN32_1@	dynsash_switch_sample_rc.o
-@COND_PLATFORM_OS2_1@__dynsash_switch_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dynsash_switch_bundle___depname \
-@COND_PLATFORM_MACOSX_1@	= dynsash_switch_bundle
-@COND_TOOLKIT_COCOA@____dynsash_switch_BUNDLE_TGT_REF_DEP \
-@COND_TOOLKIT_COCOA@	= dynsash_switch.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dynsash_switch_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	dynsash_switch.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 dynsash_switch$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: dynsash_switch$(EXEEXT) $(__dynsash_switch_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f dynsash_switch$(EXEEXT)
-	rm -rf dynsash_switch.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
-	$(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
-	$(__dynsash_switch___mac_rezcmd)
-	$(__dynsash_switch___mac_setfilecmd)
-	$(__dynsash_switch___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dynsash_switch.app/Contents
-	mkdir -p dynsash_switch.app/Contents/MacOS
-	mkdir -p dynsash_switch.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dynsash_switch/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash_switch.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo
-	
-	
-	ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: $(____dynsash_switch_BUNDLE_TGT_REF_DEP)
-
-dynsash_switch_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
-
-dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp
-	$(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $(srcdir)/dynsash_switch.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dynsash_switch_bundle
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
deleted file mode 100644
index 4843a97f3a..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="dynsash_switch" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            dynsash_switch.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
deleted file mode 100644
index cfc5fba0b9..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
-// Purpose:     Test custom scrollbar handling of wxDynamicSashWindow by
-//              creating a dynamic sash window where the client scrolls a
-//              a subwindow of the client window by responding to scroll
-//              events itself
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/choice.h"
-#include "wx/dcclient.h"
-#include "wx/gizmos/dynamicsash.h"
-#include "wx/layout.h"
-#include "wx/scrolbar.h"
-
-class SwitchDemo : public wxApp {
-public:
-    bool OnInit();
-};
-
-
-class SwitchView : public wxWindow {
-public:
-    SwitchView(wxDynamicSashWindow *parent);
-
-    wxSize DoGetBestSize() const;
-
-private:
-    void OnSize(wxSizeEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnChoice(wxCommandEvent& event);
-    void OnScroll(wxScrollEvent& event);
-    void OnFocus(wxFocusEvent& event);
-    void OnErase(wxEraseEvent& event);
-    void OnSplit(wxDynamicSashSplitEvent& event);
-    void OnUnify(wxDynamicSashUnifyEvent& event);
-
-    wxDynamicSashWindow *m_dyn_sash;
-    wxWindow *m_bar;
-    wxChoice *m_choice;
-    wxWindow *m_view;
-};
-
-IMPLEMENT_APP(SwitchDemo)
-
-
-SwitchView::SwitchView(wxDynamicSashWindow *win) {
-    Create(win, wxID_ANY);
-
-    m_dyn_sash = win;
-
-    m_bar = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER, wxT("bar"));
-    m_choice = new wxChoice(m_bar, wxID_ANY);
-    m_choice->SetEventHandler(this);
-    m_view = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxT("view"));
-    m_view->SetBackgroundColour(*wxWHITE);
-    m_view->SetEventHandler(this);
-
-    m_choice->Append(wxT("Triangle"));
-    m_choice->Append(wxT("Square"));
-    m_choice->SetSelection(0);
-
-    wxLayoutConstraints *layout;
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(0);
-    layout->top.Absolute(0);
-    layout->height.Absolute(36);
-    layout->width.SameAs(this, wxWidth);
-    m_bar->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(3);
-    layout->width.AsIs();
-    layout->height.AsIs();
-    layout->top.Absolute(3);
-    m_choice->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    layout->left.Absolute(0);
-    layout->width.SameAs(this, wxWidth);
-    layout->top.Below(m_bar);
-    layout->bottom.SameAs(this, wxBottom);
-    m_view->SetConstraints(layout);
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-
-    Connect(GetId(), wxEVT_SIZE, (wxObjectEventFunction)
-                                 (wxEventFunction)
-                                 (wxSizeEventFunction)&SwitchView::OnSize);
-    Connect(m_choice->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction)
-                                                              (wxEventFunction)
-                                                              (wxCommandEventFunction)&SwitchView::OnChoice);
-    Connect(m_view->GetId(), wxEVT_PAINT, (wxObjectEventFunction)
-                                          (wxEventFunction)
-                                          (wxPaintEventFunction)&SwitchView::OnPaint);
-
-    Connect(wxID_ANY, wxEVT_SET_FOCUS, (wxObjectEventFunction)
-                                 (wxEventFunction)
-                                 (wxFocusEventFunction)&SwitchView::OnFocus);
-    Connect(wxID_ANY, wxEVT_SCROLL_TOP, (wxObjectEventFunction)
-                                  (wxEventFunction)
-                                  (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_BOTTOM, (wxObjectEventFunction)
-                                     (wxEventFunction)
-                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_LINEUP, (wxObjectEventFunction)
-                                     (wxEventFunction)
-                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_LINEDOWN, (wxObjectEventFunction)
-                                       (wxEventFunction)
-                                       (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_PAGEUP, (wxObjectEventFunction)
-                                     (wxEventFunction)
-                                     (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_PAGEDOWN, (wxObjectEventFunction)
-                                       (wxEventFunction)
-                                       (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)
-                                         (wxEventFunction)
-                                         (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_SCROLL_THUMBRELEASE, (wxObjectEventFunction)
-                                           (wxEventFunction)
-                                           (wxScrollEventFunction)&SwitchView::OnScroll);
-    Connect(wxID_ANY, wxEVT_ERASE_BACKGROUND, (wxObjectEventFunction)
-                                        (wxEventFunction)
-                                        (wxEraseEventFunction)&SwitchView::OnErase);
-
-    Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)
-                                          (wxEventFunction)
-                                          (wxDynamicSashSplitEventFunction)&SwitchView::OnSplit);
-    Connect(wxID_ANY, wxEVT_DYNAMIC_SASH_UNIFY, (wxObjectEventFunction)
-                                          (wxEventFunction)
-                                          (wxDynamicSashUnifyEventFunction)&SwitchView::OnUnify);
-}
-
-wxSize SwitchView::DoGetBestSize() const {
-    return wxSize(64, 64);
-}
-
-void SwitchView::OnSize(wxSizeEvent& WXUNUSED(event)) {
-    Layout();
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    if (hscroll && vscroll) {
-        int hpos = hscroll->GetThumbPosition();
-        int vpos = vscroll->GetThumbPosition();
-
-        wxSize size = m_view->GetSize();
-        if (hpos + size.GetWidth() > 300)
-            hpos = 300 - size.GetWidth();
-        if (vpos + size.GetHeight() > 300)
-            vpos = 300 - size.GetHeight();
-
-        hscroll->SetScrollbar(hpos, size.GetWidth(), 300, size.GetWidth());
-        vscroll->SetScrollbar(vpos, size.GetHeight(), 300, size.GetHeight());
-    }
-}
-
-void SwitchView::OnPaint(wxPaintEvent& WXUNUSED(event)) {
-    wxPaintDC dc(m_view);
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    dc.Clear();
-    dc.SetDeviceOrigin(-hscroll->GetThumbPosition(), -vscroll->GetThumbPosition());
-
-    if (m_choice->GetSelection()) {
-        dc.DrawLine(20, 20, 280, 20);
-        dc.DrawLine(280, 20, 280, 280);
-        dc.DrawLine(280, 280, 20, 280);
-        dc.DrawLine(20, 280, 20, 20);
-    } else {
-        dc.DrawLine(150, 20, 280, 280);
-        dc.DrawLine(280, 280, 20, 280);
-        dc.DrawLine(20, 280, 150, 20);
-    }
-}
-
-void SwitchView::OnErase(wxEraseEvent& WXUNUSED(event)) {
-    // Do nothing
-}
-
-void SwitchView::OnSplit(wxDynamicSashSplitEvent& WXUNUSED(event)) {
-    SwitchView *view = new SwitchView(m_dyn_sash);
-    view->m_choice->SetSelection(m_choice->GetSelection());
-
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnUnify(wxDynamicSashUnifyEvent& WXUNUSED(event)) {
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    hscroll->SetEventHandler(this);
-    vscroll->SetEventHandler(this);
-}
-
-void SwitchView::OnChoice(wxCommandEvent& WXUNUSED(event)) {
-    m_view->Refresh();
-}
-
-void SwitchView::OnScroll(wxScrollEvent& WXUNUSED(event)) {
-    m_view->Refresh();
-}
-
-void SwitchView::OnFocus(wxFocusEvent& event) {
-    wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
-    wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
-
-    if (event.GetEventObject() == hscroll || event.GetEventObject() == vscroll) {
-        m_view->SetFocus();
-    } else {
-        event.Skip();
-    }
-}
-
-
-
-bool SwitchDemo::OnInit() {
-    wxFrame *frame;
-    wxDynamicSashWindow *dyn;
-
-    frame = new wxFrame(NULL, wxID_ANY, wxT("Dynamic Sash Window Switch Demo"));
-    dyn = new wxDynamicSashWindow(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
-    new SwitchView(dyn);
-
-    frame->SetSize(480, 480);
-    frame->Show();
-
-    return true;
-}
diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
deleted file mode 100644
index b5a8b0eb23..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dynsash_switch" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=dynsash_switch - 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 "dynsash_switch.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 "dynsash_switch.mak" CFG="dynsash_switch - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "dynsash_switch - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "dynsash_switch - 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)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dynsash_switch.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\dynsash_switch.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.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\dynsash_switch.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dynsash_switch.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\dynsash_switch.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.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\dynsash_switch.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dynsash_switch.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\dynsash_switch.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.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\dynsash_switch.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dynsash_switch.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\dynsash_switch.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.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\dynsash_switch.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dynsash_switch.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\dynsash_switch.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.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\dynsash_switch.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dynsash_switch.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\dynsash_switch.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.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\dynsash_switch.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dynsash_switch.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\dynsash_switch.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.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\dynsash_switch.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dynsash_switch.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\dynsash_switch.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\dynsash_switch.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "dynsash_switch - 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\dynsash_switch"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\dynsash_switch"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.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\dynsash_switch.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\dynsash_switch.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "dynsash_switch - Win32 DLL Universal Unicode Release"
-# Name "dynsash_switch - Win32 DLL Universal Unicode Debug"
-# Name "dynsash_switch - Win32 DLL Universal Release"
-# Name "dynsash_switch - Win32 DLL Universal Debug"
-# Name "dynsash_switch - Win32 DLL Unicode Release"
-# Name "dynsash_switch - Win32 DLL Unicode Debug"
-# Name "dynsash_switch - Win32 DLL Release"
-# Name "dynsash_switch - Win32 DLL Debug"
-# Name "dynsash_switch - Win32 Universal Unicode Release"
-# Name "dynsash_switch - Win32 Universal Unicode Debug"
-# Name "dynsash_switch - Win32 Universal Release"
-# Name "dynsash_switch - Win32 Universal Debug"
-# Name "dynsash_switch - Win32 Unicode Release"
-# Name "dynsash_switch - Win32 Unicode Debug"
-# Name "dynsash_switch - Win32 Release"
-# Name "dynsash_switch - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dynsash_switch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.bcc b/contrib/samples/gizmos/dynsash_switch/makefile.bcc
deleted file mode 100644
index a0a7a036ca..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_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)
-DYNSASH_SWITCH_OBJECTS =  \
-	$(OBJS)\dynsash_switch_dynsash_switch.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)\dynsash_switch.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)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-	-if exist $(OBJS)\dynsash_switch.tds del $(OBJS)\dynsash_switch.tds
-	-if exist $(OBJS)\dynsash_switch.ilc del $(OBJS)\dynsash_switch.ilc
-	-if exist $(OBJS)\dynsash_switch.ild del $(OBJS)\dynsash_switch.ild
-	-if exist $(OBJS)\dynsash_switch.ilf del $(OBJS)\dynsash_switch.ilf
-	-if exist $(OBJS)\dynsash_switch.ils del $(OBJS)\dynsash_switch.ils
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS)  $(OBJS)\dynsash_switch_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(DYNSASH_SWITCH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\dynsash_switch_sample.res
-|
-
-$(OBJS)\dynsash_switch_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)\dynsash_switch_dynsash_switch.obj: .\dynsash_switch.cpp
-	$(CXX) -q -c -P -o$@ $(DYNSASH_SWITCH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.gcc b/contrib/samples/gizmos/dynsash_switch/makefile.gcc
deleted file mode 100644
index caab328485..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_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)
-DYNSASH_SWITCH_OBJECTS =  \
-	$(OBJS)\dynsash_switch_sample_rc.o \
-	$(OBJS)\dynsash_switch_dynsash_switch.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)\dynsash_switch.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample_rc.o
-	$(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__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)\dynsash_switch_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)\dynsash_switch_dynsash_switch.o: ./dynsash_switch.cpp
-	$(CXX) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.vc b/contrib/samples/gizmos/dynsash_switch/makefile.vc
deleted file mode 100644
index b90988dd2d..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-DYNSASH_SWITCH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\dynsash_switch.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)
-DYNSASH_SWITCH_OBJECTS =  \
-	$(OBJS)\dynsash_switch_sample.res \
-	$(OBJS)\dynsash_switch_dynsash_switch.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)\dynsash_switch.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)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-	-if exist $(OBJS)\dynsash_switch.ilk del $(OBJS)\dynsash_switch.ilk
-	-if exist $(OBJS)\dynsash_switch.pdb del $(OBJS)\dynsash_switch.pdb
-
-$(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(DYNSASH_SWITCH_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\dynsash_switch_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)\dynsash_switch_dynsash_switch.obj: .\dynsash_switch.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(DYNSASH_SWITCH_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.wat b/contrib/samples/gizmos/dynsash_switch/makefile.wat
deleted file mode 100644
index c0f715b7d6..0000000000
--- a/contrib/samples/gizmos/dynsash_switch/makefile.wat
+++ /dev/null
@@ -1,263 +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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DYNSASH_SWITCH_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)
-DYNSASH_SWITCH_OBJECTS =  &
-	$(OBJS)\dynsash_switch_dynsash_switch.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\dynsash_switch.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)\dynsash_switch.exe del $(OBJS)\dynsash_switch.exe
-
-$(OBJS)\dynsash_switch.exe :  $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res
-	@%create $(OBJS)\dynsash_switch.lbc
-	@%append $(OBJS)\dynsash_switch.lbc option quiet
-	@%append $(OBJS)\dynsash_switch.lbc name $^@
-	@%append $(OBJS)\dynsash_switch.lbc option caseexact
-	@%append $(OBJS)\dynsash_switch.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(DYNSASH_SWITCH_OBJECTS)) do @%append $(OBJS)\dynsash_switch.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\dynsash_switch.lbc library %i
-	@%append $(OBJS)\dynsash_switch.lbc option resource=$(OBJS)\dynsash_switch_sample.res
-	@for %i in () do @%append $(OBJS)\dynsash_switch.lbc option stack=%i
-	wlink @$(OBJS)\dynsash_switch.lbc
-
-$(OBJS)\dynsash_switch_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)\dynsash_switch_dynsash_switch.obj :  .AUTODEPEND .\dynsash_switch.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in
deleted file mode 100644
index 7a85fea7da..0000000000
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ /dev/null
@@ -1,192 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-TEST_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)
-TEST_OBJECTS =  \
-	$(__test___win32rc) \
-	$(__test_os2_lib_res) \
-	test_test.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@__test___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C test$(EXEEXT)
-@COND_PLATFORM_MAC_1@__test___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___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep test$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___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@__test___win32rc = test_sample_rc.o
-@COND_PLATFORM_OS2_1@__test_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
-@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = test.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 test$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: test$(EXEEXT) $(__test_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f test$(EXEEXT)
-	rm -rf test.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-	$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
-	$(__test___mac_rezcmd)
-	$(__test___mac_setfilecmd)
-	$(__test___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p test.app/Contents
-	mkdir -p test.app/Contents/MacOS
-	mkdir -p test.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/test/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >test.app/Contents/PkgInfo
-	
-	
-	ln -f test$(EXEEXT) test.app/Contents/MacOS/test
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
-
-test_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
-
-test_test.o: $(srcdir)/test.cpp
-	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean test_bundle
diff --git a/contrib/samples/gizmos/editlbox/editlbox.bkl b/contrib/samples/gizmos/editlbox/editlbox.bkl
deleted file mode 100644
index 0df2855ab2..0000000000
--- a/contrib/samples/gizmos/editlbox/editlbox.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="test" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            test.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/editlbox/editlbox.dsp b/contrib/samples/gizmos/editlbox/editlbox.dsp
deleted file mode 100644
index 8972db87fe..0000000000
--- a/contrib/samples/gizmos/editlbox/editlbox.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="editlbox" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=test - 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 "editlbox.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 "editlbox.mak" CFG="test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "test - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "test - 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)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\test.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\test.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.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\test.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\test.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\test.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.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\test.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\test.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\test.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.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\test.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\test.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\test.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.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\test.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\test.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\test.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.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\test.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\test.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\test.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.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\test.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\test.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\test.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test.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\test.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\test.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\test.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\test.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "test - 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\test"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\test"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test.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\test.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\test.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "test - Win32 DLL Universal Unicode Release"
-# Name "test - Win32 DLL Universal Unicode Debug"
-# Name "test - Win32 DLL Universal Release"
-# Name "test - Win32 DLL Universal Debug"
-# Name "test - Win32 DLL Unicode Release"
-# Name "test - Win32 DLL Unicode Debug"
-# Name "test - Win32 DLL Release"
-# Name "test - Win32 DLL Debug"
-# Name "test - Win32 Universal Unicode Release"
-# Name "test - Win32 Universal Unicode Debug"
-# Name "test - Win32 Universal Release"
-# Name "test - Win32 Universal Debug"
-# Name "test - Win32 Unicode Release"
-# Name "test - Win32 Unicode Debug"
-# Name "test - Win32 Release"
-# Name "test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.bcc b/contrib/samples/gizmos/editlbox/makefile.bcc
deleted file mode 100644
index 593177b41c..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_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)
-TEST_OBJECTS =  \
-	$(OBJS)\test_test.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)\test.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)\test.exe del $(OBJS)\test.exe
-	-if exist $(OBJS)\test.tds del $(OBJS)\test.tds
-	-if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
-	-if exist $(OBJS)\test.ild del $(OBJS)\test.ild
-	-if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
-	-if exist $(OBJS)\test.ils del $(OBJS)\test.ils
-
-$(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(TEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\test_sample.res
-|
-
-$(OBJS)\test_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)\test_test.obj: .\test.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.gcc b/contrib/samples/gizmos/editlbox/makefile.gcc
deleted file mode 100644
index a1365246a1..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.gcc
+++ /dev/null
@@ -1,232 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_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)
-TEST_OBJECTS =  \
-	$(OBJS)\test_sample_rc.o \
-	$(OBJS)\test_test.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)\test.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o
-	$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__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)\test_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)\test_test.o: ./test.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/editlbox/makefile.vc b/contrib/samples/gizmos/editlbox/makefile.vc
deleted file mode 100644
index 29327ea5d8..0000000000
--- a/contrib/samples/gizmos/editlbox/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\test.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)
-TEST_OBJECTS =  \
-	$(OBJS)\test_sample.res \
-	$(OBJS)\test_test.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)\test.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)\test.exe del $(OBJS)\test.exe
-	-if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
-	-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
-
-$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(TEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\test_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)\test_test.obj: .\test.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/editlbox/makefile.wat b/contrib/samples/gizmos/editlbox/makefile.wat
deleted file mode 100644
index 86d9878c1f..0000000000
--- a/contrib/samples/gizmos/editlbox/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_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)
-TEST_OBJECTS =  &
-	$(OBJS)\test_test.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\test.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)\test.exe del $(OBJS)\test.exe
-
-$(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_sample.res
-	@%create $(OBJS)\test.lbc
-	@%append $(OBJS)\test.lbc option quiet
-	@%append $(OBJS)\test.lbc name $^@
-	@%append $(OBJS)\test.lbc option caseexact
-	@%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\test.lbc library %i
-	@%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res
-	@for %i in () do @%append $(OBJS)\test.lbc option stack=%i
-	wlink @$(OBJS)\test.lbc
-
-$(OBJS)\test_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)\test_test.obj :  .AUTODEPEND .\test.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/editlbox/test.cpp b/contrib/samples/gizmos/editlbox/test.cpp
deleted file mode 100644
index 3620a451de..0000000000
--- a/contrib/samples/gizmos/editlbox/test.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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
-
-#include "wx/gizmos/editlbox.h"
-#include "wx/sizer.h"
-
-class MyApp : public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-
-IMPLEMENT_APP(MyApp)
-
-
-bool MyApp::OnInit()
-{
-    wxDialog dlg(NULL, wxID_ANY, _("Test dialog"), wxDefaultPosition, wxDefaultSize,
-                 wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-
-    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-    sizer->Add(new wxEditableListBox(&dlg, wxID_ANY, _("Match these wildcards:"),
-                                     wxDefaultPosition,wxSize(300,200)),
-               1, wxEXPAND|wxALL, 10);
-
-    sizer->Add(5,5);
-
-    wxEditableListBox *lb = new wxEditableListBox(&dlg, wxID_ANY, _("Except:"),
-                                     wxDefaultPosition,wxSize(300,200));
-    wxArrayString ar;
-    ar.Add(_T("*.cpp"));
-    ar.Add(_T("*.h"));
-    ar.Add(_T("*.c"));
-    lb->SetStrings(ar);
-
-    sizer->Add(lb, 1, wxEXPAND|wxALL, 10);
-
-    sizer->Add(5,5);
-
-    sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);
-    dlg.SetSizer(sizer);
-    sizer->Fit(&dlg);
-    dlg.Centre();
-
-    dlg.ShowModal();
-
-    wxString res = _("'Except' contains these strings:\n\n");
-    lb->GetStrings(ar);
-    for (size_t i = 0; i < ar.GetCount(); i++)
-        res << ar[i] << _T("\n");
-    wxMessageBox(res);
-
-    return false;
-}
diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in
deleted file mode 100644
index 75e9855cca..0000000000
--- a/contrib/samples/gizmos/led/Makefile.in
+++ /dev/null
@@ -1,191 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-LED_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)
-LED_OBJECTS =  \
-	$(__led___win32rc) \
-	$(__led_os2_lib_res) \
-	led_led.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@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT)
-@COND_PLATFORM_MAC_1@__led___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___led___os2_emxbindcmd = $(NM) led$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep led$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__led___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___led___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@__led___win32rc = led_sample_rc.o
-@COND_PLATFORM_OS2_1@__led_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__led_bundle___depname = led_bundle
-@COND_TOOLKIT_COCOA@____led_BUNDLE_TGT_REF_DEP = led.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____led_BUNDLE_TGT_REF_DEP = led.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 led$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: led$(EXEEXT) $(__led_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f led$(EXEEXT)
-	rm -rf led.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
-	$(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
-	$(__led___mac_rezcmd)
-	$(__led___mac_setfilecmd)
-	$(__led___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p led.app/Contents
-	mkdir -p led.app/Contents/MacOS
-	mkdir -p led.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/led/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >led.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >led.app/Contents/PkgInfo
-	
-	
-	ln -f led$(EXEEXT) led.app/Contents/MacOS/led
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns led.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@led_bundle: $(____led_BUNDLE_TGT_REF_DEP)
-
-led_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
-
-led_led.o: $(srcdir)/led.cpp
-	$(CXXC) -c -o $@ $(LED_CXXFLAGS) $(srcdir)/led.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean led_bundle
diff --git a/contrib/samples/gizmos/led/led.bkl b/contrib/samples/gizmos/led/led.bkl
deleted file mode 100644
index 8a41662be1..0000000000
--- a/contrib/samples/gizmos/led/led.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="led" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            led.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/led/led.cpp b/contrib/samples/gizmos/led/led.cpp
deleted file mode 100644
index 5de6f0f513..0000000000
--- a/contrib/samples/gizmos/led/led.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        led.cpp
-// Purpose:     LED sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// 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
-
-#include "wx/gizmos/ledctrl.h"
-#include "wx/sizer.h"
-#include "wx/panel.h"
-#include "wx/numdlg.h"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class MyPanel : public wxPanel
-{
-public:
-    MyPanel(wxFrame *frame);
-
-    void OnIncrement();
-    void OnDecrement();
-    void OnSmallIncrement();
-    void OnSmallDecrement();
-    void OnSetValue();
-    void OnAlignLeft();
-    void OnAlignCenter();
-    void OnAlignRight();
-    void OnDrawFaded();
-
-private:
-    wxLEDNumberCtrl    *m_led;
-    wxBoxSizer         *m_sizer;
-};
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
-    // override base class virtuals
-    // ----------------------------
-
-    // this one is called on application startup and is a good place for the app
-    // initialization (doing it here and not in the ctor allows to have an error
-    // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
-    // ctor(s)
-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
-            long style = wxDEFAULT_FRAME_STYLE);
-
-    // event handlers (these functions should _not_ be virtual)
-    void OnQuit(wxCommandEvent& event);
-    void OnIncrement(wxCommandEvent& event);
-    void OnDecrement(wxCommandEvent& event);
-    void OnSmallIncrement(wxCommandEvent& event);
-    void OnSmallDecrement(wxCommandEvent& event);
-    void OnSetValue(wxCommandEvent& event);
-    void OnAlignLeft(wxCommandEvent& event);
-    void OnAlignCenter(wxCommandEvent& event);
-    void OnAlignRight(wxCommandEvent& event);
-    void OnDrawFaded(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-private:
-    MyPanel  *m_panel;
-
-    // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
-    // menu items
-    LED_Quit = wxID_EXIT,
-
-    LED_Edit_Increment = wxID_HIGHEST + 1,
-    LED_Edit_Decrement,
-    LED_Edit_Small_Increment,
-    LED_Edit_Small_Decrement,
-    LED_Edit_SetValue,
-    LED_Edit_AlignLeft,
-    LED_Edit_AlignCenter,
-    LED_Edit_AlignRight,
-    LED_Edit_DrawFaded,
-
-    // it is important for the id corresponding to the "About" command to have
-    // this standard value as otherwise it won't be handled properly under Mac
-    // (where it is special and put into the "Apple" menu)
-    LED_About = wxID_ABOUT
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWidgets events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(LED_Quit,  MyFrame::OnQuit)
-    EVT_MENU(LED_Edit_Increment, MyFrame::OnIncrement)
-    EVT_MENU(LED_Edit_Decrement, MyFrame::OnDecrement)
-    EVT_MENU(LED_Edit_Small_Increment, MyFrame::OnSmallIncrement)
-    EVT_MENU(LED_Edit_Small_Decrement, MyFrame::OnSmallDecrement)
-    EVT_MENU(LED_Edit_SetValue, MyFrame::OnSetValue)
-    EVT_MENU(LED_Edit_AlignLeft, MyFrame::OnAlignLeft)
-    EVT_MENU(LED_Edit_AlignCenter, MyFrame::OnAlignCenter)
-    EVT_MENU(LED_Edit_AlignRight, MyFrame::OnAlignRight)
-    EVT_MENU(LED_Edit_DrawFaded, MyFrame::OnDrawFaded)
-    EVT_MENU(LED_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWidgets to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool MyApp::OnInit()
-{
-    // create the main application window
-    MyFrame *frame = new MyFrame(_T("LED App"),
-                                 wxDefaultPosition, wxSize(450, 120));
-
-    // and show it (the frames, unlike simple controls, are not shown when
-    // created initially)
-    frame->Show(true);
-
-    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned false here, the
-    // application would exit immediately.
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
-       : wxFrame(NULL, wxID_ANY, title, pos, size, style)
-{
-#if wxUSE_MENUS
-    // create a menu bar
-    wxMenu *menuFile = new wxMenu;
-
-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(LED_About, _T("&About...\tF1"), _T("Show about dialog"));
-
-    menuFile->Append(LED_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
-    wxMenu *editMenu = new wxMenu;
-    editMenu->Append(LED_Edit_Increment, _T("&Increment LED (1)\tCtrl-I"));
-    editMenu->Append(LED_Edit_Small_Increment, _T("&Increment LED (0.01)\tAlt-I"));
-    editMenu->Append(LED_Edit_Decrement, _T("&Decrement LED (1)\tCtrl-D"));
-    editMenu->Append(LED_Edit_Small_Decrement, _T("&Decrement LED (0.01)\tAlt-D"));
-    editMenu->Append(LED_Edit_SetValue, _T("&Set LED Value...\tCtrl-S"));
-    editMenu->AppendSeparator();
-    editMenu->AppendRadioItem(LED_Edit_AlignLeft, _T("Align &Left"));
-    editMenu->AppendRadioItem(LED_Edit_AlignCenter, _T("Align &Center"));
-    editMenu->AppendRadioItem(LED_Edit_AlignRight, _T("Align &Right"));
-    editMenu->AppendSeparator();
-    editMenu->AppendCheckItem(LED_Edit_DrawFaded, _T("Draw &Faded\tCtrl-F"));
-
-    editMenu->Check(LED_Edit_DrawFaded, true);
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, _T("&File"));
-    menuBar->Append(editMenu, _T("&Edit"));
-    menuBar->Append(helpMenu, _T("&Help"));
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-#endif // wxUSE_MENUS
-
-    m_panel = new MyPanel(this);
-}
-
-
-// event handlers
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MyFrame::OnIncrement(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnIncrement();
-}
-
-void MyFrame::OnDecrement(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnDecrement();
-}
-
-void MyFrame::OnSmallIncrement(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnSmallIncrement();
-}
-
-void MyFrame::OnSmallDecrement(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnSmallDecrement();
-}
-
-void MyFrame::OnSetValue(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnSetValue();
-}
-
-void MyFrame::OnAlignLeft(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnAlignLeft();
-}
-
-void MyFrame::OnAlignCenter(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnAlignCenter();
-}
-
-void MyFrame::OnAlignRight(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnAlignRight();
-}
-
-void MyFrame::OnDrawFaded(wxCommandEvent& WXUNUSED(event))
-{
-    m_panel->OnDrawFaded();
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( _T("This is the About dialog of the LED sample.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, _T("About LED"), wxOK | wxICON_INFORMATION, this);
-}
-
-// --------------------------------------------------------------------------
-// MyPanel
-// --------------------------------------------------------------------------
-
-MyPanel::MyPanel(wxFrame *frame)
-                : wxPanel(frame, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN)
-{
-    m_led = new wxLEDNumberCtrl(this, wxID_ANY,
-                                wxDefaultPosition, wxDefaultSize,
-                                wxLED_ALIGN_LEFT|wxLED_DRAW_FADED|wxFULL_REPAINT_ON_RESIZE);
-
-    m_led->SetValue(_T("01.23 7-8-9"));
-
-    m_sizer = new wxBoxSizer(wxVERTICAL);
-    m_sizer->Add(m_led, 1, wxEXPAND|wxALL, 10);
-    m_sizer->Fit(this);
-
-    SetSizer(m_sizer);
-    SetAutoLayout(true);
-}
-
-void MyPanel::OnIncrement()
-{
-    wxString strValue = m_led->GetValue();
-
-    double dValue;
-    strValue.ToDouble(&dValue);
-    dValue += 1.0;
-    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnDecrement()
-{
-    wxString strValue = m_led->GetValue();
-
-    double dValue;
-    strValue.ToDouble(&dValue);
-    dValue -= 1.0;
-    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSmallIncrement()
-{
-    wxString strValue = m_led->GetValue();
-
-    double dValue;
-    strValue.ToDouble(&dValue);
-    dValue += 0.01;
-    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSmallDecrement()
-{
-    wxString strValue = m_led->GetValue();
-
-    double dValue;
-    strValue.ToDouble(&dValue);
-    dValue -= 0.01;
-    m_led->SetValue(wxString::Format(_T("%.2f"), dValue));
-}
-
-void MyPanel::OnSetValue()
-{
-    wxString strValue = m_led->GetValue();
-
-    strValue = ::wxGetTextFromUser(_T("Please enter a number for LED display"), _T("Please enter a number"), strValue, this);
-
-    if (strValue != _T(""))
-        m_led->SetValue(strValue);
-}
-
-void MyPanel::OnAlignLeft()
-{
-    m_led->SetAlignment(wxLED_ALIGN_LEFT);
-}
-
-void MyPanel::OnAlignCenter()
-{
-    m_led->SetAlignment(wxLED_ALIGN_CENTER);
-}
-
-void MyPanel::OnAlignRight()
-{
-    m_led->SetAlignment(wxLED_ALIGN_RIGHT);
-}
-
-void MyPanel::OnDrawFaded()
-{
-    m_led->SetDrawFaded(!(m_led->GetDrawFaded()));
-}
diff --git a/contrib/samples/gizmos/led/led.dsp b/contrib/samples/gizmos/led/led.dsp
deleted file mode 100644
index 5a575e7c31..0000000000
--- a/contrib/samples/gizmos/led/led.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="led" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=led - 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 "led.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 "led.mak" CFG="led - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "led - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "led - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "led - 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)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\led.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\led.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.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\led.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\led.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\led.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.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\led.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\led.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\led.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.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\led.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\led.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\led.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.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\led.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\led.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\led.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.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\led.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\led.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\led.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.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\led.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\led.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\led.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\led.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\led.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\led.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\led.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\led.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "led - 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\led"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\led"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\led.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\led.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\led.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "led - Win32 DLL Universal Unicode Release"
-# Name "led - Win32 DLL Universal Unicode Debug"
-# Name "led - Win32 DLL Universal Release"
-# Name "led - Win32 DLL Universal Debug"
-# Name "led - Win32 DLL Unicode Release"
-# Name "led - Win32 DLL Unicode Debug"
-# Name "led - Win32 DLL Release"
-# Name "led - Win32 DLL Debug"
-# Name "led - Win32 Universal Unicode Release"
-# Name "led - Win32 Universal Unicode Debug"
-# Name "led - Win32 Universal Release"
-# Name "led - Win32 Universal Debug"
-# Name "led - Win32 Unicode Release"
-# Name "led - Win32 Unicode Debug"
-# Name "led - Win32 Release"
-# Name "led - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\led.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/led/makefile.bcc b/contrib/samples/gizmos/led/makefile.bcc
deleted file mode 100644
index f1e00d6bd2..0000000000
--- a/contrib/samples/gizmos/led/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_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)
-LED_OBJECTS =  \
-	$(OBJS)\led_led.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)\led.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)\led.exe del $(OBJS)\led.exe
-	-if exist $(OBJS)\led.tds del $(OBJS)\led.tds
-	-if exist $(OBJS)\led.ilc del $(OBJS)\led.ilc
-	-if exist $(OBJS)\led.ild del $(OBJS)\led.ild
-	-if exist $(OBJS)\led.ilf del $(OBJS)\led.ilf
-	-if exist $(OBJS)\led.ils del $(OBJS)\led.ils
-
-$(OBJS)\led.exe: $(LED_OBJECTS)  $(OBJS)\led_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(LED_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\led_sample.res
-|
-
-$(OBJS)\led_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)\led_led.obj: .\led.cpp
-	$(CXX) -q -c -P -o$@ $(LED_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/led/makefile.gcc b/contrib/samples/gizmos/led/makefile.gcc
deleted file mode 100644
index 5e7cade5ae..0000000000
--- a/contrib/samples/gizmos/led/makefile.gcc
+++ /dev/null
@@ -1,232 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_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)
-LED_OBJECTS =  \
-	$(OBJS)\led_sample_rc.o \
-	$(OBJS)\led_led.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)\led.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\led.exe del $(OBJS)\led.exe
-
-$(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample_rc.o
-	$(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__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)\led_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)\led_led.o: ./led.cpp
-	$(CXX) -c -o $@ $(LED_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/led/makefile.vc b/contrib/samples/gizmos/led/makefile.vc
deleted file mode 100644
index 68874befd7..0000000000
--- a/contrib/samples/gizmos/led/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-LED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\led.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)
-LED_OBJECTS =  \
-	$(OBJS)\led_sample.res \
-	$(OBJS)\led_led.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)\led.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)\led.exe del $(OBJS)\led.exe
-	-if exist $(OBJS)\led.ilk del $(OBJS)\led.ilk
-	-if exist $(OBJS)\led.pdb del $(OBJS)\led.pdb
-
-$(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(LED_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\led_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)\led_led.obj: .\led.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(LED_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/led/makefile.wat b/contrib/samples/gizmos/led/makefile.wat
deleted file mode 100644
index 88648d3bf7..0000000000
--- a/contrib/samples/gizmos/led/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-LED_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)
-LED_OBJECTS =  &
-	$(OBJS)\led_led.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\led.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)\led.exe del $(OBJS)\led.exe
-
-$(OBJS)\led.exe :  $(LED_OBJECTS) $(OBJS)\led_sample.res
-	@%create $(OBJS)\led.lbc
-	@%append $(OBJS)\led.lbc option quiet
-	@%append $(OBJS)\led.lbc name $^@
-	@%append $(OBJS)\led.lbc option caseexact
-	@%append $(OBJS)\led.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(LED_OBJECTS)) do @%append $(OBJS)\led.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\led.lbc library %i
-	@%append $(OBJS)\led.lbc option resource=$(OBJS)\led_sample.res
-	@for %i in () do @%append $(OBJS)\led.lbc option stack=%i
-	wlink @$(OBJS)\led.lbc
-
-$(OBJS)\led_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)\led_led.obj :  .AUTODEPEND .\led.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(LED_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in
deleted file mode 100644
index 13b35e51c1..0000000000
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ /dev/null
@@ -1,193 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MTEST_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)
-MTEST_OBJECTS =  \
-	$(__mtest___win32rc) \
-	$(__mtest_os2_lib_res) \
-	mtest_mtest.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@__mtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C mtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__mtest___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___mtest___os2_emxbindcmd = $(NM) mtest$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep mtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__mtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mtest___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@__mtest___win32rc = mtest_sample_rc.o
-@COND_PLATFORM_OS2_1@__mtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__mtest_bundle___depname = mtest_bundle
-@COND_TOOLKIT_COCOA@____mtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	mtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____mtest_BUNDLE_TGT_REF_DEP = mtest.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 mtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: mtest$(EXEEXT) $(__mtest_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f mtest$(EXEEXT)
-	rm -rf mtest.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
-	$(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
-	$(__mtest___mac_rezcmd)
-	$(__mtest___mac_setfilecmd)
-	$(__mtest___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p mtest.app/Contents
-	mkdir -p mtest.app/Contents/MacOS
-	mkdir -p mtest.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/mtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >mtest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >mtest.app/Contents/PkgInfo
-	
-	
-	ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@mtest_bundle: $(____mtest_BUNDLE_TGT_REF_DEP)
-
-mtest_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
-
-mtest_mtest.o: $(srcdir)/mtest.cpp
-	$(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $(srcdir)/mtest.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean mtest_bundle
diff --git a/contrib/samples/gizmos/multicell/makefile.bcc b/contrib/samples/gizmos/multicell/makefile.bcc
deleted file mode 100644
index bf0dd1ddce..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_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)
-MTEST_OBJECTS =  \
-	$(OBJS)\mtest_mtest.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)\mtest.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)\mtest.exe del $(OBJS)\mtest.exe
-	-if exist $(OBJS)\mtest.tds del $(OBJS)\mtest.tds
-	-if exist $(OBJS)\mtest.ilc del $(OBJS)\mtest.ilc
-	-if exist $(OBJS)\mtest.ild del $(OBJS)\mtest.ild
-	-if exist $(OBJS)\mtest.ilf del $(OBJS)\mtest.ilf
-	-if exist $(OBJS)\mtest.ils del $(OBJS)\mtest.ils
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS)  $(OBJS)\mtest_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(MTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\mtest_sample.res
-|
-
-$(OBJS)\mtest_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)\mtest_mtest.obj: .\mtest.cpp
-	$(CXX) -q -c -P -o$@ $(MTEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/multicell/makefile.gcc b/contrib/samples/gizmos/multicell/makefile.gcc
deleted file mode 100644
index 7e34182f12..0000000000
--- a/contrib/samples/gizmos/multicell/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_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)
-MTEST_OBJECTS =  \
-	$(OBJS)\mtest_sample_rc.o \
-	$(OBJS)\mtest_mtest.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)\mtest.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample_rc.o
-	$(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__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)\mtest_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)\mtest_mtest.o: ./mtest.cpp
-	$(CXX) -c -o $@ $(MTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/multicell/makefile.sl b/contrib/samples/gizmos/multicell/makefile.sl
deleted file mode 100644
index 15fbe57196..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.sl
+++ /dev/null
@@ -1,15 +0,0 @@
-# Purpose: makefile for multicell example (Salford C++)
-# Created 2000-07-28
-
-PROGRAM = mtest
-OBJECTS = $(PROGRAM).obj ..\src\multicell.obj
-EXTRAINC=-I..\include
-
-include ..\..\src\makeprog.sl
-
-all:        wx $(TARGET)
-
-wx:
-    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
-    cd $(WXDIR)\samples\notebook
-
diff --git a/contrib/samples/gizmos/multicell/makefile.unx b/contrib/samples/gizmos/multicell/makefile.unx
deleted file mode 100644
index 27d3b2952c..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.unx
+++ /dev/null
@@ -1,24 +0,0 @@
-# Purpose: makefile for multicell example (Unix)
-# Created 2000-07-28
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = mtest
-
-OBJECTS = $(PROGRAM).o ../src/multicell.o
-EXTRAINC=-I../include
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/gizmos/multicell/makefile.vc b/contrib/samples/gizmos/multicell/makefile.vc
deleted file mode 100644
index 3fec2f7737..0000000000
--- a/contrib/samples/gizmos/multicell/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-MTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\mtest.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)
-MTEST_OBJECTS =  \
-	$(OBJS)\mtest_sample.res \
-	$(OBJS)\mtest_mtest.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)\mtest.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)\mtest.exe del $(OBJS)\mtest.exe
-	-if exist $(OBJS)\mtest.ilk del $(OBJS)\mtest.ilk
-	-if exist $(OBJS)\mtest.pdb del $(OBJS)\mtest.pdb
-
-$(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(MTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\mtest_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)\mtest_mtest.obj: .\mtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MTEST_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat
deleted file mode 100644
index f35791d3ce..0000000000
--- a/contrib/samples/gizmos/multicell/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MTEST_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)
-MTEST_OBJECTS =  &
-	$(OBJS)\mtest_mtest.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\mtest.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)\mtest.exe del $(OBJS)\mtest.exe
-
-$(OBJS)\mtest.exe :  $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
-	@%create $(OBJS)\mtest.lbc
-	@%append $(OBJS)\mtest.lbc option quiet
-	@%append $(OBJS)\mtest.lbc name $^@
-	@%append $(OBJS)\mtest.lbc option caseexact
-	@%append $(OBJS)\mtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(MTEST_OBJECTS)) do @%append $(OBJS)\mtest.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\mtest.lbc library %i
-	@%append $(OBJS)\mtest.lbc option resource=$(OBJS)\mtest_sample.res
-	@for %i in () do @%append $(OBJS)\mtest.lbc option stack=%i
-	wlink @$(OBJS)\mtest.lbc
-
-$(OBJS)\mtest_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)\mtest_mtest.obj :  .AUTODEPEND .\mtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MTEST_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/multicell/mtest.cpp b/contrib/samples/gizmos/multicell/mtest.cpp
deleted file mode 100644
index 4c57adec8d..0000000000
--- a/contrib/samples/gizmos/multicell/mtest.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * File:    mtest.cpp
- * Purpose: wxMultiCellSizer and wxMultiCellCanvas test
- * Author:  Alex Andruschak
- * Created: 2000
- * Updated:
- * Copyright:
- * License: wxWindows licence
- */
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/multicell.h"
-
-class MyApp: public wxApp
-{public:
-    bool OnInit(void);
-};
-
-class MyFrame: public wxFrame
-{
-
-public:
-    MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    wxMultiCellSizer *sizer;
-
-    DECLARE_EVENT_TABLE()
-};
-
-IMPLEMENT_APP(MyApp)
-
-bool MyApp::OnInit(void)
-{
-    MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, wxT("wxMultiCellSizer Sample"), wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500));
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-    frame = new MyFrame(2, (wxFrame *) NULL, wxT("wxMultiCellCanvas Sample"), wxPoint(100, 100), wxSize(600, 500));
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-    return true;
-}
-
-
-
-MyFrame::MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
-wxFrame(frame, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL)
-{
-#if wxUSE_STATUSBAR
-    CreateStatusBar(1);
-#endif // wxUSE_STATUSBAR
-    sizer = NULL;
-    if (type == 1)
-    {
-        // create sizer 4 columns 5 rows
-        wxSize aa(4,9);
-        sizer = new wxMultiCellSizer(aa);
-        sizer->SetDefaultCellSize(wxSize(15,15));
-        sizer->SetRowHeight(7,5,true);
-        sizer->SetRowHeight(8,5,false);
-        // add first row
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT( "B1 - 0,0, horizontal resizable")),
-                  0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2)));
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B2 - 0,1, vertical resizable")),
-                  0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2)));
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B3 - 0,2")),
-                  0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER));
-        sizer->Add(
-                  new wxStaticText(this, wxID_ANY, wxT("jbb 0,3, lower-right")),
-                  0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT));
-
-        // add button for secord row
-        sizer->Add(
-                  new wxTextCtrl(this, wxID_ANY, wxT("Text control - 1,0, 4 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(1,0,1,4));
-
-        // add buttons for next row
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B6 - 2,0, 2 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(2,0,1,2));
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B7 - 2,3")),
-                  0, 0, 0, new wxMultiCellItemHandle(2,3,1,1));
-
-        // and last additions
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B8 - 3,0, 4 rows high, vert resizable")),
-                  0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE));
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B9 - 3,2, 2 cols wide, vert resizable")),
-                  0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE));
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B10 - 4,1, 3 cols wide, vert resizable")),
-                  0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE));
-
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B11 - 5,1, 3 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(5,1,1,3));
-
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B12 - 6,1, 3 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(6,1,1,3));
-
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B13 - 7,1, 2 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(7,1,1,2));
-
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("B14 - 8,1, 3 cols wide")),
-                  0, 0, 0, new wxMultiCellItemHandle(8,1,1,3));
-
-        SetAutoLayout( true );
-//    sizer->SetMinSize(sizer->CalcMin());
-        SetSizer( sizer );
-        wxSize s = sizer->CalcMin();
-        wxSize c = GetSize() - GetClientSize();
-        SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight());
-        sizer->EnableGridLines(this);
-    }
-    else
-    {
-        // create sizer 4 columns 5 rows
-        wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5);
-
-        // add first row
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 1")),
-                  0, 0);
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 2")),
-                  0, 1);
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 3")),
-                  0, 2);
-        sizer->Add(
-                  new wxStaticText(this, wxID_ANY, wxT("jbb test")),
-                  0, 3);
-
-        sizer->Add(
-                  new wxStaticText(this, wxID_ANY, wxT("jbb test 2")),
-                  0, 4);
-
-        // add button for secord row
-        sizer->Add(
-                  new wxTextCtrl(this, wxID_ANY, wxT("Text control")),
-                  1, 0);
-
-        // add buttons for next row
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 6")),
-                  2, 0);
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 7")),
-                  2, 3);
-
-        // and last additions
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 8")),
-                  3, 0);
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 9")),
-                  3, 1);
-        sizer->Add(
-                  new wxButton( this, wxID_ANY, wxT("Button 10")),
-                  4, 1);
-
-        sizer->CalculateConstraints();
-        SetSizer( sizer );
-        SetAutoLayout( true );
-    }
-}
-// Define the repainting behaviour
-
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-   EVT_PAINT(MyFrame::OnPaint)
-   EVT_CLOSE(MyFrame::OnCloseWindow)
-   END_EVENT_TABLE()
-
-void MyFrame::OnPaint(wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-
-    if (sizer)
-    {
-        sizer->OnPaint(dc);
-    }
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    Destroy();
-}
-
diff --git a/contrib/samples/gizmos/multicell/multicell.bkl b/contrib/samples/gizmos/multicell/multicell.bkl
deleted file mode 100644
index e59e4d9311..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="mtest" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            mtest.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/multicell/multicell.dsp b/contrib/samples/gizmos/multicell/multicell.dsp
deleted file mode 100644
index cdf4e252d9..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="multicell" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=mtest - 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 "multicell.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 "multicell.mak" CFG="mtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mtest - 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)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\mtest.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\mtest.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.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\mtest.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\mtest.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\mtest.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.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\mtest.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\mtest.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\mtest.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.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\mtest.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\mtest.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\mtest.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.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\mtest.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\mtest.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\mtest.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.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\mtest.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\mtest.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\mtest.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.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\mtest.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\mtest.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\mtest.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.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\mtest.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\mtest.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\mtest.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\mtest.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mtest - 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\mtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\mtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.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\mtest.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\mtest.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "mtest - Win32 DLL Universal Unicode Release"
-# Name "mtest - Win32 DLL Universal Unicode Debug"
-# Name "mtest - Win32 DLL Universal Release"
-# Name "mtest - Win32 DLL Universal Debug"
-# Name "mtest - Win32 DLL Unicode Release"
-# Name "mtest - Win32 DLL Unicode Debug"
-# Name "mtest - Win32 DLL Release"
-# Name "mtest - Win32 DLL Debug"
-# Name "mtest - Win32 Universal Unicode Release"
-# Name "mtest - Win32 Universal Unicode Debug"
-# Name "mtest - Win32 Universal Release"
-# Name "mtest - Win32 Universal Debug"
-# Name "mtest - Win32 Unicode Release"
-# Name "mtest - Win32 Unicode Debug"
-# Name "mtest - Win32 Release"
-# Name "mtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mtest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/multicell/multicell.vpj b/contrib/samples/gizmos/multicell/multicell.vpj
deleted file mode 100644
index 450b7bd12c..0000000000
--- a/contrib/samples/gizmos/multicell/multicell.vpj
+++ /dev/null
@@ -1,18 +0,0 @@
-[COMPILER]
-version=5.0b
-compile=concur|capture|:Compile:&Compile,gcc
-make=concur|capture|:Build:&Build,make
-rebuild=concur|capture|:Rebuild:&Rebuild,
-debug=:Debug:&Debug,gdb
-execute=:Execute:E&xecute,
-user1=hide|:User 1:User 1,
-user2=hide|:User 2:User 2,
-workingdir=.
-includedirs=
-reffile=
-MACRO=\n
-[FILES]
-mtest.cpp
-multicell.cpp
-multicell.h
-[ASSOCIATION]
diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
deleted file mode 100644
index 6f1edf98d7..0000000000
--- a/contrib/samples/gizmos/splittree/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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-SPLITTREE_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)
-SPLITTREE_OBJECTS =  \
-	$(__splittree___win32rc) \
-	$(__splittree_os2_lib_res) \
-	splittree_tree.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@__splittree___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C splittree$(EXEEXT)
-@COND_PLATFORM_MAC_1@__splittree___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___splittree___os2_emxbindcmd = $(NM) splittree$(EXEEXT) | \
-	if grep -q pmwin.763 ; then emxbind -ep splittree$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__splittree___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splittree___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@__splittree___win32rc = splittree_sample_rc.o
-@COND_PLATFORM_OS2_1@__splittree_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__splittree_bundle___depname = splittree_bundle
-@COND_TOOLKIT_COCOA@____splittree_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	splittree.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____splittree_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	splittree.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 splittree$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: splittree$(EXEEXT) $(__splittree_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f splittree$(EXEEXT)
-	rm -rf splittree.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
-	$(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
-	$(__splittree___mac_rezcmd)
-	$(__splittree___mac_setfilecmd)
-	$(__splittree___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p splittree.app/Contents
-	mkdir -p splittree.app/Contents/MacOS
-	mkdir -p splittree.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/splittree/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >splittree.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >splittree.app/Contents/PkgInfo
-	
-	
-	ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splittree.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@splittree_bundle: $(____splittree_BUNDLE_TGT_REF_DEP)
-
-splittree_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
-
-splittree_tree.o: $(srcdir)/tree.cpp
-	$(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $(srcdir)/tree.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean splittree_bundle
diff --git a/contrib/samples/gizmos/splittree/makefile.bcc b/contrib/samples/gizmos/splittree/makefile.bcc
deleted file mode 100644
index 180e20a9d1..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.bcc
+++ /dev/null
@@ -1,235 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_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)
-SPLITTREE_OBJECTS =  \
-	$(OBJS)\splittree_tree.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)\splittree.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)\splittree.exe del $(OBJS)\splittree.exe
-	-if exist $(OBJS)\splittree.tds del $(OBJS)\splittree.tds
-	-if exist $(OBJS)\splittree.ilc del $(OBJS)\splittree.ilc
-	-if exist $(OBJS)\splittree.ild del $(OBJS)\splittree.ild
-	-if exist $(OBJS)\splittree.ilf del $(OBJS)\splittree.ilf
-	-if exist $(OBJS)\splittree.ils del $(OBJS)\splittree.ils
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS)  $(OBJS)\splittree_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(SPLITTREE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\splittree_sample.res
-|
-
-$(OBJS)\splittree_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)\splittree_tree.obj: .\tree.cpp
-	$(CXX) -q -c -P -o$@ $(SPLITTREE_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/splittree/makefile.gcc b/contrib/samples/gizmos/splittree/makefile.gcc
deleted file mode 100644
index 3860d0040d..0000000000
--- a/contrib/samples/gizmos/splittree/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_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)
-SPLITTREE_OBJECTS =  \
-	$(OBJS)\splittree_sample_rc.o \
-	$(OBJS)\splittree_tree.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)\splittree.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\splittree.exe del $(OBJS)\splittree.exe
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample_rc.o
-	$(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos  $(__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)\splittree_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)\splittree_tree.o: ./tree.cpp
-	$(CXX) -c -o $@ $(SPLITTREE_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/gizmos/splittree/makefile.sl b/contrib/samples/gizmos/splittree/makefile.sl
deleted file mode 100644
index 7dd9a0b6a6..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.sl
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# File:		makefile.sl
-# Author:	Julian Smart
-# Created:	1998
-#
-# Makefile : Builds a wxWindows sample for Salford C++, WIN32
-
-PROGRAM = minimal
-OBJECTS = $(PROGRAM).obj
-
-include ..\..\src\makeprog.sl
-
-all:        wx $(TARGET)
-
-wx:
-    cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all
-    cd $(WXDIR)\samples\minimal
-
diff --git a/contrib/samples/gizmos/splittree/makefile.unx b/contrib/samples/gizmos/splittree/makefile.unx
deleted file mode 100644
index ab2ced9e76..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.unx
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# File:		Makefile for samples
-# Author:	Robert Roebling
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CXX = $(shell wx-config --cxx)
-
-PROGRAM = minimal
-
-OBJECTS = $(PROGRAM).o
-
-# implementation
-
-.SUFFIXES:	.o .cpp
-
-.cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -o $@ $<
-
-all:    $(PROGRAM)
-
-$(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
-
-clean: 
-	rm -f *.o $(PROGRAM)
diff --git a/contrib/samples/gizmos/splittree/makefile.va b/contrib/samples/gizmos/splittree/makefile.va
deleted file mode 100644
index e30e89c264..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.va
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# File:     makefile.va
-# Author:   David Webster
-# Created:  1999
-# Updated:
-# Copyright:    (c) David Webster
-# License:  wxWindows licence
-#
-# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
-# Use FINAL=1 argument to nmake to build final version with no debug info.
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\makeva.env
-
-PROGRAM=$D\minimal
-OBJECTS = $(PROGRAM).obj
-
-!if [md $D]
-!endif
-
-!include $(WXDIR)\src\makeprog.va
-
diff --git a/contrib/samples/gizmos/splittree/makefile.vc b/contrib/samples/gizmos/splittree/makefile.vc
deleted file mode 100644
index 94b5bafd0e..0000000000
--- a/contrib/samples/gizmos/splittree/makefile.vc
+++ /dev/null
@@ -1,310 +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 = 29
-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)
-SPLITTREE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\splittree.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)
-SPLITTREE_OBJECTS =  \
-	$(OBJS)\splittree_sample.res \
-	$(OBJS)\splittree_tree.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)\splittree.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)\splittree.exe del $(OBJS)\splittree.exe
-	-if exist $(OBJS)\splittree.ilk del $(OBJS)\splittree.ilk
-	-if exist $(OBJS)\splittree.pdb del $(OBJS)\splittree.pdb
-
-$(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(SPLITTREE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\splittree_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)\splittree_tree.obj: .\tree.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(SPLITTREE_CXXFLAGS) $**
-
diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat
deleted file mode 100644
index 935dcd3e1d..0000000000
--- a/contrib/samples/gizmos/splittree/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SPLITTREE_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)
-SPLITTREE_OBJECTS =  &
-	$(OBJS)\splittree_tree.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\splittree.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)\splittree.exe del $(OBJS)\splittree.exe
-
-$(OBJS)\splittree.exe :  $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
-	@%create $(OBJS)\splittree.lbc
-	@%append $(OBJS)\splittree.lbc option quiet
-	@%append $(OBJS)\splittree.lbc name $^@
-	@%append $(OBJS)\splittree.lbc option caseexact
-	@%append $(OBJS)\splittree.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(SPLITTREE_OBJECTS)) do @%append $(OBJS)\splittree.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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)\splittree.lbc library %i
-	@%append $(OBJS)\splittree.lbc option resource=$(OBJS)\splittree_sample.res
-	@for %i in () do @%append $(OBJS)\splittree.lbc option stack=%i
-	wlink @$(OBJS)\splittree.lbc
-
-$(OBJS)\splittree_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)\splittree_tree.obj :  .AUTODEPEND .\tree.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $<
-
diff --git a/contrib/samples/gizmos/splittree/mondrian.ico b/contrib/samples/gizmos/splittree/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/contrib/samples/gizmos/splittree/mondrian.ico and /dev/null differ
diff --git a/contrib/samples/gizmos/splittree/mondrian.xpm b/contrib/samples/gizmos/splittree/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/contrib/samples/gizmos/splittree/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/contrib/samples/gizmos/splittree/splittree.bkl b/contrib/samples/gizmos/splittree/splittree.bkl
deleted file mode 100644
index 87d3a66639..0000000000
--- a/contrib/samples/gizmos/splittree/splittree.bkl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="splittree" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            tree.cpp
-        </sources>
-        <contrib-lib>gizmos</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/gizmos/splittree/splittree.dsp b/contrib/samples/gizmos/splittree/splittree.dsp
deleted file mode 100644
index 96caa4e337..0000000000
--- a/contrib/samples/gizmos/splittree/splittree.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="splittree" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=splittree - 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 "splittree.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 "splittree.mak" CFG="splittree - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "splittree - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "splittree - 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)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\splittree.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\splittree.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\splittree.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\splittree.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\splittree.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\splittree.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\splittree.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\splittree.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\splittree.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\splittree.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\splittree.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\splittree.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\splittree.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\splittree.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\splittree.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\splittree.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\splittree.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\splittree.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 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_gizmos.lib wxmswuniv29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\splittree.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\splittree.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 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_gizmos.lib wxmswuniv29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\splittree.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\splittree.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 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_gizmos.lib wxmswuniv29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\splittree.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\splittree.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 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_gizmos.lib wxmswuniv29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\splittree.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\splittree.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 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_gizmos.lib wxmsw29u_core.lib wxbase29u.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\splittree.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\splittree.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 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_gizmos.lib wxmsw29ud_core.lib wxbase29ud.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\splittree.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\splittree.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 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_gizmos.lib wxmsw29_core.lib wxbase29.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\splittree.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "splittree - 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\splittree"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\splittree"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\splittree.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\splittree.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 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_gizmos.lib wxmsw29d_core.lib wxbase29d.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\splittree.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "splittree - Win32 DLL Universal Unicode Release"
-# Name "splittree - Win32 DLL Universal Unicode Debug"
-# Name "splittree - Win32 DLL Universal Release"
-# Name "splittree - Win32 DLL Universal Debug"
-# Name "splittree - Win32 DLL Unicode Release"
-# Name "splittree - Win32 DLL Unicode Debug"
-# Name "splittree - Win32 DLL Release"
-# Name "splittree - Win32 DLL Debug"
-# Name "splittree - Win32 Universal Unicode Release"
-# Name "splittree - Win32 Universal Unicode Debug"
-# Name "splittree - Win32 Universal Release"
-# Name "splittree - Win32 Universal Debug"
-# Name "splittree - Win32 Unicode Release"
-# Name "splittree - Win32 Unicode Debug"
-# Name "splittree - Win32 Release"
-# Name "splittree - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\..\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\tree.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
deleted file mode 100644
index e5aa658f1f..0000000000
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        tree.cpp
-// Purpose:     Minimal wxWidgets sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// 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
-
-#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
-/* Closed folder */
-static char * icon1_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"   s None  c None",
-".  c #000000",
-"+  c #c0c0c0",
-"@  c #808080",
-"#  c #ffff00",
-"$  c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
-
-/* File */
-static char * icon2_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 3 1",
-/* colors */
-"     s None    c None",
-".    c #000000",
-"+    c #ffffff",
-/* pixels */
-"                ",
-"  ........      ",
-"  .++++++..     ",
-"  .+.+.++.+.    ",
-"  .++++++....   ",
-"  .+.+.+++++.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  ...........   ",
-"                ",
-"                "};
-#endif
-
-#include "wx/imaglist.h"
-#include "tree.h"
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-// the application icon
-#ifndef __WXMSW__
-    #include "mondrian.xpm"
-#endif
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWidgets events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
-    EVT_MENU(Minimal_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
-
-// Create a new application object: this macro will allow wxWidgets to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-// not wxApp)
-IMPLEMENT_APP(MyApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool MyApp::OnInit()
-{
-    // create the main application window
-    MyFrame *frame = new MyFrame(wxT("Tree Testing"),
-                                 wxPoint(50, 50), wxSize(450, 340));
-
-    // and show it (the frames, unlike simple controls, are not shown when
-    // created initially)
-    frame->Show(true);
-
-    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned false here, the
-    // application would exit immediately.
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, idMAIN_FRAME, title, pos, size)
-{
-    m_splitter = NULL;
-    m_scrolledWindow = NULL;
-    m_tree = NULL;
-    m_valueWindow = NULL;
-#ifdef __WXMAC__
-    // we need this in order to allow the about menu relocation, since ABOUT is
-    // not the default id of the about menu
-    wxApp::s_macAboutMenuItemId = Minimal_About;
-#endif
-
-    m_scrolledWindow = new wxSplitterScrolledWindow(this, idSCROLLED_WINDOW, wxDefaultPosition,
-        wxSize(300, 400), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL);
-    m_splitter = new wxThinSplitterWindow(m_scrolledWindow, idSPLITTER_WINDOW, wxDefaultPosition,
-        wxDefaultSize, wxSP_3DBORDER | wxCLIP_CHILDREN /* | wxSP_LIVE_UPDATE */);
-    m_splitter->SetSashSize(2);
-
-    /* Note the wxTR_ROW_LINES style: draws horizontal lines between items */
-    m_tree = new TestTree(m_splitter , idTREE_CTRL, wxDefaultPosition,
-        wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxNO_BORDER | wxTR_ROW_LINES );
-    m_valueWindow = new TestValueWindow(m_splitter, idVALUE_WINDOW, wxDefaultPosition,
-        wxDefaultSize, wxNO_BORDER);
-    m_splitter->SplitVertically(m_tree, m_valueWindow);
-    //m_splitter->AdjustScrollbars();
-    m_splitter->SetSashPosition(200);
-    m_scrolledWindow->SetTargetWindow(m_tree);
-
-    m_scrolledWindow->EnableScrolling(false, false);
-
-    // Let the two controls know about each other
-    m_valueWindow->SetTreeCtrl(m_tree);
-    m_tree->SetCompanionWindow(m_valueWindow);
-
-    // set the frame icon
-    SetIcon(wxICON(mondrian));
-
-    // create a menu bar
-    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
-
-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(Minimal_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
-
-    menuFile->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, wxT("&File"));
-    menuBar->Append(helpMenu, wxT("&Help"));
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-}
-
-
-// event handlers
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( wxT("This is the about dialog of splittree sample.\n")
-                wxT("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, wxT("About Tree Test"), wxOK | wxICON_INFORMATION, this);
-}
-
-/*
- * TesTree
- */
-
-IMPLEMENT_CLASS(TestTree, wxRemotelyScrolledTreeCtrl)
-
-BEGIN_EVENT_TABLE(TestTree, wxRemotelyScrolledTreeCtrl)
-END_EVENT_TABLE()
-
-TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt,
-        const wxSize& sz, long style):
-        wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
-{
-    m_imageList = new wxImageList(16, 16, true);
-#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
-    m_imageList->Add(wxIcon(icon1_xpm));
-    m_imageList->Add(wxIcon(icon2_xpm));
-#elif defined(__WXMSW__)
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
-#else
-#error "Sorry, we don't have icons available for this platforms."
-#endif
-    SetImageList(m_imageList);
-
-
-    // Add some dummy items
-    wxTreeItemId rootId = AddRoot(_("Root"), -1, -1);
-    int i;
-    for (i = 1; i <= 20; i++)
-    {
-        wxString label;
-        label.Printf(wxT("Item %d"), i);
-        wxTreeItemId id = AppendItem(rootId, label, 0);
-        //SetItemImage( id, 1, wxTreeItemIcon_Expanded );
-
-        int j;
-        for (j = 0; j < 10; j++)
-            AppendItem(id, _("Child"), 1);
-    }
-    Expand(rootId);
-}
-
-TestTree::~TestTree()
-{
-    SetImageList(NULL);
-    delete m_imageList;
-}
-
-/*
- * TestValueWindow
- */
-
-//IMPLEMENT_CLASS(TestValueWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(TestValueWindow, wxTreeCompanionWindow)
-END_EVENT_TABLE()
-
-TestValueWindow::TestValueWindow(wxWindow* parent, wxWindowID id,
-      const wxPoint& pos,
-      const wxSize& sz,
-      long style):
-      wxTreeCompanionWindow(parent, id, pos, sz, style)
-{
-    SetBackgroundColour(* wxWHITE);
-}
diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h
deleted file mode 100644
index 8110e00ae5..0000000000
--- a/contrib/samples/gizmos/splittree/tree.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        tree.h
-// Purpose:     Testing tree functionality
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _TREE_H_
-#define _TREE_H_
-
-#include "wx/wx.h"
-#include "wx/gizmos/splittree.h"
-
-class TestValueWindow;
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
-    // override base class virtuals
-    // ----------------------------
-
-    // this one is called on application startup and is a good place for the app
-    // initialization (doing it here and not in the ctor allows to have an error
-    // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
-    // ctor(s)
-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-
-    // event handlers (these functions should _not_ be virtual)
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-protected:
-    wxRemotelyScrolledTreeCtrl*        m_tree;
-    wxThinSplitterWindow*   m_splitter;
-    wxSplitterScrolledWindow* m_scrolledWindow;
-    //wxScrolledWindow* m_scrolledWindow;
-    TestValueWindow*        m_valueWindow;
-
-private:
-    // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
-    // menu items
-    Minimal_Quit = 100,
-    Minimal_About
-};
-
-#define idTREE_CTRL         2000
-#define idSPLITTER_WINDOW   2001
-#define idVALUE_WINDOW      2002
-#define idMAIN_FRAME        2003
-#define idSCROLLED_WINDOW   2004
-
-class TestTree: public wxRemotelyScrolledTreeCtrl
-{
-    DECLARE_CLASS(TestTree)
-public:
-    TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
-        const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
-    ~TestTree();
-
-    DECLARE_EVENT_TABLE()
-protected:
-    wxImageList* m_imageList;
-};
-
-class TestValueWindow: public wxTreeCompanionWindow
-{
-public:
-    TestValueWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
-      const wxPoint& pos = wxDefaultPosition,
-      const wxSize& sz = wxDefaultSize,
-      long style = 0);
-
-//// Overrides
-
-//// Events
-
-//// Data members
-protected:
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-
-#endif
-        // _TREE_H_
diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
deleted file mode 100644
index f913a6cf66..0000000000
--- a/contrib/samples/mmedia/Makefile.in
+++ /dev/null
@@ -1,199 +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@
-EXTRALIBS_ESD = @EXTRALIBS_ESD@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MMBOARD_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)
-MMBOARD_OBJECTS =  \
-	$(__mmboard_os2_lib_res) \
-	mmboard_mmboard.o \
-	mmboard_mmbman.o \
-	$(__mmboard___win32rc)
-
-### 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@__mmboard___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C mmboard$(EXEEXT)
-@COND_PLATFORM_MAC_1@__mmboard___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___mmboard___os2_emxbindcmd = $(NM) mmboard$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep mmboard$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__mmboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mmboard___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_OS2_1@__mmboard_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle
-@COND_TOOLKIT_COCOA@____mmboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	mmboard.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____mmboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	mmboard.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@__mmboard___win32rc = mmboard_mmboard_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 = $(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 mmboard$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: mmboard$(EXEEXT) $(__mmboard_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f mmboard$(EXEEXT)
-	rm -rf mmboard.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
-	$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__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)
-	$(__mmboard___mac_rezcmd)
-	$(__mmboard___mac_setfilecmd)
-	$(__mmboard___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p mmboard.app/Contents
-	mkdir -p mmboard.app/Contents/MacOS
-	mkdir -p mmboard.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/mmboard/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >mmboard.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >mmboard.app/Contents/PkgInfo
-	
-	
-	ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@mmboard_bundle: $(____mmboard_BUNDLE_TGT_REF_DEP)
-
-mmboard_mmboard.o: $(srcdir)/mmboard.cpp
-	$(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $(srcdir)/mmboard.cpp
-
-mmboard_mmbman.o: $(srcdir)/mmbman.cpp
-	$(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $(srcdir)/mmbman.cpp
-
-mmboard_mmboard_rc.o: $(srcdir)/mmboard.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 --include-dir $(srcdir)/../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean mmboard_bundle
diff --git a/contrib/samples/mmedia/descrip.mms b/contrib/samples/mmedia/descrip.mms
deleted file mode 100644
index d7e86d2e6a..0000000000
--- a/contrib/samples/mmedia/descrip.mms
+++ /dev/null
@@ -1,30 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-.else
-CXX_DEFINE =
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-	$(MMS)$(MMSQUALIFIERS) minimal.exe
-
-minimal.exe : minimal.obj
-.ifdef __WXMOTIF__
-	cxxlink minimal,[--.lib]vms/opt
-.endif
-
-minimal.obj : minimal.cpp
diff --git a/contrib/samples/mmedia/eject.xpm b/contrib/samples/mmedia/eject.xpm
deleted file mode 100644
index 890cc6b53b..0000000000
--- a/contrib/samples/mmedia/eject.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * eject_xpm[] = {
-"15 16 5 1",
-" 	c None",
-".	c #949594",
-"+	c #000000",
-"@	c #FFFFFF",
-"#	c #8E8E8E",
-"       .       ",
-"      .+@      ",
-"     .+++@     ",
-"    .+++++@    ",
-"   .+++++++@   ",
-"  .+++++++++@  ",
-" .+++++++++++@ ",
-".+############@",
-".@@@@@@@@@@@@@@",
-"               ",
-"...............",
-".++++++++++++#@",
-".++++++++++++#@",
-".++++++++++++#@",
-".+############@",
-".@@@@@@@@@@@@@@"};
diff --git a/contrib/samples/mmedia/makefile.bcc b/contrib/samples/mmedia/makefile.bcc
deleted file mode 100644
index 1525be11b1..0000000000
--- a/contrib/samples/mmedia/makefile.bcc
+++ /dev/null
@@ -1,238 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_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)
-MMBOARD_OBJECTS =  \
-	$(OBJS)\mmboard_mmboard.obj \
-	$(OBJS)\mmboard_mmbman.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)\mmboard.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)\mmboard.exe del $(OBJS)\mmboard.exe
-	-if exist $(OBJS)\mmboard.tds del $(OBJS)\mmboard.tds
-	-if exist $(OBJS)\mmboard.ilc del $(OBJS)\mmboard.ilc
-	-if exist $(OBJS)\mmboard.ild del $(OBJS)\mmboard.ild
-	-if exist $(OBJS)\mmboard.ilf del $(OBJS)\mmboard.ilf
-	-if exist $(OBJS)\mmboard.ils del $(OBJS)\mmboard.ils
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS)  $(OBJS)\mmboard_mmboard.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(MMBOARD_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.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)\mmboard_mmboard.res
-|
-
-$(OBJS)\mmboard_mmboard.obj: .\mmboard.cpp
-	$(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmbman.obj: .\mmbman.cpp
-	$(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmboard.res: .\mmboard.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 -dNOPCH -i.\..\..\include $**
-
diff --git a/contrib/samples/mmedia/makefile.gcc b/contrib/samples/mmedia/makefile.gcc
deleted file mode 100644
index 88fbb8e576..0000000000
--- a/contrib/samples/mmedia/makefile.gcc
+++ /dev/null
@@ -1,237 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_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)
-MMBOARD_OBJECTS =  \
-	$(OBJS)\mmboard_mmboard.o \
-	$(OBJS)\mmboard_mmbman.o \
-	$(OBJS)\mmboard_mmboard_rc.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)\mmboard.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\mmboard.exe del $(OBJS)\mmboard.exe
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard_rc.o
-	$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia  $(__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)\mmboard_mmboard.o: ./mmboard.cpp
-	$(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmboard_mmbman.o: ./mmbman.cpp
-	$(CXX) -c -o $@ $(MMBOARD_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\mmboard_mmboard_rc.o: ./mmboard.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 --define NOPCH --include-dir ./../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/mmedia/makefile.vc b/contrib/samples/mmedia/makefile.vc
deleted file mode 100644
index c577e10df7..0000000000
--- a/contrib/samples/mmedia/makefile.vc
+++ /dev/null
@@ -1,313 +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 = 29
-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)
-MMBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\mmboard.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)
-MMBOARD_OBJECTS =  \
-	$(OBJS)\mmboard_mmboard.obj \
-	$(OBJS)\mmboard_mmbman.obj \
-	$(OBJS)\mmboard_mmboard.res
-
-### 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)\mmboard.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)\mmboard.exe del $(OBJS)\mmboard.exe
-	-if exist $(OBJS)\mmboard.ilk del $(OBJS)\mmboard.ilk
-	-if exist $(OBJS)\mmboard.pdb del $(OBJS)\mmboard.pdb
-
-$(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(MMBOARD_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.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)\mmboard_mmboard.obj: .\mmboard.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmbman.obj: .\mmbman.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
-
-$(OBJS)\mmboard_mmboard.res: .\mmboard.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 /d NOPCH /i .\..\..\include $**
-
diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat
deleted file mode 100644
index 6740808dd4..0000000000
--- a/contrib/samples/mmedia/makefile.wat
+++ /dev/null
@@ -1,266 +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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-MMBOARD_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)
-MMBOARD_OBJECTS =  &
-	$(OBJS)\mmboard_mmboard.obj &
-	$(OBJS)\mmboard_mmbman.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\mmboard.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)\mmboard.exe del $(OBJS)\mmboard.exe
-
-$(OBJS)\mmboard.exe :  $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
-	@%create $(OBJS)\mmboard.lbc
-	@%append $(OBJS)\mmboard.lbc option quiet
-	@%append $(OBJS)\mmboard.lbc name $^@
-	@%append $(OBJS)\mmboard.lbc option caseexact
-	@%append $(OBJS)\mmboard.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(MMBOARD_OBJECTS)) do @%append $(OBJS)\mmboard.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.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)\mmboard.lbc library %i
-	@%append $(OBJS)\mmboard.lbc option resource=$(OBJS)\mmboard_mmboard.res
-	@for %i in () do @%append $(OBJS)\mmboard.lbc option stack=%i
-	wlink @$(OBJS)\mmboard.lbc
-
-$(OBJS)\mmboard_mmboard.obj :  .AUTODEPEND .\mmboard.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
-
-$(OBJS)\mmboard_mmbman.obj :  .AUTODEPEND .\mmbman.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
-
-$(OBJS)\mmboard_mmboard.res :  .AUTODEPEND .\mmboard.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 -dNOPCH -i=.\..\..\include $<
-
diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp
deleted file mode 100644
index 3014ef2a1a..0000000000
--- a/contrib/samples/mmedia/mmbman.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mmbman.cpp
-// Purpose:     Multimedia Board manager
-// Author:      Guilhem Lavaux, <guilhem.lavaux@libertysurf.fr>
-// Modified by:
-// Created:     13/02/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000, Guilhem Lavaux
-// 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
-
-// Personal headers
-
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndwav.h"
-#include "wx/mmedia/sndaiff.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/sndmsad.h"
-
-#ifdef __UNIX__
-#include "wx/mmedia/sndoss.h"
-#include "wx/mmedia/sndesd.h"
-#endif
-
-#ifdef __WIN32__
-#include "wx/mmedia/sndwin.h"
-#endif
-
-#include "wx/mmedia/vidbase.h"
-#ifdef __UNIX__
-#include "wx/mmedia/vidxanm.h"
-#endif
-
-#ifdef __WIN32__
-#include "wx/mmedia/vidwin.h"
-#endif
-
-#include "mmboard.h"
-#include "mmbman.h"
-
-// ----------------------------------------------------------------------------
-// Private class definitions
-// ----------------------------------------------------------------------------
-
-class MMBoardSoundFile: public MMBoardFile {
-public:
-    MMBoardSoundFile(const wxString& filename);
-    ~MMBoardSoundFile();
-
-    bool NeedWindow();
-
-    void SetWindow(wxWindow *window);
-
-    void Play();
-    void Pause();
-    void Resume();
-    void Stop();
-
-    MMBoardTime GetPosition();
-    MMBoardTime GetLength();
-    void SetPosition(MMBoardTime btime);
-
-    bool IsStopped();
-    bool IsPaused();
-
-    wxString GetStringType();
-    wxString GetStringInformation();
-
-protected:
-    wxSoundFileStream *GetDecoder();
-
-    wxSoundStream *m_output_stream;
-    wxInputStream *m_input_stream;
-    wxSoundFileStream *m_file_stream;
-
-    MMBoardTime m_length;
-    wxUint8 m_file_type;
-};
-
-class MMBoardVideoFile: public MMBoardFile {
-public:
-    MMBoardVideoFile(const wxString& filename);
-    ~MMBoardVideoFile();
-
-    bool NeedWindow();
-
-    void SetWindow(wxWindow *window);
-
-    void Play();
-    void Pause();
-    void Resume();
-    void Stop();
-
-    MMBoardTime GetPosition();
-    MMBoardTime GetLength();
-    void SetPosition(MMBoardTime btime);
-
-    bool IsStopped();
-    bool IsPaused();
-
-    wxString GetStringType();
-    wxString GetStringInformation();
-
-protected:
-    wxWindow *m_output_window;
-    wxVideoBaseDriver *m_video_driver;
-};
-
-// ----------------------------------------------------------------------------
-// Implementation
-// ----------------------------------------------------------------------------
-
-#define MMBoard_UNKNOWNTYPE 0
-#define MMBoard_WAVE 1
-#define MMBoard_AIFF 2
-
-// ----------------------------------------------------------------------------
-// MMBoardSoundFile
-
-MMBoardSoundFile::MMBoardSoundFile(const wxString& filename)
-  : MMBoardFile()
-{
-    m_input_stream = new wxFileInputStream(filename);
-    m_output_stream = MMBoardManager::OpenSoundStream();
-
-    m_file_stream = GetDecoder();
-
-    if (!m_file_stream) {
-        SetError(MMBoard_UnknownFile);
-        return;
-    }
-
-    // Compute length
-    wxUint32 length, seconds;
-
-    length = m_file_stream->GetLength();
-    seconds = m_file_stream->GetSoundFormat().GetTimeFromBytes(length);
-    m_length.seconds = seconds % 60;
-    m_length.minutes = (seconds / 60) % 60;
-    m_length.hours   = seconds / 3600;
-}
-
-MMBoardSoundFile::~MMBoardSoundFile()
-{
-    if (m_file_stream)
-        delete m_file_stream;
-    MMBoardManager::UnrefSoundStream(m_output_stream);
-    delete m_input_stream;
-}
-
-wxSoundFileStream *MMBoardSoundFile::GetDecoder()
-{
-    wxSoundFileStream *f_stream;
-
-    // First, we try a Wave decoder
-    f_stream = new wxSoundWave(*m_input_stream, *m_output_stream);
-    m_file_type = MMBoard_WAVE;
-    if (f_stream->CanRead())
-        return f_stream;
-    delete f_stream;
-
-    // Then, a AIFF decoder
-    f_stream = new wxSoundAiff(*m_input_stream, *m_output_stream);
-    m_file_type = MMBoard_AIFF;
-    if (f_stream->CanRead())
-        return f_stream;
-    delete f_stream;
-
-    m_file_type = MMBoard_UNKNOWNTYPE;
-
-    // TODO: automate
-
-    return NULL;
-}
-
-MMBoardTime MMBoardSoundFile::GetLength()
-{
-    return m_length;
-}
-
-bool MMBoardSoundFile::IsStopped()
-{
-    return m_file_stream->IsStopped();
-}
-
-bool MMBoardSoundFile::IsPaused()
-{
-    return m_file_stream->IsPaused();
-}
-
-MMBoardTime MMBoardSoundFile::GetPosition()
-{
-    wxUint32 length, seconds;
-    MMBoardTime file_time;
-
-    file_time.seconds = file_time.minutes = file_time.hours = 0;
-    if (m_file_stream->IsStopped())
-        return file_time;
-
-    length = m_file_stream->GetPosition();
-    seconds = m_file_stream->GetSoundFormat().GetTimeFromBytes(length);
-    file_time.seconds = seconds % 60;
-    file_time.minutes = (seconds / 60) % 60;
-    file_time.hours   = seconds / 3600;
-
-    return file_time;
-}
-
-void MMBoardSoundFile::SetPosition(MMBoardTime btime)
-{
-    wxUint32 itime;
-
-    itime = btime.seconds + btime.minutes * 60 + btime.hours;
-
-    m_file_stream->SetPosition(
-        m_file_stream->GetSoundFormat().GetBytesFromTime(itime)
-        );
-}
-
-bool MMBoardSoundFile::NeedWindow()
-{
-    return false;
-}
-
-void MMBoardSoundFile::SetWindow(wxWindow *WXUNUSED(window))
-{
-}
-
-void MMBoardSoundFile::Play()
-{
-    m_file_stream->Play();
-}
-
-void MMBoardSoundFile::Pause()
-{
-    m_file_stream->Pause();
-}
-
-void MMBoardSoundFile::Resume()
-{
-    m_file_stream->Resume();
-}
-
-void MMBoardSoundFile::Stop()
-{
-    m_file_stream->Stop();
-}
-
-wxString MMBoardSoundFile::GetStringType()
-{
-    switch (m_file_type) {
-        case MMBoard_WAVE:
-            return wxString(wxT("WAVE file"));
-            #if 0
-            // break is not reachable after return
-            break;
-            #endif
-        case MMBoard_AIFF:
-            return wxString(wxT("AIFF file"));
-            #if 0
-            // break is not reachable after return
-            break;
-            #endif
-        #if 0
-        // default moved outside switch for those compilers
-        // which complain about lack of return in function
-        default:
-            return wxString(wxT("Unknown file"));
-            break;
-        #endif
-    }
-    return wxString(wxT("Unknown file"));
-}
-
-wxString MMBoardSoundFile::GetStringInformation()
-{
-    wxString info;
-    wxSoundFormatBase *format;
-
-    format = &(m_file_stream->GetSoundFormat());
-
-    info = wxT("Data encoding: ");
-    switch (format->GetType()) {
-    case wxSOUND_PCM: {
-        wxSoundFormatPcm *pcm_format = (wxSoundFormatPcm *)format;
-
-    info += wxString::Format(wxT("PCM %s %s\n"),
-                                 pcm_format->Signed() ? wxT("signed") : wxT("unsigned"),
-                                 pcm_format->GetOrder() == wxLITTLE_ENDIAN ? wxT("little endian") : wxT("big endian"));
-    info += wxString::Format(wxT("Sampling rate: %d\n")
-                 wxT("Bits per sample: %d\n")
-                 wxT("Number of channels: %d\n"),
-                 pcm_format->GetSampleRate(),
-                 pcm_format->GetBPS(),
-                 pcm_format->GetChannels());
-
-    break;
-    }
-    case wxSOUND_MSADPCM: {
-        wxSoundFormatMSAdpcm *adpcm_format = (wxSoundFormatMSAdpcm *)format;
-
-        info += wxString::Format(wxT("Microsoft ADPCM\n"));
-        info += wxString::Format(wxT("Sampling Rate: %d\n")
-                                 wxT("Number of channels: %d\n"),
-                                 adpcm_format->GetSampleRate(),
-                                 adpcm_format->GetChannels());
-        break;
-    }
-    case wxSOUND_ULAW: {
-        wxSoundFormatUlaw *ulaw_format = (wxSoundFormatUlaw *)format;
-        info += wxT("ULAW\n");
-        info += wxString::Format(wxT("Sampling rate: %d\n"), ulaw_format->GetSampleRate());
-        break;
-    }
-    default:
-        info += wxT("Unknown");
-        break;
-    }
-    return info;
-}
-
-// ----------------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------------
-// MMBoardVideoFile
-
-MMBoardVideoFile::MMBoardVideoFile(const wxString& filename)
-{
-    m_output_window = NULL;
-
-#if defined(__UNIX__) && !defined(__CYGWIN__)
-    m_video_driver = new wxVideoXANIM(filename);
-#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
-    // versions of Open Watcom and MinGW tested against this source does not
-    // deliver "digitalv.h" required in this feature
-    m_video_driver = new wxVideoWindows(filename);
-#else
-    wxUnusedVar(filename);
-    m_video_driver = NULL;
-    SetError(MMBoard_UnknownFile);
-#endif
-}
-
-MMBoardVideoFile::~MMBoardVideoFile()
-{
-    if (m_video_driver)
-        delete m_video_driver;
-}
-
-bool MMBoardVideoFile::NeedWindow()
-{
-    return true;
-}
-
-void MMBoardVideoFile::SetWindow(wxWindow *window)
-{
-    m_output_window = window;
-    m_video_driver->AttachOutput(*window);
-
-    wxSize size;
-    m_video_driver->GetSize(size);
-    window->SetSize(size);
-    // BAD BAD
-    // and we remove
-    // window->GetParent()->GetSizer()->Fit(window->GetParent());
-}
-
-void MMBoardVideoFile::Play()
-{
-    m_video_driver->Play();
-}
-
-void MMBoardVideoFile::Pause()
-{
-    m_video_driver->Pause();
-}
-
-void MMBoardVideoFile::Resume()
-{
-    m_video_driver->Resume();
-}
-
-void MMBoardVideoFile::Stop()
-{
-    m_video_driver->Stop();
-}
-
-MMBoardTime MMBoardVideoFile::GetPosition()
-{
-    MMBoardTime btime;
-
-    btime.seconds = btime.minutes = btime.hours = 0;
-    return btime;
-}
-
-MMBoardTime MMBoardVideoFile::GetLength()
-{
-    MMBoardTime btime;
-    int frameTime;
-
-    frameTime = (int)( m_video_driver->GetNbFrames() / m_video_driver->GetFrameRate());
-
-    btime.seconds = frameTime % 60;
-    btime.minutes = (frameTime / 60) % 60;
-    btime.hours   = frameTime / 3600;
-    return btime;
-}
-
-void MMBoardVideoFile::SetPosition(MMBoardTime WXUNUSED(btime))
-{
-}
-
-bool MMBoardVideoFile::IsStopped()
-{
-    return m_video_driver->IsStopped();
-}
-
-bool MMBoardVideoFile::IsPaused()
-{
-    return m_video_driver->IsPaused();
-}
-
-wxString MMBoardVideoFile::GetStringType()
-{
-    return wxString(wxT("Video XANIM"));
-}
-
-wxString MMBoardVideoFile::GetStringInformation()
-{
-    wxString info;
-
-    info = wxT("Video codec: ");
-    info += m_video_driver->GetMovieCodec() + _T("\n");
-    info += wxT("Audio codec: ");
-    info += m_video_driver->GetAudioCodec();
-    info += wxString::Format(_T(" Sample rate: %d Channels: %d\n"), m_video_driver->GetSampleRate(),
-                             m_video_driver->GetBPS());
-    info += wxString::Format(_T(" Frame rate: %.01f"), m_video_driver->GetFrameRate());
-    return info;
-}
-
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// MMBoardFile
-
-MMBoardFile::MMBoardFile()
-{
-  m_error = 0;
-}
-
-MMBoardFile::~MMBoardFile()
-{
-}
-
-//
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// MMBoardManager
-
-MMBoardFile *MMBoardManager::Open(const wxString& filename)
-{
-  MMBoardFile *file;
-
-  // Test the audio codec
-  file = new MMBoardSoundFile(filename);
-  if (!file->GetError())
-    return file;
-  delete file;
-
-  // Test the video codec
-  file = new MMBoardVideoFile(filename);
-  if (!file->GetError())
-    return file;
-  delete file;
-
-  // Arrrgh, we just could not see what is that file ...
-  return NULL;
-}
-
-DECLARE_APP(MMBoardApp)
-
-wxSoundStream *MMBoardManager::OpenSoundStream()
-{
-#ifdef __WIN32__
-  if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
-    return new wxSoundStreamWin();
-#elif __UNIX__
-  if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0)
-    return new wxSoundStreamESD();
-
-  if ((wxGetApp().m_caps & MM_SOUND_OSS) != 0)
-    return new wxSoundStreamOSS();
-#endif
-
-  wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL);
-
-  return NULL;
-}
-
-void MMBoardManager::UnrefSoundStream(wxSoundStream *stream)
-{
-  delete stream;
-}
-
-// ----------------------------------------------------------------------------
-
diff --git a/contrib/samples/mmedia/mmbman.h b/contrib/samples/mmedia/mmbman.h
deleted file mode 100644
index e4f7b5e7f6..0000000000
--- a/contrib/samples/mmedia/mmbman.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mmbman.h
-// Purpose:     Multimedia Board manager
-// Author:      Guilhem Lavaux, <guilhem.lavaux@libertysurf.fr>
-// Modified by:
-// Created:     13/02/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000, Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MMBMAN_APP_H_
-#define _MMBMAN_APP_H_
-
-#include "wx/stream.h"
-#include "wx/mmedia/sndbase.h"
-
-// -------------------------------------------------------------------------
-// Base structure definitions
-// -------------------------------------------------------------------------
-
-typedef struct {
-  wxUint8 seconds, minutes, hours;
-} MMBoardTime;
-
-// -------------------------------------------------------------------------
-// Constants
-// -------------------------------------------------------------------------
-
-#define MMBoard_NoError 0
-#define MMBoard_UnknownFile 1
-
-// -------------------------------------------------------------------------
-// Interface definition: MMBoardFile
-// -------------------------------------------------------------------------
-
-class MMBoardFile {
- public:
-  MMBoardFile();
-  virtual ~MMBoardFile();
-
-  virtual bool NeedWindow() = 0;
-
-  virtual void SetWindow(wxWindow *window) = 0;
-
-  virtual void Play() = 0;
-  virtual void Pause() = 0;
-  virtual void Resume() = 0;
-  virtual void Stop() = 0;
-
-  virtual MMBoardTime GetPosition() = 0;
-  virtual MMBoardTime GetLength() = 0;
-  virtual void SetPosition(MMBoardTime btime) = 0;
-
-  virtual bool IsStopped() = 0;
-  virtual bool IsPaused() = 0;
-
-  virtual wxString GetStringType() = 0;
-  virtual wxString GetStringInformation() = 0;
-
-  void SetError(wxUint8 error) { m_error = error; }
-  wxUint8 GetError() const { return m_error; }
-
- protected:
-  wxUint8 m_error;
-};
-
-// -------------------------------------------------------------------------
-// Main manager
-// -------------------------------------------------------------------------
-
-class MMBoardManager {
- public:
-  static MMBoardFile *Open(const wxString& filename);
-
-  static wxSoundStream *OpenSoundStream();
-  static void UnrefSoundStream(wxSoundStream *stream);
-};
-
-#endif
diff --git a/contrib/samples/mmedia/mmboard.bkl b/contrib/samples/mmedia/mmboard.bkl
deleted file mode 100644
index 4b1c94cad1..0000000000
--- a/contrib/samples/mmedia/mmboard.bkl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <if cond="FORMAT=='autoconf'">
-        <option name="EXTRALIBS_ESD"/>
-    </if>
-
-    <exe id="mmboard" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            mmboard.cpp
-            mmbman.cpp
-        </sources>
-        <contrib-lib>mmedia</contrib-lib>
-        <ldlibs cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldlibs>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>mmboard.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
deleted file mode 100644
index 62bf71c08c..0000000000
--- a/contrib/samples/mmedia/mmboard.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mmboard.cpp
-// Purpose:     Multimedia Library sample
-// Author:      Guilhem Lavaux (created from minimal by J. Smart)
-// Modified by:
-// Created:     13/02/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// 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
-
-// ----------------------------------------------------------------------------
-// ressources
-// ----------------------------------------------------------------------------
-
-// the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    #include "mondrian.xpm"
-#endif
-
-// include multimedia classes
-#include "wx/mmedia/sndbase.h"
-#ifdef __WIN32__
-    #include "wx/mmedia/sndwin.h"
-#endif
-#ifdef __UNIX__
-    #include "wx/mmedia/sndoss.h"
-    #include "wx/mmedia/sndesd.h"
-#endif
-
-#include "wx/statline.h"
-#include "wx/stattext.h"
-
-// include personnal classes
-#include "mmboard.h"
-#include "mmbman.h"
-
-#include "play.xpm"
-#include "stop.xpm"
-#include "eject.xpm"
-#include "pause.xpm"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// Main Multimedia Board frame
-class MMBoardFrame : public wxFrame
-{
-public:
-    // ctor(s)
-    MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-    // dtor
-    ~MMBoardFrame();
-
-    // event handlers
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnOpen(wxCommandEvent& event);
-    void OnPlay(wxCommandEvent& event);
-    void OnStop(wxCommandEvent& event);
-    void OnPause(wxCommandEvent& event);
-    void OnEject(wxCommandEvent& event);
-    void OnRefreshInfo(wxEvent& event);
-    void OnSetPosition(wxCommandEvent& event);
-
-    void OpenVideoWindow();
-    void CloseVideoWindow();
-
-private:
-    // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
-
-private:
-    void UpdateMMedInfo();
-    void UpdateInfoText();
-
-    MMBoardFile *m_opened_file;
-
-    wxSlider *m_positionSlider;
-    wxBitmapButton *m_playButton, *m_pauseButton, *m_stopButton, *m_ejectButton;
-    wxStaticText *m_fileType, *m_infoText;
-    wxWindow *m_video_window;
-
-    wxPanel *m_panel;
-    wxSizer *m_sizer;
-
-    wxTimer *m_refreshTimer;
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
-    // menu items
-    MMBoard_Quit = 1,
-    MMBoard_Open,
-    MMBoard_About,
-    MMBoard_PositionSlider,
-    MMBoard_PlayButton,
-    MMBoard_PauseButton,
-    MMBoard_ResumeButton,
-    MMBoard_StopButton,
-    MMBoard_EjectButton,
-    MMBoard_RefreshInfo
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
-  EVT_MENU(MMBoard_Quit,  MMBoardFrame::OnQuit)
-  EVT_MENU(MMBoard_About, MMBoardFrame::OnAbout)
-  EVT_MENU(MMBoard_Open, MMBoardFrame::OnOpen)
-  EVT_BUTTON(MMBoard_PlayButton, MMBoardFrame::OnPlay)
-  EVT_BUTTON(MMBoard_StopButton, MMBoardFrame::OnStop)
-  EVT_BUTTON(MMBoard_PauseButton, MMBoardFrame::OnPause)
-  EVT_BUTTON(MMBoard_EjectButton, MMBoardFrame::OnEject)
-  EVT_SLIDER(MMBoard_PositionSlider, MMBoardFrame::OnSetPosition)
-  EVT_CUSTOM(wxEVT_TIMER, MMBoard_RefreshInfo, MMBoardFrame::OnRefreshInfo)
-END_EVENT_TABLE()
-
-// ---------------------------------------------------------------------------
-// Main board application launcher
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_APP(MMBoardApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-bool MMBoardApp::OnInit()
-{
-    // create the main application window
-    MMBoardFrame *frame = new MMBoardFrame(_T("Multimedia Board"),
-                                 wxPoint(50, 50), wxSize(450, 340));
-
-    // and show it (the frames, unlike simple controls, are not shown when
-    // created initially)
-    frame->Show();
-
-    m_caps = TestMultimediaCaps();
-
-    if (!m_caps) {
-      wxMessageBox(_T("Your system has no multimedia capabilities. We are exiting now."), _T("Major error !"), wxOK | wxICON_ERROR, NULL);
-      return false;
-    }
-
-    wxString msg;
-    msg.Printf(_T("Detected : %s%s%s"), (m_caps & MM_SOUND_OSS) ? _T("OSS ") : _T(""),
-                                (m_caps & MM_SOUND_ESD) ? _T("ESD ") : _T(""),
-                                (m_caps & MM_SOUND_WIN) ? _T("WIN") : _T(""));
-
-    wxMessageBox(msg, _T("Good !"), wxOK | wxICON_INFORMATION, NULL);
-
-    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned false here, the
-    // application would exit immediately.
-    return true;
-}
-
-wxUint8 MMBoardApp::TestMultimediaCaps()
-{
-    wxSoundStream *dev;
-    wxUint8 caps;
-
-    caps = 0;
-
-#ifdef __WIN32__
-    // We test the Windows sound support.
-
-    dev = new wxSoundStreamWin();
-    if (dev->GetError() == wxSOUND_NOERROR)
-        caps |= MM_SOUND_WIN;
-    delete dev;
-
-#elif defined __UNIX__
-    // We now test the ESD support
-
-    dev = new wxSoundStreamESD();
-    if (dev->GetError() == wxSOUND_NOERROR)
-        caps |= MM_SOUND_ESD;
-    delete dev;
-
-    // We test the OSS (Open Sound System) support.
-    // WARNING: There is a conflict between ESD and ALSA. We may be interrested
-    // in disabling the auto detection of OSS is ESD has been detected.
-#if 1
-    if (!(caps & MM_SOUND_ESD)) {
-#endif
-
-    dev = new wxSoundStreamOSS();
-    if (dev->GetError() == wxSOUND_NOERROR)
-        caps |= MM_SOUND_OSS;
-    delete dev;
-#if 1
-    }
-#endif
-
-#endif
-
-    return caps;
-}
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
-{
-#ifdef __WXMAC__
-    // we need this in order to allow the about menu relocation, since ABOUT is
-    // not the default id of the about menu
-    wxApp::s_macAboutMenuItemId = MMBoard_About;
-#endif
-
-    // set the frame icon
-    SetIcon(wxICON(mondrian));
-
-    // create a menu bar
-    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
-
-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(MMBoard_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
-
-    menuFile->Append(MMBoard_Open, wxT("&Open\tAlt-O"), wxT("Open file"));
-    menuFile->AppendSeparator();
-    menuFile->Append(MMBoard_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, wxT("&File"));
-    menuBar->Append(helpMenu, wxT("&Help"));
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-
-#if wxUSE_STATUSBAR
-    // create a status bar just for fun (by default with 1 pane only)
-    CreateStatusBar(3);
-    SetStatusText(wxT("Welcome to wxWidgets!"));
-#endif // wxUSE_STATUSBAR
-
-    // Misc variables
-    m_opened_file = NULL;
-
-    m_panel = new wxPanel(this, wxID_ANY);
-
-    // Initialize main slider
-    m_positionSlider = new wxSlider( m_panel, MMBoard_PositionSlider, 0, 0, 60,
-                     wxDefaultPosition, wxSize(300, wxDefaultCoord),
-                     wxSL_HORIZONTAL | wxSL_AUTOTICKS);
-    m_positionSlider->SetPageSize(60);  // 60 secs
-    m_positionSlider->Disable();
-
-    // Initialize info panel
-    wxPanel *infoPanel = new wxPanel( m_panel, wxID_ANY);
-    infoPanel->SetBackgroundColour(*wxBLACK);
-    infoPanel->SetForegroundColour(*wxWHITE);
-
-    wxBoxSizer *infoSizer = new wxBoxSizer(wxVERTICAL);
-
-    m_fileType = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);
-#if wxUSE_STATLINE
-    wxStaticLine *line = new wxStaticLine(infoPanel, wxID_ANY);
-#endif // wxUSE_STATLINE
-    m_infoText = new wxStaticText(infoPanel, wxID_ANY, wxEmptyString);
-
-    UpdateInfoText();
-
-    infoSizer->Add(m_fileType, 0, wxGROW | wxALL, 1);
-#if wxUSE_STATLINE
-    infoSizer->Add(line, 0, wxGROW | wxCENTRE, 20);
-#endif // wxUSE_STATLINE
-    infoSizer->Add(m_infoText, 0, wxGROW | wxALL, 1);
-
-    infoPanel->SetSizer(infoSizer);
-
-    // Bitmap button panel
-    wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-
-    wxBitmap play_bmp(play_back_xpm);
-    wxBitmap stop_bmp(stop_back_xpm);
-    wxBitmap eject_bmp(eject_xpm);
-    wxBitmap pause_bmp(pause_xpm);
-
-    m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, play_bmp);
-    m_playButton->Disable();
-    m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, pause_bmp);
-    m_pauseButton->Disable();
-    m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, stop_bmp);
-    m_stopButton->Disable();
-    m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, eject_bmp);
-    m_ejectButton->Disable();
-
-    buttonSizer->Add(m_playButton, 0, wxALL, 2);
-    buttonSizer->Add(m_pauseButton, 0, wxALL, 2);
-    buttonSizer->Add(m_stopButton, 0, wxALL, 2);
-    buttonSizer->Add(m_ejectButton, 0, wxALL, 2);
-
-    // Top sizer
-    m_sizer = new wxBoxSizer(wxVERTICAL);
-#if wxUSE_STATLINE
-    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
-    m_sizer->Add(m_positionSlider, 0, wxCENTRE | wxGROW | wxALL, 2);
-#if wxUSE_STATLINE
-    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
-    m_sizer->Add(buttonSizer, 0, wxALL, 0);
-#if wxUSE_STATLINE
-    m_sizer->Add(new wxStaticLine(m_panel, wxID_ANY), 0, wxGROW | wxCENTRE, 0);
-#endif // wxUSE_STATLINE
-    m_sizer->Add(infoPanel, 1, wxCENTRE | wxGROW, 0);
-
-    m_panel->SetSizer(m_sizer);
-    m_sizer->Fit(this);
-    m_sizer->SetSizeHints(this);
-
-    // Timer
-    m_refreshTimer = new wxTimer(this, MMBoard_RefreshInfo);
-
-    // Video window
-    m_video_window = NULL;
-
-    // Multimedia file
-    m_opened_file = NULL;
-}
-
-MMBoardFrame::~MMBoardFrame()
-{
-    if (m_opened_file)
-        delete m_opened_file;
-
-    delete m_refreshTimer;
-}
-
-void MMBoardFrame::OpenVideoWindow()
-{
-  if (m_video_window)
-    return;
-
-  m_video_window = new wxWindow(m_panel, wxID_ANY, wxDefaultPosition, wxSize(200, 200));
-  m_video_window->SetBackgroundColour(*wxBLACK);
-  m_sizer->Prepend(m_video_window, 2, wxGROW | wxSHRINK | wxCENTRE, 1);
-
-  m_sizer->Fit(this);
-}
-
-void MMBoardFrame::CloseVideoWindow()
-{
-    if (!m_video_window)
-        return;
-
-    m_sizer->Detach( m_video_window );
-    delete m_video_window;
-    m_video_window = NULL;
-
-    m_sizer->Fit(this);
-}
-
-// event handlers
-
-void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
-                wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
-        wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
-
-    wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
-}
-
-void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
-{
-    wxString selected_file;
-
-    if (m_opened_file) {
-        if (!m_opened_file->IsStopped()) {
-            wxCommandEvent event2;
-            OnStop(event2);
-        }
-        delete m_opened_file;
-    }
-
-    // select a file to be opened
-#if wxUSE_FILEDLG
-    selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this);
-#endif // wxUSE_FILEDLG
-    if (selected_file.empty())
-        return;
-
-    m_opened_file = MMBoardManager::Open(selected_file);
-
-    // Change the range values of the slider.
-    MMBoardTime length;
-
-    length = m_opened_file->GetLength();
-    m_positionSlider->SetRange(0, length.hours * 3600 + length.minutes * 60 + length.seconds);
-
-    // Update misc info
-    UpdateMMedInfo();
-
-#if wxUSE_STATUSBAR
-    SetStatusText(selected_file, 2);
-#endif // wxUSE_STATUSBAR
-
-    // Update info text
-    UpdateInfoText();
-
-    // Enable a few buttons
-    m_playButton->Enable();
-    m_ejectButton->Enable();
-    m_positionSlider->Enable();
-
-    if (m_opened_file->NeedWindow()) {
-        OpenVideoWindow();
-        m_opened_file->SetWindow(m_video_window);
-    } else
-        CloseVideoWindow();
-}
-
-void MMBoardFrame::UpdateInfoText()
-{
-    wxString infotext1, infotext2;
-
-    if (m_opened_file) {
-        infotext1 = wxT("File type:\n\t");
-        infotext1 += m_opened_file->GetStringType() + wxT("\n");
-
-        infotext2 = wxT("File informations:\n\n");
-        infotext2 += m_opened_file->GetStringInformation();
-    } else {
-        infotext1 = wxT("File type: \n\tNo file opened");
-        infotext2 = wxT("File informations:\nNo information\n\n\n\n\n");
-    }
-
-    m_fileType->SetLabel(infotext1);
-    m_infoText->SetLabel(infotext2);
-}
-
-void MMBoardFrame::UpdateMMedInfo()
-{
-    MMBoardTime current, length;
-
-    if (m_opened_file) {
-        current = m_opened_file->GetPosition();
-        length  = m_opened_file->GetLength();
-    } else {
-        current.hours = current.minutes = current.seconds = 0;
-        length = current;
-    }
-
-#if wxUSE_STATUSBAR
-    // We refresh the status bar
-    wxString temp_string;
-    temp_string.Printf(wxT("%02d:%02d / %02d:%02d"), current.hours * 60 + current.minutes,
-                       current.seconds, length.hours * 60 + length.minutes, length.seconds);
-    SetStatusText(temp_string, 1);
-#else
-    wxUnusedVar(length);
-#endif // wxUSE_STATUSBAR
-
-    // We set the slider position
-    m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);
-}
-
-// ----------------------------------------------------------------------------
-// Playing management, refreshers, ...
-
-void MMBoardFrame::OnRefreshInfo(wxEvent& WXUNUSED(event))
-{
-    UpdateMMedInfo();
-
-    if (m_opened_file->IsStopped())
-    {
-        m_refreshTimer->Stop();
-        m_playButton->Enable();
-        m_stopButton->Disable();
-        m_pauseButton->Disable();
-    }
-}
-
-void MMBoardFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
-{
-    m_stopButton->Enable();
-    m_pauseButton->Enable();
-    m_playButton->Disable();
-
-    if (m_opened_file->IsPaused())
-    {
-        m_opened_file->Resume();
-        return;
-    }
-
-    m_refreshTimer->Start(1000, false);
-
-    m_opened_file->Play();
-
-    m_stopButton->Enable();
-    m_pauseButton->Enable();
-    m_playButton->Disable();
-}
-
-void MMBoardFrame::OnStop(wxCommandEvent& WXUNUSED(event))
-{
-    m_opened_file->Stop();
-    m_refreshTimer->Stop();
-
-    m_stopButton->Disable();
-    m_playButton->Enable();
-
-    UpdateMMedInfo();
-}
-
-void MMBoardFrame::OnPause(wxCommandEvent& WXUNUSED(event))
-{
-    m_opened_file->Pause();
-
-    m_playButton->Enable();
-    m_pauseButton->Disable();
-}
-
-void MMBoardFrame::OnEject(wxCommandEvent& WXUNUSED(event))
-{
-    m_opened_file->Stop();
-
-    delete m_opened_file;
-    m_opened_file = NULL;
-
-    m_playButton->Disable();
-    m_pauseButton->Disable();
-    m_stopButton->Disable();
-    m_ejectButton->Disable();
-    m_positionSlider->Disable();
-
-    UpdateInfoText();
-    UpdateMMedInfo();
-}
-
-void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event))
-{
-    wxUint32 itime;
-    MMBoardTime btime;
-
-    itime = m_positionSlider->GetValue();
-    btime.seconds = itime % 60;
-    btime.minutes = (itime / 60) % 60;
-    btime.hours = itime / 3600;
-    m_opened_file->SetPosition(btime);
-
-    UpdateMMedInfo();
-}
diff --git a/contrib/samples/mmedia/mmboard.dsp b/contrib/samples/mmedia/mmboard.dsp
deleted file mode 100644
index 87157327e2..0000000000
--- a/contrib/samples/mmedia/mmboard.dsp
+++ /dev/null
@@ -1,484 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mmboard" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=mmboard - 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 "mmboard.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 "mmboard.mak" CFG="mmboard - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mmboard - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "mmboard - 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)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\mmboard.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\mmboard.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 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mmboard.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\mmboard.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 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\mmboard.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\mmboard.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 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mmboard.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\mmboard.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 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\mmboard.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\mmboard.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 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mmboard.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\mmboard.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 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\mmboard.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\mmboard.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 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\mmboard.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\mmboard.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 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\mmboard.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\mmboard.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 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_mmedia.lib wxmswuniv29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mmboard.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\mmboard.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 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_mmedia.lib wxmswuniv29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\mmboard.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\mmboard.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 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_mmedia.lib wxmswuniv29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mmboard.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\mmboard.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 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_mmedia.lib wxmswuniv29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\mmboard.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\mmboard.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 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_mmedia.lib wxmsw29u_core.lib wxbase29u.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\mmboard.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\mmboard.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 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_mmedia.lib wxmsw29ud_core.lib wxbase29ud.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\mmboard.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\mmboard.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 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_mmedia.lib wxmsw29_core.lib wxbase29.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\mmboard.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "mmboard - 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\mmboard"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\mmboard"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\mmboard.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\mmboard.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 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_mmedia.lib wxmsw29d_core.lib wxbase29d.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\mmboard.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "mmboard - Win32 DLL Universal Unicode Release"
-# Name "mmboard - Win32 DLL Universal Unicode Debug"
-# Name "mmboard - Win32 DLL Universal Release"
-# Name "mmboard - Win32 DLL Universal Debug"
-# Name "mmboard - Win32 DLL Unicode Release"
-# Name "mmboard - Win32 DLL Unicode Debug"
-# Name "mmboard - Win32 DLL Release"
-# Name "mmboard - Win32 DLL Debug"
-# Name "mmboard - Win32 Universal Unicode Release"
-# Name "mmboard - Win32 Universal Unicode Debug"
-# Name "mmboard - Win32 Universal Release"
-# Name "mmboard - Win32 Universal Debug"
-# Name "mmboard - Win32 Unicode Release"
-# Name "mmboard - Win32 Unicode Debug"
-# Name "mmboard - Win32 Release"
-# Name "mmboard - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mmbman.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/mmedia/mmboard.h b/contrib/samples/mmedia/mmboard.h
deleted file mode 100644
index e66596cbe0..0000000000
--- a/contrib/samples/mmedia/mmboard.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mmboard.h
-// Purpose:     Multimedia Board header
-// Author:      Guilhem Lavaux, <guilhem.lavaux@libertysurf.fr>
-// Modified by:
-// Created:     13/02/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000, Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MMBOARD_APP_H_
-#define _MMBOARD_APP_H_
-
-// 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
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-// --------------------------------------------------------------------------
-// constants
-// --------------------------------------------------------------------------
-
-#define MM_SOUND_OSS 0x01
-#define MM_SOUND_ESD 0x02
-#define MM_SOUND_WIN 0x04
-
-// --------------------------------------------------------------------------
-// Class definitions
-// --------------------------------------------------------------------------
-
-// Define a new application type, each program should derive a class from wxApp
-class MMBoardApp : public wxApp
-{
-public:
-  wxUint8 m_caps;
-
-  // override base class virtuals
-  // ----------------------------
-
-  virtual bool OnInit();
-
-  wxUint8 TestMultimediaCaps();
-};
-
-#endif
diff --git a/contrib/samples/mmedia/mmboard.rc b/contrib/samples/mmedia/mmboard.rc
deleted file mode 100644
index 3bf71d6da0..0000000000
--- a/contrib/samples/mmedia/mmboard.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-#define MINIMAL_QUIT 	1
-#define MINIMAL_ABOUT 	102
-
diff --git a/contrib/samples/mmedia/mmboard.rc0 b/contrib/samples/mmedia/mmboard.rc0
deleted file mode 100644
index 96d3b9cc7b..0000000000
--- a/contrib/samples/mmedia/mmboard.rc0
+++ /dev/null
@@ -1,6 +0,0 @@
-ICON     1   PRELOAD   "mondros2.ico"
-#include "H:\DEV\WX2\wxWindows\include\wx\os2\wx.rc"
-
-#define MINIMAL_QUIT 	1
-#define MINIMAL_ABOUT 	102
-
diff --git a/contrib/samples/mmedia/mondrian.ico b/contrib/samples/mmedia/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/contrib/samples/mmedia/mondrian.ico and /dev/null differ
diff --git a/contrib/samples/mmedia/mondrian.xpm b/contrib/samples/mmedia/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/contrib/samples/mmedia/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/contrib/samples/mmedia/mondros2.ico b/contrib/samples/mmedia/mondros2.ico
deleted file mode 100644
index 8b0e58c0d7..0000000000
Binary files a/contrib/samples/mmedia/mondros2.ico and /dev/null differ
diff --git a/contrib/samples/mmedia/pause.xpm b/contrib/samples/mmedia/pause.xpm
deleted file mode 100644
index 2283f242ab..0000000000
--- a/contrib/samples/mmedia/pause.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * pause_xpm[] = {
-"13 15 5 1",
-" 	c None",
-".	c #949594",
-"+	c #000000",
-"@	c #8E8E8E",
-"#	c #FFFFFF",
-"...... ......",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+@@@# .+@@@#",
-".##### .#####"};
diff --git a/contrib/samples/mmedia/play.xpm b/contrib/samples/mmedia/play.xpm
deleted file mode 100644
index 5b7db49baf..0000000000
--- a/contrib/samples/mmedia/play.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * play_back_xpm[] = {
-"13 15 5 1",
-" 	c None",
-".	c #949594",
-"+	c #000000",
-"@	c #8E8E8E",
-"#	c #FFFFFF",
-"......       ",
-".+++++.      ",
-".++++++.     ",
-".+++++++.    ",
-".++++++++.   ",
-".+++++++++.  ",
-".++++++++++. ",
-".++++++++++@#",
-".+++++++++@# ",
-".++++++++@#  ",
-".+++++++@#   ",
-".++++++@#    ",
-".+++++@#     ",
-".+@@@@#      ",
-".#####       "};
diff --git a/contrib/samples/mmedia/stop.xpm b/contrib/samples/mmedia/stop.xpm
deleted file mode 100644
index 2d159d0376..0000000000
--- a/contrib/samples/mmedia/stop.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * stop_back_xpm[] = {
-"13 15 5 1",
-" 	c None",
-".	c #949594",
-"+	c #000000",
-"@	c #8E8E8E",
-"#	c #FFFFFF",
-".............",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".+@@@@@@@@@@#",
-".############"};
diff --git a/contrib/samples/ogl/Makefile.in b/contrib/samples/ogl/Makefile.in
deleted file mode 100644
index e53c85784e..0000000000
--- a/contrib/samples/ogl/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile : Builds wxWindows utils for Unix.
-#
-
-OGL_SAMPLES=ogledit studio
-
-all:
-	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE) clean); done
-
diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
deleted file mode 100644
index d09c377523..0000000000
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ /dev/null
@@ -1,206 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-OGLEDIT_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)
-OGLEDIT_OBJECTS =  \
-	$(__ogledit_os2_lib_res) \
-	ogledit_ogledit.o \
-	ogledit_doc.o \
-	ogledit_view.o \
-	ogledit_palette.o \
-	$(__ogledit___win32rc)
-
-### 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@__ogledit___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C ogledit$(EXEEXT)
-@COND_PLATFORM_MAC_1@__ogledit___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___ogledit___os2_emxbindcmd = $(NM) ogledit$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep ogledit$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__ogledit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ogledit___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_OS2_1@__ogledit_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle
-@COND_TOOLKIT_COCOA@____ogledit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	ogledit.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____ogledit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	ogledit.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@__ogledit___win32rc = ogledit_ogledit_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 = $(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 ogledit$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: ogledit$(EXEEXT) $(__ogledit_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f ogledit$(EXEEXT)
-	rm -rf ogledit.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
-	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
-	$(__ogledit___mac_rezcmd)
-	$(__ogledit___mac_setfilecmd)
-	$(__ogledit___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p ogledit.app/Contents
-	mkdir -p ogledit.app/Contents/MacOS
-	mkdir -p ogledit.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/ogledit/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >ogledit.app/Contents/PkgInfo
-	
-	
-	ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@ogledit_bundle: $(____ogledit_BUNDLE_TGT_REF_DEP)
-
-ogledit_ogledit.o: $(srcdir)/ogledit.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/ogledit.cpp
-
-ogledit_doc.o: $(srcdir)/doc.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/doc.cpp
-
-ogledit_view.o: $(srcdir)/view.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/view.cpp
-
-ogledit_palette.o: $(srcdir)/palette.cpp
-	$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $(srcdir)/palette.cpp
-
-ogledit_ogledit_rc.o: $(srcdir)/ogledit.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean ogledit_bundle
diff --git a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm b/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
deleted file mode 100644
index d3807cbf4e..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *arrow_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"####### ##############",
-"#######  #############",
-"#######   ############",
-"#######    ###########",
-"#######     ##########",
-"#######      #########",
-"#######       ########",
-"#######        #######",
-"#######     ##########",
-"#######  #  ##########",
-"####### ###  #########",
-"###########  #########",
-"############  ########",
-"############  ########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
deleted file mode 100644
index 89a313d94c..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool1_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"#                   ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"#                   ##",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
deleted file mode 100644
index 612dbf01bb..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool2_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"####             #####",
-"### ::::::::::::: ####",
-"## ::::::::::::::: ###",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"## ::::::::::::::: ###",
-"### ::::::::::::: ####",
-"####             #####",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
deleted file mode 100644
index 7ba078573c..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool3_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"#######       ########",
-"####   :::::::   #####",
-"### ::::::::::::: ####",
-"## ::::::::::::::: ###",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"# ::::::::::::::::: ##",
-"## ::::::::::::::: ###",
-"### ::::::::::::: ####",
-"####   :::::::   #####",
-"######        ########",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
deleted file mode 100644
index 154e93b832..0000000000
--- a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *tool4_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 16 1",
-"  c Gray0",
-". c #bf0000",
-"X c #00bf00",
-"o c #bfbf00",
-"O c #0000bf",
-"+ c #bf00bf",
-"@ c #00bfbf",
-"# c #c0c0c0",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"##########  ##########",
-"######### :: #########",
-"######## :::: ########",
-"####### :::::: #######",
-"###### :::::::: ######",
-"##### :::::::::: #####",
-"#### :::::::::::: ####",
-"### :::::::::::::: ###",
-"### :::::::::::::: ###",
-"#### :::::::::::: ####",
-"##### :::::::::: #####",
-"###### :::::::: ######",
-"####### :::::: #######",
-"######## :::: ########",
-"######### :: #########",
-"##########  ##########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
deleted file mode 100644
index 9133a0844d..0000000000
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ /dev/null
@@ -1,622 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/doc.cpp
-// Purpose:     Implements document functionality in OGLEdit
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ioswrap.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "doc.h"
-#include "view.h"
-
-IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
-
-DiagramDocument::DiagramDocument(void)
-{
-}
-
-DiagramDocument::~DiagramDocument(void)
-{
-}
-
-bool DiagramDocument::OnCloseDocument(void)
-{
-    diagram.DeleteAllShapes();
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
-{
-#if wxUSE_PROLOGIO
-
-    wxDocument::SaveObject(stream);
-
-    char buf[400];
-    (void) wxGetTempFileName("diag", buf);
-
-    diagram.SaveFile(buf);
-    wxTransferFileToStream(buf, stream);
-
-    wxRemoveFile(buf);
-
-#endif
-
-    return stream;
-}
-
-wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
-{
-#if wxUSE_PROLOGIO
-
-    wxDocument::LoadObject(stream);
-
-    char buf[400];
-    (void) wxGetTempFileName("diag", buf);
-
-    wxTransferStreamToFile(stream, buf);
-
-    diagram.DeleteAllShapes();
-    diagram.LoadFile(buf);
-    wxRemoveFile(buf);
-
-#endif
-
-    return stream;
-}
-#else
-
-wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
-{
-#if wxUSE_PROLOGIO
-
-    wxDocument::SaveObject(stream);
-    wxChar buf[400];
-    (void) wxGetTempFileName(_T("diag"), buf);
-
-    diagram.SaveFile(buf);
-
-    wxTransferFileToStream(buf, stream);
-
-    wxRemoveFile(buf);
-
-#endif
-
-    return stream;
-}
-
-wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
-{
-#if wxUSE_PROLOGIO
-    wxDocument::LoadObject(stream);
-
-    wxChar buf[400];
-    (void) wxGetTempFileName(_T("diag"), buf);
-
-    wxTransferStreamToFile(stream, buf);
-
-    diagram.DeleteAllShapes();
-    diagram.LoadFile(buf);
-    wxRemoveFile(buf);
-#endif
-
-    return stream;
-}
-
-#endif
-
-/*
- * Implementation of drawing command
- */
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
-                               bool sel, wxShape *theShape, wxShape *fs, wxShape *ts)
-               :wxCommand(true, name)
-{
-    doc = ddoc;
-    cmd = command;
-    shape = theShape;
-    fromShape = fs;
-    toShape = ts;
-    shapeInfo = info;
-    shapeBrush = NULL;
-    shapePen = NULL;
-    x = xx;
-    y = yy;
-    selected = sel;
-    deleteShape = false;
-}
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape)
-               :wxCommand(true, name)
-{
-    doc = ddoc;
-    cmd = command;
-    shape = theShape;
-    fromShape = NULL;
-    toShape = NULL;
-    shapeInfo = NULL;
-    x = 0.0;
-    y = 0.0;
-    selected = false;
-    deleteShape = false;
-    shapeBrush = backgroundColour;
-    shapePen = NULL;
-}
-
-DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape)
-               :wxCommand(true, name)
-{
-    doc = ddoc;
-    cmd = command;
-    shape = theShape;
-    fromShape = NULL;
-    toShape = NULL;
-    shapeInfo = NULL;
-    x = 0.0;
-    y = 0.0;
-    selected = false;
-    deleteShape = false;
-    shapeBrush = NULL;
-    shapePen = NULL;
-    shapeLabel = lab;
-}
-
-DiagramCommand::~DiagramCommand(void)
-{
-  if (shape && deleteShape)
-  {
-    shape->SetCanvas(NULL);
-    delete shape;
-  }
-}
-
-bool DiagramCommand::Do(void)
-{
-  switch (cmd)
-  {
-    case wxID_CUT:
-    {
-      if (shape)
-      {
-        deleteShape = true;
-
-        shape->Select(false);
-
-        // Generate commands to explicitly remove each connected line.
-        RemoveLines(shape);
-
-        doc->GetDiagram()->RemoveShape(shape);
-        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-          wxLineShape *lineShape = (wxLineShape *)shape;
-          fromShape = lineShape->GetFrom();
-          toShape = lineShape->GetTo();
-        }
-        shape->Unlink();
-
-        doc->Modify(true);
-        doc->UpdateAllViews();
-      }
-
-      break;
-    }
-    case OGLEDIT_ADD_SHAPE:
-    {
-      wxShape *theShape;
-      if (shape)
-        theShape = shape; // Saved from undoing the shape
-      else
-      {
-        theShape = (wxShape *)shapeInfo->CreateObject();
-        theShape->AssignNewIds();
-        theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
-        theShape->SetCentreResize(false);
-        theShape->SetPen(wxBLACK_PEN);
-        theShape->SetBrush(wxCYAN_BRUSH);
-
-        theShape->SetSize(60, 60);
-      }
-      doc->GetDiagram()->AddShape(theShape);
-      theShape->Show(true);
-
-      wxClientDC dc(theShape->GetCanvas());
-      theShape->GetCanvas()->PrepareDC(dc);
-
-      theShape->Move(dc, x, y);
-
-      shape = theShape;
-      deleteShape = false;
-
-      doc->Modify(true);
-      doc->UpdateAllViews();
-      break;
-    }
-    case OGLEDIT_ADD_LINE:
-    {
-      wxShape *theShape;
-      if (shape)
-        theShape = shape; // Saved from undoing the line
-      else
-      {
-        theShape = (wxShape *)shapeInfo->CreateObject();
-        theShape->AssignNewIds();
-        theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
-        theShape->SetPen(wxBLACK_PEN);
-        theShape->SetBrush(wxRED_BRUSH);
-
-        wxLineShape *lineShape = (wxLineShape *)theShape;
-
-        // Yes, you can have more than 2 control points, in which case
-        // it becomes a multi-segment line.
-        lineShape->MakeLineControlPoints(2);
-        lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_END, 10.0, 0.0, _T("Normal arrowhead"));
-      }
-
-      doc->GetDiagram()->AddShape(theShape);
-
-      fromShape->AddLine((wxLineShape *)theShape, toShape);
-
-      theShape->Show(true);
-
-      wxClientDC dc(theShape->GetCanvas());
-      theShape->GetCanvas()->PrepareDC(dc);
-
-      // It won't get drawn properly unless you move both
-      // connected images
-      fromShape->Move(dc, fromShape->GetX(), fromShape->GetY());
-      toShape->Move(dc, toShape->GetX(), toShape->GetY());
-
-      shape = theShape;
-      deleteShape = false;
-
-      doc->Modify(true);
-      doc->UpdateAllViews();
-      break;
-    }
-    case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
-    {
-      if (shape)
-      {
-        wxClientDC dc(shape->GetCanvas());
-        shape->GetCanvas()->PrepareDC(dc);
-
-        const wxBrush *oldBrush = shape->GetBrush();
-        shape->SetBrush(shapeBrush);
-        shapeBrush = oldBrush;
-        shape->Draw(dc);
-
-        doc->Modify(true);
-        doc->UpdateAllViews();
-      }
-
-      break;
-    }
-    case OGLEDIT_EDIT_LABEL:
-    {
-      if (shape)
-      {
-        MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
-        wxString oldLabel(myHandler->label);
-        myHandler->label = shapeLabel;
-        shapeLabel = oldLabel;
-
-        wxClientDC dc(shape->GetCanvas());
-        shape->GetCanvas()->PrepareDC(dc);
-
-        shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
-        shape->Draw(dc);
-
-        doc->Modify(true);
-        doc->UpdateAllViews();
-      }
-
-      break;
-    }
-  }
-  return true;
-}
-
-bool DiagramCommand::Undo(void)
-{
-  switch (cmd)
-  {
-    case wxID_CUT:
-    {
-      if (shape)
-      {
-        doc->GetDiagram()->AddShape(shape);
-        shape->Show(true);
-
-        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-          wxLineShape *lineShape = (wxLineShape *)shape;
-
-          fromShape->AddLine(lineShape, toShape);
-        }
-        if (selected)
-          shape->Select(true);
-
-        deleteShape = false;
-      }
-      doc->Modify(true);
-      doc->UpdateAllViews();
-      break;
-    }
-    case OGLEDIT_ADD_SHAPE:
-    case OGLEDIT_ADD_LINE:
-    {
-      if (shape)
-      {
-        wxClientDC dc(shape->GetCanvas());
-        shape->GetCanvas()->PrepareDC(dc);
-
-        shape->Select(false, &dc);
-        doc->GetDiagram()->RemoveShape(shape);
-        shape->Unlink();
-        deleteShape = true;
-      }
-      doc->Modify(true);
-      doc->UpdateAllViews();
-      break;
-    }
-    case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
-    {
-      if (shape)
-      {
-        wxClientDC dc(shape->GetCanvas());
-        shape->GetCanvas()->PrepareDC(dc);
-
-        const wxBrush *oldBrush = shape->GetBrush();
-        shape->SetBrush(shapeBrush);
-        shapeBrush = oldBrush;
-        shape->Draw(dc);
-
-        doc->Modify(true);
-        doc->UpdateAllViews();
-      }
-      break;
-    }
-    case OGLEDIT_EDIT_LABEL:
-    {
-      if (shape)
-      {
-        MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
-        wxString oldLabel(myHandler->label);
-        myHandler->label = shapeLabel;
-        shapeLabel = oldLabel;
-
-        wxClientDC dc(shape->GetCanvas());
-        shape->GetCanvas()->PrepareDC(dc);
-
-        shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
-        shape->Draw(dc);
-
-        doc->Modify(true);
-        doc->UpdateAllViews();
-      }
-
-      break;
-    }
-  }
-  return true;
-}
-
-// Remove each individual line connected to a shape by sending a command.
-void DiagramCommand::RemoveLines(wxShape *shape)
-{
-  wxObjectList::compatibility_iterator node = shape->GetLines().GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
-
-    node = shape->GetLines().GetFirst();
-  }
-}
-
-/*
- * MyEvtHandler: an event handler class for all shapes
- */
-
-void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  if (keys == 0)
-  {
-    // Selection is a concept the library knows about
-    if (GetShape()->Selected())
-    {
-      GetShape()->Select(false, &dc);
-      GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
-    }
-    else
-    {
-      // Ensure no other shape is selected, to simplify Undo/Redo code
-      bool redraw = false;
-      wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
-      while (node)
-      {
-        wxShape *eachShape = (wxShape *)node->GetData();
-        if (eachShape->GetParent() == NULL)
-        {
-          if (eachShape->Selected())
-          {
-            eachShape->Select(false, &dc);
-            redraw = true;
-          }
-        }
-        node = node->GetNext();
-      }
-      GetShape()->Select(true, &dc);
-      if (redraw)
-        GetShape()->GetCanvas()->Redraw(dc);
-    }
-  }
-  else if (keys & KEY_CTRL)
-  {
-    // Do something for CONTROL
-  }
-  else
-  {
-#if wxUSE_STATUSBAR
-    wxGetApp().frame->SetStatusText(label);
-#endif // wxUSE_STATUSBAR
-  }
-}
-
-/*
- * Implement connection of two shapes by right-dragging between them.
- */
-
-void MyEvtHandler::OnBeginDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
-  // Force attachment to be zero for now. Eventually we can deal with
-  // the actual attachment point, e.g. a rectangle side if attachment mode is on.
-  attachment = 0;
-
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetLogicalFunction(OGLRBLF);
-  dc.SetPen(dottedPen);
-  double xp, yp;
-  GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
-  dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
-  GetShape()->GetCanvas()->CaptureMouse();
-}
-
-void MyEvtHandler::OnDragRight(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int attachment)
-{
-  // Force attachment to be zero for now
-  attachment = 0;
-
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetLogicalFunction(OGLRBLF);
-  dc.SetPen(dottedPen);
-  double xp, yp;
-  GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
-  dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
-}
-
-void MyEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  GetShape()->GetCanvas()->ReleaseMouse();
-  MyCanvas *canvas = (MyCanvas *)GetShape()->GetCanvas();
-
-  // Check if we're on an object
-  int new_attachment;
-  wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
-
-  if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
-  {
-    canvas->view->GetDocument()->GetCommandProcessor()->Submit(
-      new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
-      0.0, 0.0, false, NULL, GetShape(), otherShape));
-  }
-}
-
-void MyEvtHandler::OnEndSize(double WXUNUSED(x), double WXUNUSED(y))
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  GetShape()->FormatText(dc, /* (char*) (const char*) */ label);
-}
-
-/*
- * Diagram
- */
-
-#if wxUSE_PROLOGIO
-
-bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
-  wxDiagram::OnShapeSave(db, shape, expr);
-  MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
-  expr.AddAttributeValueString(_T("label"), handler->label);
-  return true;
-}
-
-bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
-  wxDiagram::OnShapeLoad(db, shape, expr);
-  wxChar *label = NULL;
-  expr.AssignAttributeValue(_T("label"), &label);
-  MyEvtHandler *handler = new MyEvtHandler(&shape, &shape, wxString(label));
-  shape.SetEventHandler(handler);
-
-  if (label)
-    delete[] label;
-  return true;
-}
-
-#endif
-
-/*
- * New shapes
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxRoundedRectangleShape, wxRectangleShape)
-
-wxRoundedRectangleShape::wxRoundedRectangleShape(double w, double h):
- wxRectangleShape(w, h)
-{
-  // 0.3 of the smaller rectangle dimension
-  SetCornerRadius((double) -0.3);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDiamondShape, wxPolygonShape)
-
-wxDiamondShape::wxDiamondShape(double w, double h):
-  wxPolygonShape()
-{
-  // wxPolygonShape::SetSize relies on the shape having non-zero
-  // size initially.
-  if (w == 0.0)
-    w = 60.0;
-  if (h == 0.0)
-    h = 60.0;
-
-  wxList *thePoints = new wxList;
-  wxRealPoint *point = new wxRealPoint(0.0, (-h/2.0));
-  thePoints->Append((wxObject*) point);
-
-  point = new wxRealPoint((w/2.0), 0.0);
-  thePoints->Append((wxObject*) point);
-
-  point = new wxRealPoint(0.0, (h/2.0));
-  thePoints->Append((wxObject*) point);
-
-  point = new wxRealPoint((-w/2.0), 0.0);
-  thePoints->Append((wxObject*) point);
-
-  Create(thePoints);
-}
diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
deleted file mode 100644
index 741d4c7062..0000000000
--- a/contrib/samples/ogl/ogledit/doc.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/doc.h
-// Purpose:     Document classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_DOC_H_
-#define _OGLSAMPLE_DOC_H_
-
-#include "wx/docview.h"
-#include "wx/cmdproc.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-#if wxUSE_STD_IOSTREAM
- #include <iosfwd>
-#endif
-
-/*
- * Override a few members for this application
- */
-
-class MyDiagram: public wxDiagram
-{
- public:
-  MyDiagram(void) {}
-#if wxUSE_PROLOGIO
-  bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-  bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif
-};
-
-/*
- * A few new shape classes so we have a 1:1 mapping
- * between palette symbol and unique class
- */
-
-class wxRoundedRectangleShape: public wxRectangleShape
-{
-  DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)
- private:
- public:
-  wxRoundedRectangleShape(double w = 0.0, double h = 0.0);
-};
-
-class wxDiamondShape: public wxPolygonShape
-{
-  DECLARE_DYNAMIC_CLASS(wxDiamondShape)
- private:
- public:
-  wxDiamondShape(double w = 0.0, double h = 0.0);
-};
-
-/*
- * All shape event behaviour is routed through this handler, so we don't
- * have to derive from each shape class. We plug this in to each shape.
- */
-
-class MyEvtHandler: public wxShapeEvtHandler
-{
- public:
-  wxString label;
-  MyEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString):wxShapeEvtHandler(prev, shape)
-  {
-    label = lab;
-  }
-  ~MyEvtHandler(void)
-  {
-  }
-  void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-  void OnBeginDragRight(double x, double y, int keys = 0, int attachment = 0);
-  void OnDragRight(bool draw, double x, double y, int keys = 0, int attachment = 0);
-  void OnEndDragRight(double x, double y, int keys = 0, int attachment = 0);
-  void OnEndSize(double x, double y);
-};
-
-/*
- * A diagram document, which contains a diagram.
- */
-
-class DiagramDocument: public wxDocument
-{
-  DECLARE_DYNAMIC_CLASS(DiagramDocument)
- private:
- public:
-  MyDiagram diagram;
-
-  DiagramDocument(void);
-  ~DiagramDocument(void);
-
-#if wxUSE_STD_IOSTREAM
-    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
-    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
-#else
-    virtual wxOutputStream& SaveObject(wxOutputStream& stream);
-    virtual wxInputStream& LoadObject(wxInputStream& stream);
-#endif
-
-  inline wxDiagram *GetDiagram() { return &diagram; }
-
-  bool OnCloseDocument(void);
-};
-
-/*
- * Most user interface commands are routed through this, to give us the
- * Undo/Redo mechanism. If you add more commands, such as changing the shape colour,
- * you will need to add members to 'remember' what the user applied (for 'Do') and what the
- * previous state was (for 'Undo').
- * You can have one member for each property to be changed. Assume we also have
- * a pointer member wxShape *shape, which is set to the shape being changed.
- * Let's assume we're changing the shape colour. Our member for this is shapeColour.
- *
- * - In 'Do':
- *   o Set a temporary variable 'temp' to the current colour for 'shape'.
- *   o Change the colour to the new colour.
- *   o Set shapeColour to the _old_ colour, 'temp'.
- * - In 'Undo':
- *   o Set a temporary variable 'temp' to the current colour for 'shape'.
- *   o Change the colour to shapeColour (the old colour).
- *   o Set shapeColour to 'temp'.
- *
- * So, as long as we have a pointer to the shape being changed,
- * we only need one member variable for each property.
- *
- * PROBLEM: when an Add shape command is redone, the 'shape' pointer changes.
- * Assume, as here, that we keep a pointer to the old shape so we reuse it
- * when we recreate.
- */
-
-class DiagramCommand: public wxCommand
-{
- protected:
-  DiagramDocument *doc;
-  int cmd;
-  wxShape *shape; // Pointer to the shape we're acting on
-  wxShape *fromShape;
-  wxShape *toShape;
-  wxClassInfo *shapeInfo;
-  double x;
-  double y;
-  bool selected;
-  bool deleteShape;
-
-  // Storage for property commands
-  const wxBrush *shapeBrush;
-  wxPen *shapePen;
-  wxString shapeLabel;
- public:
-  // Multi-purpose constructor for creating, deleting shapes
-  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
-     double x = 0.0, double y = 0.0, bool sel = false, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
-
-  // Property-changing command constructors
-  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
-  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape);
-
-  ~DiagramCommand(void);
-
-  bool Do(void);
-  bool Undo(void);
-
-  inline void SetShape(wxShape *s) { shape = s; }
-  inline wxShape *GetShape(void) { return shape; }
-  inline wxShape *GetFromShape(void) { return fromShape; }
-  inline wxShape *GetToShape(void) { return toShape; }
-  inline wxClassInfo *GetShapeInfo(void) { return shapeInfo; }
-  inline bool GetSelected(void) { return selected; }
-
-  void RemoveLines(wxShape *shape);
-};
-
-#endif
-  // _OGLSAMPLE_DOC_H_
diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc
deleted file mode 100644
index c8a8166d75..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ /dev/null
@@ -1,247 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_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)
-OGLEDIT_OBJECTS =  \
-	$(OBJS)\ogledit_ogledit.obj \
-	$(OBJS)\ogledit_doc.obj \
-	$(OBJS)\ogledit_view.obj \
-	$(OBJS)\ogledit_palette.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)\ogledit.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)\ogledit.exe del $(OBJS)\ogledit.exe
-	-if exist $(OBJS)\ogledit.tds del $(OBJS)\ogledit.tds
-	-if exist $(OBJS)\ogledit.ilc del $(OBJS)\ogledit.ilc
-	-if exist $(OBJS)\ogledit.ild del $(OBJS)\ogledit.ild
-	-if exist $(OBJS)\ogledit.ilf del $(OBJS)\ogledit.ilf
-	-if exist $(OBJS)\ogledit.ils del $(OBJS)\ogledit.ils
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_ogledit.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\ogledit_ogledit.res
-|
-
-$(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
-	$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_doc.obj: .\doc.cpp
-	$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_view.obj: .\view.cpp
-	$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_palette.obj: .\palette.cpp
-	$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_ogledit.res: .\ogledit.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/ogledit/makefile.gcc b/contrib/samples/ogl/ogledit/makefile.gcc
deleted file mode 100644
index 2c84c8a9f4..0000000000
--- a/contrib/samples/ogl/ogledit/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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_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)
-OGLEDIT_OBJECTS =  \
-	$(OBJS)\ogledit_ogledit.o \
-	$(OBJS)\ogledit_doc.o \
-	$(OBJS)\ogledit_view.o \
-	$(OBJS)\ogledit_palette.o \
-	$(OBJS)\ogledit_ogledit_rc.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)\ogledit.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit_rc.o
-	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__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)\ogledit_ogledit.o: ./ogledit.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_doc.o: ./doc.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_view.o: ./view.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_palette.o: ./palette.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\ogledit_ogledit_rc.o: ./ogledit.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx
deleted file mode 100644
index 9972f16aee..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# File:		Makefile
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be 
-# installed (possibly using "make install")
-# on your system.
-#
-
-CXX = $(shell wx-config --cxx)
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=ogledit.o palette.o doc.o view.o
-
-ogledit: $(OBJECTS)
-	$(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-ogledit.o: ogledit.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
-
-palette.o: palette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
-
-doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-clean: 
-	rm -f *.o ogledit
diff --git a/contrib/samples/ogl/ogledit/makefile.vc b/contrib/samples/ogl/ogledit/makefile.vc
deleted file mode 100644
index 6f31f424f0..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.vc
+++ /dev/null
@@ -1,322 +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 = 29
-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)
-OGLEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.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)
-OGLEDIT_OBJECTS =  \
-	$(OBJS)\ogledit_ogledit.obj \
-	$(OBJS)\ogledit_doc.obj \
-	$(OBJS)\ogledit_view.obj \
-	$(OBJS)\ogledit_palette.obj \
-	$(OBJS)\ogledit_ogledit.res
-
-### 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)\ogledit.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)\ogledit.exe del $(OBJS)\ogledit.exe
-	-if exist $(OBJS)\ogledit.ilk del $(OBJS)\ogledit.ilk
-	-if exist $(OBJS)\ogledit.pdb del $(OBJS)\ogledit.pdb
-
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\ogledit_ogledit.obj: .\ogledit.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_doc.obj: .\doc.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_view.obj: .\view.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_palette.obj: .\palette.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
-
-$(OBJS)\ogledit_ogledit.res: .\ogledit.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/ogledit/makefile.vms b/contrib/samples/ogl/ogledit/makefile.vms
deleted file mode 100644
index 1a64fc7f30..0000000000
--- a/contrib/samples/ogl/ogledit/makefile.vms
+++ /dev/null
@@ -1,44 +0,0 @@
-#************************************************************************
-# Makefile for DOCVIEW under VMS
-# by Stefan Hammes
-# (incomplete) update history:
-# 09.06.95
-#************************************************************************
-
-#************************************************************************
-# Definition section
-# (cave: definitions and includes must begin with ',')
-#************************************************************************
-
-APPOPTS = 
-APPDEFS = 
-APPINCS = 
-
-#************************************************************************
-# Module section
-#************************************************************************
-
-# Name of main module
-MAIN = docview
-
-# Object modules of the application.
-OBJS = docview.obj view.obj doc.obj
-OBJLIST =docview.obj,view.obj,doc.obj
-
-.include [--.src]makevms.env
-
-# main dependency
-$(MAIN).exe : $(OBJS)
-    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
-    - purge *.exe
-
-#************************************************************************
-# Header file depedencies following
-#************************************************************************
-
-docview.$(OBJSUFF) :        docview.$(SRCSUFF) docview.h doc.h view.h
-
-doc.$(OBJSUFF) :        doc.$(SRCSUFF) doc.h
-
-view.$(OBJSUFF) :        view.$(SRCSUFF) view.h
-
diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat
deleted file mode 100644
index 729e27c800..0000000000
--- a/contrib/samples/ogl/ogledit/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-OGLEDIT_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)
-OGLEDIT_OBJECTS =  &
-	$(OBJS)\ogledit_ogledit.obj &
-	$(OBJS)\ogledit_doc.obj &
-	$(OBJS)\ogledit_view.obj &
-	$(OBJS)\ogledit_palette.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\ogledit.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)\ogledit.exe del $(OBJS)\ogledit.exe
-
-$(OBJS)\ogledit.exe :  $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
-	@%create $(OBJS)\ogledit.lbc
-	@%append $(OBJS)\ogledit.lbc option quiet
-	@%append $(OBJS)\ogledit.lbc name $^@
-	@%append $(OBJS)\ogledit.lbc option caseexact
-	@%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.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)\ogledit.lbc library %i
-	@%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_ogledit.res
-	@for %i in () do @%append $(OBJS)\ogledit.lbc option stack=%i
-	wlink @$(OBJS)\ogledit.lbc
-
-$(OBJS)\ogledit_ogledit.obj :  .AUTODEPEND .\ogledit.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_doc.obj :  .AUTODEPEND .\doc.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_view.obj :  .AUTODEPEND .\view.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_palette.obj :  .AUTODEPEND .\palette.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
-
-$(OBJS)\ogledit_ogledit.res :  .AUTODEPEND .\ogledit.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/ogl/ogledit/ogl.ico b/contrib/samples/ogl/ogledit/ogl.ico
deleted file mode 100644
index 7cb092e04c..0000000000
Binary files a/contrib/samples/ogl/ogledit/ogl.ico and /dev/null differ
diff --git a/contrib/samples/ogl/ogledit/ogl.xpm b/contrib/samples/ogl/ogledit/ogl.xpm
deleted file mode 100644
index 2a8c61e578..0000000000
--- a/contrib/samples/ogl/ogledit/ogl.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * ogl_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 7 1",
-/* colors */
-" 	s None	c None",
-".	c #000000",
-"+	c #000080",
-"@	c #ff0000",
-"#	c #00ff00",
-"$	c #00ffff",
-"%	c #ffffff",
-/* pixels */
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%............%%%%%%........%%%%%",
-"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
-"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
-"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
-"%............%%%%%.........%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%+.%%%%%%%%%%%%%%++%%%%%%%%",
-"%%%%%%.+.%%%%%%%%%%%%.++..%%%%%%",
-"%%%%%.+++.%%%%%%%%%..#####..%%%%",
-"%%%%.+++++.%%%%%%%.#########.%%%",
-"%%%.+++++++.%%%%%%.#########.%%%",
-"%%.+++++++++.%%%%.###########.%%",
-"%.+++++++++++.++++###########.%%",
-"%%.+++++++++.+++++###########.%%",
-"%%%.+++++++.%%%%%%.#########.%%%",
-"%%%%.+++++.%%%%%%%.#########.%%%",
-"%%%%%.+++.%%%%%%%%%..#####..%%%%",
-"%%%%%%.+.%%%%%%%%%%%%.....%%%%%%",
-"%%%%%%%.%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};
diff --git a/contrib/samples/ogl/ogledit/ogledit.bkl b/contrib/samples/ogl/ogledit/ogledit.bkl
deleted file mode 100644
index 4b72d1cb63..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.bkl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="ogledit" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            ogledit.cpp
-            doc.cpp
-            view.cpp
-            palette.cpp
-        </sources>
-        <contrib-lib>ogl</contrib-lib>
-        <contrib-lib>deprecated</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>ogledit.rc</win32-res>
-    </exe>
-    
-</makefile>
diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
deleted file mode 100644
index 8c0263ed09..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/ogledit.cpp
-// Purpose:     OGLEdit sample app
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "palette.h"
-#include "doc.h"
-#include "view.h"
-
-#ifndef __WXMSW__
-    #include "ogl.xpm"
-#endif
-
-// A macro needed for some compilers (AIX) that need 'main' to be defined
-// in the application itself.
-IMPLEMENT_APP(MyApp)
-
-MyApp::MyApp(void)
-{
-  frame = NULL;
-  myDocManager= NULL;
-}
-
-// The `main program' equivalent, creating the windows and returning the
-// main frame
-bool MyApp::OnInit(void)
-{
-  wxOGLInitialize();
-
-  //// Create a document manager
-  myDocManager = new wxDocManager;
-
-  //// Create a template relating drawing documents to their views
-  (void) new wxDocTemplate(myDocManager, _T("Diagram"), _T("*.dia"), wxEmptyString, _T("dia"), _T("Diagram Doc"), _T("Diagram View"),
-          CLASSINFO(DiagramDocument), CLASSINFO(DiagramView));
-
-  // If we've only got one window, we only get to edit
-  // one document at a time.
-  myDocManager->SetMaxDocsOpen(1);
-
-  //// Create the main frame window
-  frame = new MyFrame(myDocManager, NULL, _T("OGLEdit Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
-
-  //// Give it an icon
-  frame->SetIcon(wxICON(ogl));
-
-  //// Make a menubar
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(wxID_NEW, _T("&New..."));
-  file_menu->Append(wxID_OPEN, _T("&Open..."));
-
-  file_menu->Append(wxID_CLOSE, _T("&Close"));
-  file_menu->Append(wxID_SAVE, _T("&Save"));
-  file_menu->Append(wxID_SAVEAS, _T("Save &As..."));
-  file_menu->AppendSeparator();
-  file_menu->Append(wxID_PRINT, _T("&Print..."));
-  file_menu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
-  file_menu->Append(wxID_PREVIEW, _T("Print Pre&view"));
-
-  wxMenu *edit_menu = new wxMenu;
-  edit_menu->Append(wxID_UNDO, _T("&Undo"));
-  edit_menu->Append(wxID_REDO, _T("&Redo"));
-  edit_menu->AppendSeparator();
-  edit_menu->Append(wxID_CUT, _T("&Cut"));
-  edit_menu->AppendSeparator();
-  edit_menu->Append(OGLEDIT_CHANGE_BACKGROUND_COLOUR, _T("Change &background colour"));
-  edit_menu->Append(OGLEDIT_EDIT_LABEL, _T("Edit &label"));
-
-  frame->editMenu = edit_menu;
-
-  file_menu->AppendSeparator();
-  file_menu->Append(wxID_EXIT, _T("E&xit"));
-
-  // A nice touch: a history of files visited. Use this menu.
-  myDocManager->FileHistoryUseMenu(file_menu);
-
-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(OGLEDIT_ABOUT, _T("&About"));
-
-  wxMenuBar *menu_bar = new wxMenuBar;
-
-  menu_bar->Append(file_menu, _T("&File"));
-  if (edit_menu)
-    menu_bar->Append(edit_menu, _T("&Edit"));
-  menu_bar->Append(help_menu, _T("&Help"));
-
-  frame->canvas = frame->CreateCanvas(NULL, frame);
-  frame->palette = wxGetApp().CreatePalette(frame);
-  myDocManager->CreateDocument(wxEmptyString, wxDOC_NEW);
-
-  //// Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
-
-#if wxUSE_STATUSBAR
-  frame->CreateStatusBar(1);
-#endif // wxUSE_STATUSBAR
-
-  frame->Centre(wxBOTH);
-  frame->Show(true);
-
-  return true;
-}
-
-int MyApp::OnExit(void)
-{
-    wxOGLCleanUp();
-    delete myDocManager;
-    return 0;
-}
-
-/*
- * This is the top-level window of the application.
- */
-
-IMPLEMENT_CLASS(MyFrame, wxDocParentFrame)
-
-BEGIN_EVENT_TABLE(MyFrame, wxDocParentFrame)
-    EVT_MENU(OGLEDIT_ABOUT, MyFrame::OnAbout)
-    EVT_SIZE(MyFrame::OnSize)
-    EVT_CLOSE(MyFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
-    const wxPoint& pos, const wxSize& size, long type):
-  wxDocParentFrame(manager, frame, wxID_ANY, title, pos, size, type)
-{
-  canvas = NULL;
-  palette = NULL;
-  editMenu = NULL;
-}
-
-void MyFrame::OnSize(wxSizeEvent& event)
-{
-  if (canvas && palette)
-  {
-    int cw, ch;
-    GetClientSize(&cw, &ch);
-    int paletteX = 0;
-    int paletteY = 0;
-    int paletteW = 30;
-    int paletteH = ch;
-    int canvasX = paletteX + paletteW;
-    int canvasY = 0;
-    int canvasW = cw - paletteW;
-    int canvasH = ch;
-
-    palette->SetSize(paletteX, paletteY, paletteW, paletteH);
-    canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
-  }
-  event.Skip();
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& event)
-{
-  wxDocParentFrame::OnCloseWindow(event);
-  if (!event.GetVeto())
-  {
-    wxOGLCleanUp();
-  }
-}
-
-// Intercept menu commands
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-      (void)wxMessageBox(_T("OGLEdit Demo\nTo draw a shape, select a shape on the toolbar and left-click on the canvas.\nTo draw a line, right-drag between shapes.\nFor further details, see the OGL manual.\n (c) Julian Smart 1996"), _T("About OGLEdit"));
-}
-
-// Creates a canvas. Called by OnInit as a child of the main window
-MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
-{
-  int width, height;
-  parent->GetClientSize(&width, &height);
-
-  // Non-retained canvas
-  MyCanvas *canvas = new MyCanvas(view, parent, wxID_ANY, wxPoint(0, 0), wxSize(width, height), 0);
-  canvas->SetCursor(wxCursor(wxCURSOR_HAND));
-
-  // Give it scrollbars
-  canvas->SetScrollbars(20, 20, 50, 50);
-
-  return canvas;
-}
-
-MyFrame *GetMainFrame(void)
-{
-  return wxGetApp().frame;
-}
diff --git a/contrib/samples/ogl/ogledit/ogledit.dsp b/contrib/samples/ogl/ogledit/ogledit.dsp
deleted file mode 100644
index 834e5388af..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.dsp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogledit" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ogledit - 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 "ogledit.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 "ogledit.mak" CFG="ogledit - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ogledit - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "ogledit - 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)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\ogledit.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\ogledit.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 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\ogledit.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\ogledit.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 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\ogledit.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\ogledit.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 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\ogledit.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\ogledit.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 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\ogledit.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\ogledit.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 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\ogledit.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\ogledit.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 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\ogledit.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\ogledit.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 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\ogledit.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\ogledit.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 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\ogledit.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\ogledit.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 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\ogledit.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\ogledit.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 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\ogledit.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\ogledit.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 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\ogledit.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\ogledit.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 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\ogledit.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\ogledit.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 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\ogledit.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\ogledit.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 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\ogledit.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\ogledit.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 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29.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\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "ogledit - 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\ogledit"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\ogledit"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\ogledit.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\ogledit.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 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d.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\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogledit - Win32 DLL Universal Unicode Release"
-# Name "ogledit - Win32 DLL Universal Unicode Debug"
-# Name "ogledit - Win32 DLL Universal Release"
-# Name "ogledit - Win32 DLL Universal Debug"
-# Name "ogledit - Win32 DLL Unicode Release"
-# Name "ogledit - Win32 DLL Unicode Debug"
-# Name "ogledit - Win32 DLL Release"
-# Name "ogledit - Win32 DLL Debug"
-# Name "ogledit - Win32 Universal Unicode Release"
-# Name "ogledit - Win32 Universal Unicode Debug"
-# Name "ogledit - Win32 Universal Release"
-# Name "ogledit - Win32 Universal Debug"
-# Name "ogledit - Win32 Unicode Release"
-# Name "ogledit - Win32 Unicode Debug"
-# Name "ogledit - Win32 Release"
-# Name "ogledit - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\doc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/ogl/ogledit/ogledit.h b/contrib/samples/ogl/ogledit/ogledit.h
deleted file mode 100644
index 804ba67e4f..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/ogledit.h
-// Purpose:     OGL sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_OGLEDIT_H_
-#define _OGLSAMPLE_OGLEDIT_H_
-
-#include "wx/docview.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-// Define a new application
-class MyFrame;
-class EditorToolPalette;
-class MyApp: public wxApp
-{
-  public:
-    MyFrame *frame;
-    wxDocManager* myDocManager;
-
-    MyApp(void);
-    bool OnInit(void);
-    int OnExit(void);
-
-    // Palette stuff
-    EditorToolPalette *CreatePalette(wxFrame *parent);
-};
-
-DECLARE_APP(MyApp)
-
-// Define a new frame
-class MyCanvas;
-class MyFrame: public wxDocParentFrame
-{
-    DECLARE_CLASS(MyFrame)
-public:
-    wxMenu *editMenu;
-
-    MyCanvas *canvas;
-    EditorToolPalette *palette;
-
-    MyFrame(wxDocManager *manager, wxFrame *parent, const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE);
-
-    MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
-    void OnSize(wxSizeEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-extern MyFrame *GetMainFrame(void);
-
-// Menu/undo/redo commands
-
-enum
-{
-    OGLEDIT_ADD_SHAPE = wxID_HIGHEST,
-    OGLEDIT_ADD_LINE,
-    OGLEDIT_EDIT_LABEL,
-    OGLEDIT_CHANGE_BACKGROUND_COLOUR,
-    OGLEDIT_ABOUT = wxID_ABOUT
-};
-
-#endif
-    // _OGLSAMPLE_OGLEDIT_H_
diff --git a/contrib/samples/ogl/ogledit/ogledit.rc b/contrib/samples/ogl/ogledit/ogledit.rc
deleted file mode 100644
index fe1ac37f07..0000000000
--- a/contrib/samples/ogl/ogledit/ogledit.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-ogl             ICON    ogl.ico
-
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
deleted file mode 100644
index 30adc96717..0000000000
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        samples/ogl/ogledit/palette.cpp
-// Purpose:     OGLEdit palette
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/toolbar.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "doc.h"
-#include "view.h"
-#include "ogledit.h"
-#include "palette.h"
-
-// Include pixmaps
-#include "bitmaps/arrow.xpm"
-#include "bitmaps/tool1.xpm"
-#include "bitmaps/tool2.xpm"
-#include "bitmaps/tool3.xpm"
-#include "bitmaps/tool4.xpm"
-
-/*
- * Object editor tool palette
- *
- */
-
-EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
-            long style):
-  TOOLPALETTECLASS(parent, wxID_ANY, pos, size, style)
-{
-    currentlySelected = -1;
-}
-
-bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
-{
-  // BEGIN mutual exclusivity code
-  if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
-    ToggleTool(currentlySelected, false);
-
-  if (toggled)
-    currentlySelected = toolIndex;
-  else if (currentlySelected == toolIndex)
-    currentlySelected = -1;
-  //  END mutual exclusivity code
-
-  return true;
-}
-
-void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex))
-{
-}
-
-void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  TOOLPALETTECLASS::SetSize(x, y, width, height, sizeFlags);
-}
-
-EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
-{
-  // Load palette bitmaps.
-  wxBitmap PaletteTool1(tool1_xpm);
-  wxBitmap PaletteTool2(tool2_xpm);
-  wxBitmap PaletteTool3(tool3_xpm);
-  wxBitmap PaletteTool4(tool4_xpm);
-  wxBitmap PaletteArrow(arrow_xpm);
-
-  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
-      wxTB_VERTICAL);
-
-  palette->SetMargins(2, 2);
-  palette->SetToolBitmapSize(wxSize(22, 22));
-
-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 1"));
-  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 2"));
-  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 3"));
-  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Tool 4"));
-
-  palette->Realize();
-
-  palette->ToggleTool(PALETTE_ARROW, true);
-  palette->currentlySelected = PALETTE_ARROW;
-  return palette;
-}
diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
deleted file mode 100644
index a65c2b8627..0000000000
--- a/contrib/samples/ogl/ogledit/palette.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/palette.h
-// Purpose:     OGL sample palette
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_PALETTE_H_
-#define _OGLSAMPLE_PALETTE_H_
-
-#include "wx/wx.h"
-#include "wx/string.h"
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/tbarsmpl.h"
-
-/*
- * Object editor tool palette
- *
- */
-
-// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
-// Needs to have a parent window...
-// So use a simple toolbar at present.
-// ABX: Simple toolbar is not available in default compilation
-//      so I use wxToolBar anyway
-// #if 0 // def __WXGTK__
-// #define TOOLPALETTECLASS    wxToolBar
-// #else
-// #define TOOLPALETTECLASS    wxToolBarSimple
-// #endif
-#define TOOLPALETTECLASS    wxToolBar
-
-class EditorToolPalette: public TOOLPALETTECLASS
-{
- public:
-  int currentlySelected;
-
-  EditorToolPalette(wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
-    const wxSize& size = wxDefaultSize,
-    long style = wxTB_VERTICAL);
-  bool OnLeftClick(int toolIndex, bool toggled);
-  void OnMouseEnter(int toolIndex);
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-};
-
-#define PALETTE_TOOL1           1
-#define PALETTE_TOOL2           2
-#define PALETTE_TOOL3           3
-#define PALETTE_TOOL4           4
-#define PALETTE_TOOL5           5
-#define PALETTE_TOOL6           6
-#define PALETTE_TOOL7           7
-#define PALETTE_TOOL8           8
-#define PALETTE_TOOL9           9
-#define PALETTE_ARROW           10
-
-#endif
-    // _OGLSAMPLE_PALETTE_H_
diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp
deleted file mode 100644
index c8661fc380..0000000000
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/view.cpp
-// Purpose:     Implements view functionality in OGLEdit
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/colordlg.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "ogledit.h"
-#include "doc.h"
-#include "view.h"
-#include "palette.h"
-
-IMPLEMENT_DYNAMIC_CLASS(DiagramView, wxView)
-
-BEGIN_EVENT_TABLE(DiagramView, wxView)
-    EVT_MENU(wxID_CUT, DiagramView::OnCut)
-    EVT_MENU(OGLEDIT_CHANGE_BACKGROUND_COLOUR, DiagramView::OnChangeBackgroundColour)
-    EVT_MENU(OGLEDIT_EDIT_LABEL, DiagramView::OnEditLabel)
-END_EVENT_TABLE()
-
-// What to do when a view is created. Creates actual
-// windows for displaying the view.
-bool DiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
-{
-  frame = GetMainFrame();
-  canvas = GetMainFrame()->canvas;
-  canvas->view = this;
-
-  SetFrame(frame);
-  Activate(true);
-
-  // Initialize the edit menu Undo and Redo items
-  doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
-  doc->GetCommandProcessor()->Initialize();
-
-  wxShapeCanvas *shapeCanvas = (wxShapeCanvas *)canvas;
-  DiagramDocument *diagramDoc = (DiagramDocument *)doc;
-  shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
-  diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
-
-  return true;
-}
-
-#define CENTER  false // Place the drawing to the center of the page
-
-
-// Sneakily gets used for default print/preview
-// as well as drawing on the screen.
-void DiagramView::OnDraw(wxDC *dc)
-{
-
-  /* You might use THIS code if you were scaling
-   * graphics of known size to fit on the page.
-   */
-  int w, h;
-
-  // We need to adjust for the graphic size, a formula will be added
-  float maxX = 900;
-  float maxY = 700;
-  // A better way of find the maxium values would be to search through
-  // the linked list
-
-  // Let's have at least 10 device units margin
-  float marginX = 10;
-  float marginY = 10;
-
-  // Add the margin to the graphic size
-  maxX += (2 * marginX);
-  maxY += (2 * marginY);
-
-  // Get the size of the DC in pixels
-  dc->GetSize (&w, &h);
-
-  // Calculate a suitable scaling factor
-  float scaleX = (float) (w / maxX);
-  float scaleY = (float) (h / maxY);
-
-  // Use x or y scaling factor, whichever fits on the DC
-  float actualScale = wxMin (scaleX, scaleY);
-
-  float posX, posY;
-  // Calculate the position on the DC for centring the graphic
-  #if 0
-     // center the drawing
-      posX = (float) ((w - (200 * actualScale)) / 2.0);
-      posY = (float) ((h - (200 * actualScale)) / 2.0);
-  #else
-     // Use defined presets
-      posX = 10;
-      posY = 35;
-  #endif
-
-
-  // Set the scale and origin
-  dc->SetUserScale (actualScale, actualScale);
-  dc->SetDeviceOrigin ((long) posX, (long) posY);
-
-  // This part was added to preform the print preview and printing functions
-
-  wxDiagram *diagram_p=((DiagramDocument*)GetDocument())->GetDiagram();  // Get the current diagram
-  if (diagram_p->GetShapeList())
-  {
-    /* wxCursor *old_cursor = NULL; */
-    wxObjectList::compatibility_iterator current = diagram_p->GetShapeList()->GetFirst();
-
-    while (current) // Loop through the entire list of shapes
-    {
-        wxShape *object = (wxShape *)current->GetData();
-        if (!object->GetParent())
-        {
-            object->Draw(* dc); // Draw the shape onto our printing dc
-        }
-        current = current->GetNext();  // Procede to the next shape in the list
-    }
-  }
-}
-
-void DiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
-{
-  if (canvas)
-    canvas->Refresh();
-}
-
-// Clean up windows used for displaying the view.
-bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
-{
-  if (!GetDocument()->Close())
-    return false;
-
-  DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
-  diagramDoc->GetDiagram()->SetCanvas(NULL);
-
-  canvas->ClearBackground();
-  canvas->SetDiagram(NULL);
-  canvas->view = NULL;
-  canvas = NULL;
-
-  wxString s = wxTheApp->GetAppName();
-  if (frame)
-    frame->SetTitle(s);
-
-  SetFrame(NULL);
-
-  Activate(false);
-
-  return true;
-}
-
-wxShape *DiagramView::FindSelectedShape(void)
-{
-  DiagramDocument *doc = (DiagramDocument *)GetDocument();
-  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-    wxShape *eachShape = (wxShape *)node->GetData();
-    if ((eachShape->GetParent() == NULL) && eachShape->Selected())
-    {
-      return eachShape;
-    }
-    else node = node->GetNext();
-  }
-  return NULL;
-}
-
-void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
-{
-  DiagramDocument *doc = (DiagramDocument *)GetDocument();
-
-  wxShape *theShape = FindSelectedShape();
-  if (theShape)
-    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, true, theShape));
-}
-
-void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
-{
-      DiagramDocument *doc = (DiagramDocument *)GetDocument();
-
-      wxShape *theShape = FindSelectedShape();
-      if (theShape)
-      {
-        wxColourData data;
-        data.SetChooseFull(true);
-        data.SetColour(theShape->GetBrush()->GetColour());
-
-        wxColourDialog *dialog = new wxColourDialog(frame, &data);
-        wxBrush *theBrush = NULL;
-        if (dialog->ShowModal() == wxID_OK)
-        {
-          wxColourData retData = dialog->GetColourData();
-          wxColour col = retData.GetColour();
-          theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
-        }
-        dialog->Close();
-
-        if (theBrush)
-          doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Change colour"), OGLEDIT_CHANGE_BACKGROUND_COLOUR, doc,
-            theBrush, theShape));
-      }
-}
-
-void DiagramView::OnEditLabel(wxCommandEvent& WXUNUSED(event))
-{
-      wxShape *theShape = FindSelectedShape();
-      if (theShape)
-      {
-        wxString newLabel = wxGetTextFromUser(_T("Enter new label"), _T("Shape Label"), ((MyEvtHandler *)theShape->GetEventHandler())->label);
-        GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(_T("Edit label"), OGLEDIT_EDIT_LABEL, (DiagramDocument*) GetDocument(), newLabel, theShape));
-      }
-}
-
-
-/*
- * Window implementations
- */
-
-BEGIN_EVENT_TABLE(MyCanvas, wxShapeCanvas)
-    EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
-    EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxView *v, wxWindow *parent, wxWindowID id, const wxPoint& pos,
-    const wxSize& size, long style):
- wxShapeCanvas(parent, id, pos, size, style)
-{
-  SetBackgroundColour(*wxWHITE);
-  view = v;
-}
-
-MyCanvas::~MyCanvas(void)
-{
-}
-
-void MyCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
-{
-  EditorToolPalette *palette = wxGetApp().frame->palette;
-  wxClassInfo *info = NULL;
-  switch (palette->currentlySelected)
-  {
-    case PALETTE_TOOL1:
-    {
-      info = CLASSINFO(wxRectangleShape);
-      break;
-    }
-    case PALETTE_TOOL2:
-    {
-      info = CLASSINFO(wxRoundedRectangleShape);
-      break;
-    }
-    case PALETTE_TOOL3:
-    {
-      info = CLASSINFO(wxEllipseShape);
-      break;
-    }
-    case PALETTE_TOOL4:
-    {
-      info = CLASSINFO(wxDiamondShape);
-      break;
-    }
-    default:
-      break;
-  }
-  if (info)
-  {
-    view->GetDocument()->GetCommandProcessor()->Submit(
-      new DiagramCommand( info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
-         x, y));
-  }
-}
-
-void MyCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void MyCanvas::OnMouseEvent(wxMouseEvent& event)
-{
-    wxShapeCanvas::OnMouseEvent(event);
-}
-
-void MyCanvas::OnPaint(wxPaintEvent& event)
-{
-//  if (GetDiagram())
-    wxShapeCanvas::OnPaint(event);
-}
diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h
deleted file mode 100644
index 363696eb0e..0000000000
--- a/contrib/samples/ogl/ogledit/view.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/ogledit/view.h
-// Purpose:     View-related classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _OGLSAMPLE_VIEW_H_
-#define _OGLSAMPLE_VIEW_H_
-
-#include "doc.h"
-#include "wx/ogl/ogl.h"
-
-class MyCanvas: public wxShapeCanvas
-{
-// DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
- protected:
- public:
-  wxView *view;
-
-  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxRETAINED);
-  ~MyCanvas(void);
-
-  void OnMouseEvent(wxMouseEvent& event);
-  void OnPaint(wxPaintEvent& event);
-
-  virtual void OnLeftClick(double x, double y, int keys = 0);
-  virtual void OnRightClick(double x, double y, int keys = 0);
-
-  virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragLeft(double x, double y, int keys=0);
-  virtual void OnEndDragLeft(double x, double y, int keys=0);
-
-  virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragRight(double x, double y, int keys=0);
-  virtual void OnEndDragRight(double x, double y, int keys=0);
-
-DECLARE_EVENT_TABLE()
-};
-
-class DiagramView: public wxView
-{
-  DECLARE_DYNAMIC_CLASS(DiagramView)
- private:
- public:
-  wxFrame *frame;
-  MyCanvas *canvas;
-
-  DiagramView(void) { canvas = NULL; frame = NULL; };
-  ~DiagramView(void) {};
-
-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = true);
-
-  wxShape *FindSelectedShape(void);
-
-  void OnCut(wxCommandEvent& event);
-  void OnChangeBackgroundColour(wxCommandEvent& event);
-  void OnEditLabel(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _OGLSAMPLE_VIEW_H_
diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
deleted file mode 100644
index 1480961c40..0000000000
--- a/contrib/samples/ogl/studio/Makefile.in
+++ /dev/null
@@ -1,255 +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_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-STUDIO_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)
-STUDIO_OBJECTS =  \
-	$(__studio_os2_lib_res) \
-	studio_studio.o \
-	studio_doc.o \
-	studio_shapes.o \
-	studio_symbols.o \
-	studio_view.o \
-	studio_cspalette.o \
-	studio_mainfrm.o \
-	studio_project.o \
-	studio_dialogs.o \
-	studio_csprint.o \
-	$(__studio___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@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@__studio___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C studio$(EXEEXT)
-@COND_PLATFORM_MAC_1@__studio___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___studio___os2_emxbindcmd = $(NM) studio$(EXEEXT) | if grep \
-	-q pmwin.763 ; then emxbind -ep studio$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__studio___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___studio___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_OS2_1@__studio_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
-@COND_TOOLKIT_COCOA@____studio_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	studio.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____studio_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	studio.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-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@__studio___win32rc = studio_studio_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 = $(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 studio$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: studio$(EXEEXT) $(__studio_bundle___depname) data
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f studio$(EXEEXT)
-	rm -rf studio.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
-	$(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
-	$(__studio___mac_rezcmd)
-	$(__studio___mac_setfilecmd)
-	$(__studio___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p studio.app/Contents
-	mkdir -p studio.app/Contents/MacOS
-	mkdir -p studio.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/studio/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >studio.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >studio.app/Contents/PkgInfo
-	
-	
-	ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)
-
-data: 
-	@mkdir -p .
-	@for f in studio_resources.wxr; 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
-
-studio_studio.o: $(srcdir)/studio.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/studio.cpp
-
-studio_doc.o: $(srcdir)/doc.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/doc.cpp
-
-studio_shapes.o: $(srcdir)/shapes.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/shapes.cpp
-
-studio_symbols.o: $(srcdir)/symbols.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/symbols.cpp
-
-studio_view.o: $(srcdir)/view.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/view.cpp
-
-studio_cspalette.o: $(srcdir)/cspalette.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/cspalette.cpp
-
-studio_mainfrm.o: $(srcdir)/mainfrm.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/mainfrm.cpp
-
-studio_project.o: $(srcdir)/project.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/project.cpp
-
-studio_dialogs.o: $(srcdir)/dialogs.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/dialogs.cpp
-
-studio_csprint.o: $(srcdir)/csprint.cpp
-	$(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $(srcdir)/csprint.cpp
-
-studio_studio_rc.o: $(srcdir)/studio.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 --include-dir $(srcdir)/../../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean studio_bundle data
diff --git a/contrib/samples/ogl/studio/bitmaps/alignb.xpm b/contrib/samples/ogl/studio/bitmaps/alignb.xpm
deleted file mode 100644
index c3b57a5869..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignb.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignb_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-"        ........",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-" .....  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .....  ........",
-"                ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignl.xpm b/contrib/samples/ogl/studio/bitmaps/alignl.xpm
deleted file mode 100644
index 6d7def92fb..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignl.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-"   ......       ",
-"   .XXXX.       ",
-"   .XXXX.       ",
-"   .XXXX.       ",
-"   ......       ",
-"                ",
-"                ",
-"   ...........  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   ...........  ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignr.xpm b/contrib/samples/ogl/studio/bitmaps/alignr.xpm
deleted file mode 100644
index 3f873eed4e..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignr.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignr_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-"        ......  ",
-"        .XXXX.  ",
-"        .XXXX.  ",
-"        .XXXX.  ",
-"        ......  ",
-"                ",
-"                ",
-"   ...........  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   ...........  ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/alignt.xpm b/contrib/samples/ogl/studio/bitmaps/alignt.xpm
deleted file mode 100644
index 65fc1b5ccb..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/alignt.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *alignt_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-" .....  ........",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .....  .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        ........",
-"                ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/arrow.bmp b/contrib/samples/ogl/studio/bitmaps/arrow.bmp
deleted file mode 100644
index d406ceb64f..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/arrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/arrow.xpm b/contrib/samples/ogl/studio/bitmaps/arrow.xpm
deleted file mode 100644
index e7cab6ae18..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/arrow.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char *arrow_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    22    22        2            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"######################",
-"#######.##############",
-"#######..#############",
-"#######...############",
-"#######....###########",
-"#######.....##########",
-"#######......#########",
-"#######.......########",
-"#######........#######",
-"#######.....##########",
-"#######..#..##########",
-"#######.###..#########",
-"###########..#########",
-"############..########",
-"############..########",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/copy.xpm b/contrib/samples/ogl/studio/bitmaps/copy.xpm
deleted file mode 100644
index 00ae82e213..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/copy.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 23 1",
-"+ c #769CDA",
-": c #DCE6F6",
-"X c #3365B7",
-"* c #FFFFFF",
-"o c #9AB6E4",
-"< c #EAF0FA",
-"# c #B1C7EB",
-". c #6992D7",
-"3 c #F7F9FD",
-", c #F0F5FC",
-"$ c #A8C0E8",
-"  c None",
-"- c #FDFEFF",
-"& c #C4D5F0",
-"1 c #E2EAF8",
-"O c #89A9DF",
-"= c #D2DFF4",
-"4 c #FAFCFE",
-"2 c #F5F8FD",
-"; c #DFE8F7",
-"% c #B8CCEC",
-"> c #E5EDF9",
-"@ c #648FD6",
-/* pixels */
-" .....XX        ",
-" .oO+@X#X       ",
-" .$oO+X##X      ",
-" .%$o........   ",
-" .&%$.*=&#o.-.  ",
-" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
-" .....**-432,>. ",
-"     .***-432,. ",
-"     .......... "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/copysize.xpm b/contrib/samples/ogl/studio/bitmaps/copysize.xpm
deleted file mode 100644
index 4694bd4083..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/copysize.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *copysize_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-".......... ...  ",
-".XXXXXXXX.   .  ",
-".XXXXXXXX.   .  ",
-".XXXXXXXX. .....",
-".XXXXXXXX.  ... ",
-"..........   .  ",
-"                ",
-"    . . . . . . ",
-"                ",
-"    .  ...... . ",
-"       .XXXX.   ",
-"    .  ...... . ",
-"                ",
-"    . . . . . . "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/cut.xpm b/contrib/samples/ogl/studio/bitmaps/cut.xpm
deleted file mode 100644
index 8afa8f6d15..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/cut.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char *cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"6 c #D8BDC0",
-": c #C3C3C4",
-"- c #FFFFFF",
-". c #6C6D70",
-"2 c #AD3A45",
-"o c #DBDBDB",
-"# c #939495",
-"< c #E42234",
-"& c #C3C5C8",
-"; c #C6CCD3",
-"% c #B7B7B8",
-"  c None",
-"* c #DFE0E2",
-"5 c #B69596",
-"3 c #9C2A35",
-"1 c #CFCFD0",
-", c #AB5C64",
-"+ c #D2D3D4",
-"$ c #BCBDBE",
-"@ c #C6C8CA",
-"> c #CDC0C1",
-"O c #826F72",
-"X c #979BA0",
-"4 c #9B8687",
-"= c #9FA0A0",
-/* pixels */
-"   .X     .o    ",
-"   O.+   @.     ",
-"    O.   ..     ",
-"    O#$ %.&     ",
-"     O.*..      ",
-"     #%#..      ",
-"     O=-..      ",
-"     #%#;.      ",
-"     OO:=O      ",
-"  >,,<, ,<,,1   ",
-" ><23<1 1<32<1  ",
-" ,2 4<   <5 2,  ",
-" <, ,2   2, ,<  ",
-" 23,<5   5<,32  ",
-" 6225     522>  "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm b/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
deleted file mode 100644
index 597b6b01ee..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *cutpoint_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        3            1",
-/* colors */
-". c #000000",
-"# c #800000",
-"a c #c0c0c0",
-/* pixels */
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa",
-"aa#aaaaaaaaa#aaa",
-"aaa#aaaaaaa#aaaa",
-"aaaa#aaaaa#aaaaa",
-"aaaaa#...#aaaaaa",
-"aaaaaa#.#.aaaaaa",
-".......#........",
-"aaaaaa#.#.aaaaaa",
-"aaaaa#...#aaaaaa",
-"aaaa#aaaaa#aaaaa",
-"aaa#aaaaaaa#aaaa",
-"aa#aaaaaaaaa#aaa",
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/file1.ico b/contrib/samples/ogl/studio/bitmaps/file1.ico
deleted file mode 100644
index 497f7321bf..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/file1.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/folder1.ico b/contrib/samples/ogl/studio/bitmaps/folder1.ico
deleted file mode 100644
index 806b900a30..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/folder1.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/help.xpm b/contrib/samples/ogl/studio/bitmaps/help.xpm
deleted file mode 100644
index 161b6b2658..0000000000
--- a/contrib/samples/ogl/studio/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/contrib/samples/ogl/studio/bitmaps/helpcs.xpm b/contrib/samples/ogl/studio/bitmaps/helpcs.xpm
deleted file mode 100644
index 4a3e8fcb70..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/helpcs.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *helpcs_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        2            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"################",
-".########.....##",
-"..######..###..#",
-"...####..####...",
-"....###..####...",
-".....###..###..#",
-"......######..##",
-".......####..###",
-"........##..####",
-".....#####..####",
-"..#..###########",
-".###..####...###",
-"####..####...###",
-"#####..#########",
-"#####..#########"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/horiz.xpm b/contrib/samples/ogl/studio/bitmaps/horiz.xpm
deleted file mode 100644
index 381e66fccf..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/horiz.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *horiz_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-"      .....     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .....     ",
-"                ",
-"                ",
-"   ...........  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   .XXXXXXXXX.  ",
-"   ...........  ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/linearrow.xpm b/contrib/samples/ogl/studio/bitmaps/linearrow.xpm
deleted file mode 100644
index ca554f4199..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/linearrow.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *linearrow_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        3            1",
-/* colors */
-". c #000000",
-"# c #800000",
-"a c #c0c0c0",
-/* pixels */
-"aaaaaaaaaaaaaaaa",
-"aaaaa#aaaaaaaaaa",
-"aaaaa##aaaaaaaaa",
-"aaaaa###aaaaaaaa",
-"aaaaa####aaaaaaa",
-"aaaaa#####aaaaaa",
-".....######.....",
-".....######.....",
-"aaaaa#####aaaaaa",
-"aaaaa####aaaaaaa",
-"aaaaa###aaaaaaaa",
-"aaaaa##aaaaaaaaa",
-"aaaaa#aaaaaaaaaa",
-"aaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaa"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/new.xpm b/contrib/samples/ogl/studio/bitmaps/new.xpm
deleted file mode 100644
index 0597eebd5e..0000000000
--- a/contrib/samples/ogl/studio/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/contrib/samples/ogl/studio/bitmaps/newpoint.xpm b/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
deleted file mode 100644
index c1d9fefcce..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *newpoint_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        3            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-"a c #ffff00",
-/* pixels */
-"#######a########",
-"###a###a###a####",
-"####a##a##a#####",
-"#####a#a#a######",
-"################",
-"##aaa#....#aaa##",
-"######....######",
-"................",
-"######....######",
-"######....######",
-"################",
-"################",
-"################",
-"################",
-"################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/open.xpm b/contrib/samples/ogl/studio/bitmaps/open.xpm
deleted file mode 100644
index 36e058fc8e..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/open.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char *open_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 36 1",
-", c #AAC1E8",
-"1 c #9AEA53",
-"q c #DCE6F6",
-". c #295193",
-"; c #A9D066",
-"r c #C6D6F0",
-"$ c #4A7CCE",
-"9 c #779DDB",
-"8 c #EAF0FA",
-"O c #6E96D8",
-"X c #214279",
-"e c #BED0EE",
-"6 c #85A7DF",
-"5 c #F0F5FC",
-"t c #ADC4E9",
-": c #3161B1",
-"  c None",
-"u c #274D8B",
-"& c #BFDC9B",
-"> c #9FB9E5",
-"y c #5584D1",
-"w c #3569BF",
-"% c #3A70CA",
-"+ c #305FAC",
-"3 c #5D89D3",
-"0 c #D2DFF4",
-"@ c #CAE2AA",
-"= c #B2D58C",
-"2 c #FAFCFE",
-"# c #638ED5",
-"* c #CEDCF2",
-"4 c #90AFE2",
-"< c #B3C8EB",
-"7 c #E5EDF9",
-"- c #A2BCE6",
-"o c #DFF0D0",
-/* pixels */
-"                ",
-"     ....       ",
-"XXXXX .oo.      ",
-"XOOOO+ .@o.     ",
-"XOOOO#$%.&*XXX  ",
-"XOOOOOOO.=*X-X  ",
-"XOXXXX...;*XXXX:",
-"XOX>,<.11111*X2:",
-"X3X4>,<.111*X5-:",
-"XX#64>,,.1*X78: ",
-"XXO964>,,.X0q7: ",
-"Xw3O964>,,er0t: ",
-"X%y3O964>,<er:  ",
-"uXXXXXXXXXXXX:  ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/paste.xpm b/contrib/samples/ogl/studio/bitmaps/paste.xpm
deleted file mode 100644
index 57e7f2a593..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/paste.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char *paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 25 1",
-"< c #FEECE4",
-"> c #FEE3D7",
-"O c #FFFFFF",
-"o c #7B767D",
-"% c #F79586",
-"& c #CAE1F3",
-"@ c #F08B62",
-"# c #FCCBB8",
-"- c #FDD8C9",
-"4 c #FFF8F4",
-"5 c #FFF5F0",
-"  c None",
-"$ c #F8AA8F",
-", c #EFF6FC",
-"1 c #F7FBFD",
-"2 c #FAFCFE",
-"; c #DAEAF7",
-": c #E9F3FA",
-"6 c #FFFAF8",
-". c #3C78A6",
-"3 c #FFF1ED",
-"X c #9B8687",
-"+ c #FBBCA4",
-"* c #B6D5EE",
-"= c #F4F9FD",
-/* pixels */
-"   ......       ",
-" .XoOOOOoo.     ",
-".+XOOOOOOX@.    ",
-".+XXXXXXXX@.    ",
-".#++$$%@.....   ",
-".##++$$%.&*.=.  ",
-".-##++$$.;&.==. ",
-".--##++$.:;.... ",
-".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
-".45<<>--....... ",
-".6453<>----.    ",
-"............    "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/preview.xpm b/contrib/samples/ogl/studio/bitmaps/preview.xpm
deleted file mode 100644
index d0176b3546..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/preview.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char *preview_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 30 1",
-"1 c Black",
-"= c #97C4E7",
-"< c #FFFFFF",
-", c #69A1CF",
-". c #5A89A6",
-"# c #3A749C",
-"+ c #538BB1",
-"> c #D1E5F5",
-"o c #6792AE",
-"% c #C3DDF1",
-"8 c #749BB5",
-"; c #619BC4",
-"X c #6B97B6",
-"@ c #4B82A8",
-"  c None",
-"O c #5F8FB0",
-"q c #84A5BB",
-": c #71A8D1",
-"- c #85BBE2",
-"9 c #EFF6FC",
-"7 c #F7FBFD",
-"6 c #FAFCFE",
-"2 c #7FA6C0",
-"5 c #C00000",
-"0 c #FDFDFE",
-"3 c #E2EFF8",
-"$ c #8EA9BC",
-"& c #B6D5EE",
-"* c #A5CCEA",
-"4 c #F4F9FD",
-/* pixels */
-"  ..XoO+@#$     ",
-"  .%%&*=-;:;    ",
-"  .>>%&*=,<=X   ",
-"  $%%%1112<<=X  ",
-"  $3-1<<<1oXO+  ",
-"  $314<<<<1=-+  ",
-"  $31<<<<<1-=+  ",
-"  $31<<<<<1&*O  ",
-"  $3-1<<<51>%X  ",
-"  $367111551>8  ",
-"  $3-----95518  ",
-"  $3<067466551  ",
-"  $3--------551 ",
-"  $3<<<0666<<55 ",
-"  $$$$$$$$$$q$  "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/print.xpm b/contrib/samples/ogl/studio/bitmaps/print.xpm
deleted file mode 100644
index fae8103a9a..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/print.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char *print_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 35 1",
-"y c #EDF2FB",
-"9 c #4E7FD0",
-"> c #B9CDED",
-"# c #3365B7",
-"r c #FFFFFF",
-"8 c #2C58A0",
-"X c #779DDB",
-"7 c #7FA2DD",
-"t c #3263B4",
-"q c #6E96D8",
-"= c #6992D7",
-"* c #D9E4F5",
-"0 c #356AC1",
-"& c #CBD9F1",
-"; c #97B4E3",
-"e c #3161B1",
-"  c None",
-"1 c #B5C9EB",
-", c #7CA0DC",
-"4 c #487BCE",
-"- c #4377CD",
-". c #5584D1",
-"6 c #3A70CA",
-"2 c #305FAC",
-"< c #5685D2",
-"w c #4075CC",
-"5 c #638ED5",
-"3 c #3467BC",
-"% c #2F5DA9",
-"o c #ECF1FA",
-": c #D6E1F4",
-"@ c #376EC9",
-"$ c #2D5AA5",
-"+ c #A2BCE6",
-"O c #CFDDF3",
-/* pixels */
-"   .XXXXXXXX    ",
-"   .oooooooX    ",
-"   .OOOOOOOX    ",
-"   .+++++++X    ",
-" @@#$%%%%%$%@@  ",
-"#&*=-=;:>,<#*&# ",
-".11.2345.63#11. ",
-"4;;;;;;;;;;;;;4 ",
-"677588888889776 ",
-"0qq60wwwwwweqq0 ",
-"3553rrrrrrr$553 ",
-"3<<tyrrrrrr$<<3 ",
-"XXX%rrrrrrr$XXX ",
-"   3rrrrrrr$    ",
-"   #XXXXXXX@    "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/redo.xpm b/contrib/samples/ogl/studio/bitmaps/redo.xpm
deleted file mode 100644
index 870449c4f1..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/redo.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char *redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"2 c #4E7FD0",
-"i c #3365B7",
-"e c #8DADE1",
-": c #3162B3",
-", c #4A7CCE",
-"% c #779DDB",
-"6 c #7FA2DD",
-"0 c #6992D7",
-"3 c #6E96D8",
-"7 c #356AC1",
-". c #9BB7E5",
-"@ c #5886D2",
-"u c #BED0EE",
-"r c #C3D4EF",
-"5 c #85A7DF",
-"+ c #ADC4E9",
-"y c #DAE5F6",
-"  c None",
-"O c #487BCE",
-"t c #9FB9E5",
-"o c #254A87",
-"w c #AEC5EA",
-"q c #89A9DF",
-"8 c #98B5E4",
-"> c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"= c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"4 c #3467BC",
-"X c #2F5DA9",
-"# c #2A5398",
-"$ c #376EC9",
-"* c #2D5AA5",
-"; c #8CACE0",
-/* pixels */
-"  .XoooO+       ",
-" @o#####o$    @ ",
-"%#&&*#*&&*#  @o ",
-"X=-#@;@#=-:#$*# ",
-"#>-@    #->-=># ",
-"*,>%     #>,,,# ",
-"*<1X     X,<<<* ",
-"@234;   #13333* ",
-" X56X  $#7O155X ",
-" O2869    .0$*o ",
-"  :qwe9         ",
-"   9.rt9        ",
-"    9+y@u       ",
-"     i$$        ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/save.xpm b/contrib/samples/ogl/studio/bitmaps/save.xpm
deleted file mode 100644
index accf1f9eb2..0000000000
--- a/contrib/samples/ogl/studio/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/contrib/samples/ogl/studio/bitmaps/straight.xpm b/contrib/samples/ogl/studio/bitmaps/straight.xpm
deleted file mode 100644
index 12563b4703..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/straight.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *straight_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    16    15        2            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"################",
-".........#######",
-".........#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######..#######",
-"#######.........",
-"#######.........",
-"################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/texttool.bmp b/contrib/samples/ogl/studio/bitmaps/texttool.bmp
deleted file mode 100644
index 09c989aac1..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/texttool.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/texttool.xpm b/contrib/samples/ogl/studio/bitmaps/texttool.xpm
deleted file mode 100644
index db6308fcef..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/texttool.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char *texttool_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    22    22        2            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-/* pixels */
-"######################",
-"######################",
-"######################",
-"######################",
-"##########..##########",
-"##########..##########",
-"#########....#########",
-"#########....#########",
-"########.....#########",
-"########..#...########",
-"#######..##...########",
-"#######..###...#######",
-"######.........#######",
-"######..####...#######",
-"######.######...######",
-"#####..######...######",
-"####....####......####",
-"######################",
-"######################",
-"######################",
-"######################",
-"######################"
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/tick.bmp b/contrib/samples/ogl/studio/bitmaps/tick.bmp
deleted file mode 100644
index c0d66c9460..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/tick.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/tick.xpm b/contrib/samples/ogl/studio/bitmaps/tick.xpm
deleted file mode 100644
index 6099b2b8b3..0000000000
Binary files a/contrib/samples/ogl/studio/bitmaps/tick.xpm and /dev/null differ
diff --git a/contrib/samples/ogl/studio/bitmaps/undo.xpm b/contrib/samples/ogl/studio/bitmaps/undo.xpm
deleted file mode 100644
index 9266cb0e12..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/undo.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char *undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 37 1",
-"4 c #4E7FD0",
-"i c #3365B7",
-"q c #8DADE1",
-"= c #3162B3",
-", c #4A7CCE",
-"* c #779DDB",
-"7 c #7FA2DD",
-"8 c #6992D7",
-"2 c #6E96D8",
-"6 c #356AC1",
-"+ c #9BB7E5",
-"@ c #5886D2",
-"y c #BED0EE",
-"t c #C3D4EF",
-"5 c #85A7DF",
-". c #ADC4E9",
-"u c #DAE5F6",
-"  c None",
-"X c #487BCE",
-"r c #9FB9E5",
-"o c #254A87",
-"w c #AEC5EA",
-"e c #89A9DF",
-"0 c #98B5E4",
-"> c #3A70CA",
-"- c #3569BF",
-"& c #305FAC",
-"1 c #5D89D3",
-"; c #3366B9",
-"9 c #2E5CA8",
-"< c #638ED5",
-"3 c #3467BC",
-"O c #2F5DA9",
-"$ c #2A5398",
-"# c #376EC9",
-"% c #2D5AA5",
-": c #8CACE0",
-/* pixels */
-"      .XoooO+   ",
-"@    #o$$$$$o@  ",
-"o@  $%&&%$%&&$* ",
-"$%#$=-;$@:@$-;O ",
-"$>;->-$    @->$ ",
-"$,,,>$     *>,% ",
-"%<<<,O     O1<% ",
-"%22221$   :324@ ",
-"O551X6$#  O75O  ",
-"o%#8+    9704X  ",
-"        9qwe=   ",
-"       9rt+9    ",
-"      y@u.9     ",
-"       ##i      ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/bitmaps/vert.xpm b/contrib/samples/ogl/studio/bitmaps/vert.xpm
deleted file mode 100644
index 0f85e23920..0000000000
--- a/contrib/samples/ogl/studio/bitmaps/vert.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char *vert_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 3 1",
-"  c None",
-". c Black",
-"X c Yellow",
-/* pixels */
-"                ",
-"        ........",
-"        .XXXXXX.",
-"        .XXXXXX.",
-" .....  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .XXX.  .XXXXXX.",
-" .....  .XXXXXX.",
-"        .XXXXXX.",
-"        .XXXXXX.",
-"        ........",
-"                ",
-"                "
-};
diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
deleted file mode 100644
index 3eb05d3b8a..0000000000
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/cspalette.cpp
-// Purpose:     OGLEdit palette
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/laywin.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "doc.h"
-#include "view.h"
-#include "studio.h"
-#include "cspalette.h"
-#include "symbols.h"
-
-#ifndef __WXMSW__
-#include "bitmaps/arrow.xpm"
-#include "bitmaps/texttool.xpm"
-#endif
-
-/*
- * Object editor tool palette
- *
- */
-
-csEditorToolPalette::csEditorToolPalette(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style):
-  TOOLPALETTECLASS(parent, id, pos, size, style)
-{
-  m_currentlySelected = -1;
-
-  SetMaxRowsCols(1, 1000);
-}
-
-bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
-{
-  // BEGIN mutual exclusivity code
-  if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected))
-    ToggleTool(m_currentlySelected, false);
-
-  if (toggled)
-    m_currentlySelected = toolIndex;
-  else if (m_currentlySelected == toolIndex)
-    m_currentlySelected = -1;
-  //  END mutual exclusivity code
-
-  return true;
-}
-
-void csEditorToolPalette::OnMouseEnter(int toolIndex)
-{
-#if wxUSE_STATUSBAR
-    wxString msg = wxEmptyString;
-    if (toolIndex == PALETTE_ARROW)
-        msg = _T("Pointer");
-    else if (toolIndex != -1)
-    {
-        csSymbol* symbol = wxGetApp().GetSymbolDatabase()->FindSymbol(toolIndex);
-        if (symbol)
-            msg = symbol->GetName();
-    }
-    ((wxFrame*) wxGetApp().GetTopWindow())->SetStatusText(msg);
-#else
-    wxUnusedVar(toolIndex);
-#endif // wxUSE_STATUSBAR
-}
-
-void csEditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  TOOLPALETTECLASS::SetSize(x, y, width, height, sizeFlags);
-}
-
-void csEditorToolPalette::SetSelection(int sel)
-{
-    if ((sel != m_currentlySelected) && (m_currentlySelected != -1))
-    {
-        ToggleTool(m_currentlySelected, false);
-    }
-    m_currentlySelected = sel;
-    ToggleTool(m_currentlySelected, true);
-}
-
-bool csApp::CreatePalette(wxFrame *parent)
-{
-    // First create a layout window
-    wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_PALETTE, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
-    win->SetDefaultSize(wxSize(10000, 40));
-    win->SetOrientation(wxLAYOUT_HORIZONTAL);
-    win->SetAlignment(wxLAYOUT_TOP);
-    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    win->SetSashVisible(wxSASH_BOTTOM, true);
-
-    m_diagramPaletteSashWindow = win;
-
-    m_diagramPaletteSashWindow->Show(false);
-
-  // Load palette bitmaps
-#ifdef __WXMSW__
-    wxBitmap PaletteArrow(_T("arrowtool"));
-    wxBitmap TextTool(_T("texttool"));
-    wxSize toolBitmapSize(32, 32);
-#else // !__WXMSW__
-    wxBitmap PaletteArrow(arrow_xpm);
-    wxBitmap TextTool(texttool_xpm);
-    wxSize toolBitmapSize(22, 22);
-#endif
-
-  csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER);
-
-  palette->SetMargins(2, 2);
-
-  palette->SetToolBitmapSize(toolBitmapSize);
-
-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Pointer"));
-  palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultCoord, NULL, _T("Text"));
-
-  wxChar** symbols = new wxChar*[20];
-  int noSymbols = 0;
-
-  symbols[noSymbols] = _T("Wide Rectangle");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("Thin Rectangle");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("Triangle");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("Octagon");
-  noSymbols ++;
-
-  // For some reason, we're getting Gdk errors with
-  // some shapes, such as ones that use DrawEllipse.
-#ifndef __WXGTK__
-  symbols[noSymbols] =  _T("Group");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("Circle");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("Circle shadow");
-  noSymbols ++;
-
-  symbols[noSymbols] =  _T("SemiCircle");
-  noSymbols ++;
-#endif
-
-  int i;
-  for (i = 0; i < noSymbols; i++)
-  {
-      csSymbol* symbol = GetSymbolDatabase()->FindSymbol(symbols[i]);
-      if (symbol)
-      {
-           wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
-           palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());
-
-           delete bitmap;
-      }
-  }
-  delete[] symbols;
-
-#if 0
-  wxNode* node = GetSymbolDatabase()->GetSymbols().First();
-  while (node)
-  {
-    csSymbol* symbol = (csSymbol*) node->Data();
-
-    wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
-    palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultCoord, NULL, symbol->GetName());
-
-    delete bitmap;
-
-    node = node->Next();
-  }
-#endif
-
-  palette->Realize();
-
-  palette->SetSelection(PALETTE_ARROW);
-  m_diagramPalette = palette;
-
-  return true;
-}
diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h
deleted file mode 100644
index 15f34157bd..0000000000
--- a/contrib/samples/ogl/studio/cspalette.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/cspalette.h
-// Purpose:     OGL sample palette
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_CSPALETTE_H_
-#define _STUDIO_CSPALETTE_H_
-
-#include "wx/wx.h"
-#include "wx/string.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-/*
- * Object editor tool palette
- *
- */
-
-#define TOOLPALETTECLASS    wxToolBar
-
-class csEditorToolPalette: public TOOLPALETTECLASS
-{
-public:
-
-  csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-    const wxSize& size = wxDefaultSize,
-    long style = wxTB_VERTICAL);
-
-  bool OnLeftClick(int toolIndex, bool toggled);
-  void OnMouseEnter(int toolIndex);
-
-  inline int GetSelection() const { return m_currentlySelected; }
-  void SetSelection(int sel);
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-
-protected:
-  int           m_currentlySelected;
-};
-
-#define PALETTE_ARROW           200
-#define PALETTE_TEXT_TOOL       201
-
-#endif
-    // _STUDIO_CSPALETTE_H_
diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp
deleted file mode 100644
index 862d0deaba..0000000000
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/csprint.cpp
-// Purpose:     Printing and clipboard functionality
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "wx/clipbrd.h"
-
-#ifdef __WXMSW__
-#include "wx/metafile.h"
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxDiagramClipboard, wxDiagram)
-
-// Copy selection
-bool wxDiagramClipboard::Copy(wxDiagram* diagram)
-{
-    DeleteAllShapes();
-
-    return DoCopy(diagram, this, false, NULL);
-}
-
-// Copy contents to the diagram, with new ids.
-
-bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY)
-{
-    return DoCopy(this, diagram, true, dc, offsetX, offsetY);
-}
-
-// Universal copy function (to or from clipboard).
-// TODO:
-// Note that this only works for non-composites so far (nested shapes
-// don't have their old-to-new object mappings stored).
-// Also, lines don't yet get their attachment points moved to the new offset position
-// if they have more than 2 points.
-bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bool newIds,
-    wxDC* dc, int offsetX, int offsetY)
-{
-    OnStartCopy(diagramTo);
-
-    wxHashTable mapping(wxKEY_INTEGER);
-
-    // First copy all node shapes.
-    wxList* shapeList = diagramFrom->GetShapeList();
-    wxObjectList::compatibility_iterator node = shapeList->GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (((diagramFrom == this) || shape->Selected()) && !shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxShape* newShape = shape->CreateNewCopy();
-            newShape->GetLines().Clear();
-            if (newIds)
-            {
-                newShape->AssignNewIds();
-            }
-            mapping.Put((long) shape, (wxObject*) newShape);
-
-            newShape->SetX(newShape->GetX() + offsetX);
-            newShape->SetY(newShape->GetY() + offsetY);
-
-            OnAddShape(diagramTo, newShape, dc);
-
-        }
-        node = node->GetNext();
-    }
-
-    node = shapeList->GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (((diagramFrom == this) || shape->Selected()) && shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxLineShape* lineShape = (wxLineShape*) shape;
-            // Only copy a line if its ends are selected too.
-            if ((diagramFrom == this) || (lineShape->GetTo()->Selected() && lineShape->GetFrom()->Selected()))
-            {
-                wxLineShape* newShape = (wxLineShape*) shape->CreateNewCopy();
-                mapping.Put((long) shape, (wxObject*) newShape);
-
-                if (newIds)
-                    newShape->AssignNewIds();
-
-                wxShape* fromShape = (wxShape*) mapping.Get((long) lineShape->GetFrom());
-                wxShape* toShape = (wxShape*) mapping.Get((long) lineShape->GetTo());
-
-                wxASSERT_MSG( (fromShape != NULL), _T("Could not find 'from' shape"));
-                wxASSERT_MSG( (toShape != NULL), _T("Could not find 'to' shape"));
-
-                fromShape->AddLine(newShape, toShape, newShape->GetAttachmentFrom(),
-                  newShape->GetAttachmentTo());
-
-                OnAddShape(diagramTo, newShape, dc);
-
-            }
-        }
-        node = node->GetNext();
-    }
-
-    // Now make sure line ordering is correct
-    node = shapeList->GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (((diagramFrom == this) || shape->Selected()) && !shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxShape* newShape = (wxShape*) mapping.Get((long) shape);
-
-            // Make a list of all the new lines, in the same order as the old lines.
-            // Then apply the list of new lines to the shape.
-            wxList newLines;
-            wxObjectList::compatibility_iterator lineNode = shape->GetLines().GetFirst();
-            while (lineNode)
-            {
-                wxLineShape* lineShape = (wxLineShape*) lineNode->GetData();
-                if ((diagramFrom == this) || (lineShape->GetTo()->Selected() && lineShape->GetFrom()->Selected()))
-                {
-                    wxLineShape* newLineShape = (wxLineShape*) mapping.Get((long) lineShape);
-
-                    wxASSERT_MSG( (newLineShape != NULL), _T("Could not find new line shape"));
-
-                    newLines.Append(newLineShape);
-                }
-
-                lineNode = lineNode->GetNext();
-            }
-
-            if (newLines.GetCount() > 0)
-                newShape->ApplyAttachmentOrdering(newLines);
-        }
-        node = node->GetNext();
-    }
-
-    OnEndCopy(diagramTo);
-
-    return true;
-}
-
-#ifdef __WXMSW__
-// Draw contents to a Windows metafile device context and a bitmap, and copy
-// these to the Windows clipboard
-bool wxDiagramClipboard::CopyToClipboard(double scale)
-{
-#if wxUSE_METAFILE
-  // Make a metafile DC
-  wxMetaFileDC mfDC;
-  if (mfDC.Ok())
-  {
-    mfDC.SetUserScale(scale, scale);
-
-    // Draw on metafile DC
-    Redraw(mfDC);
-
-    // int printWidth = mfDC.MaxX() - mfDC.MinX();
-    // int printHeight = mfDC.MaxY() - mfDC.MinY();
-    int maxX = (int)mfDC.MaxX();
-    int maxY = (int)mfDC.MaxY();
-    wxMetaFile *mf = mfDC.Close();
-
-    // Set to a bitmap memory DC
-    wxBitmap *newBitmap = new wxBitmap((int)(maxX + 10), (int)(maxY + 10));
-    if (!newBitmap->Ok())
-    {
-      delete newBitmap;
-
-      wxChar buf[200];
-      wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
-      wxMessageBox(buf, _T("Clipboard copy problem"));
-      return false;
-    }
-
-    wxMemoryDC memDC;
-    memDC.SelectObject(*newBitmap);
-    memDC.Clear();
-
-    // Now draw on memory bitmap DC
-    Redraw(memDC);
-
-    memDC.SelectObject(wxNullBitmap);
-
-    // Open clipboard and set the data
-    if (wxOpenClipboard())
-    {
-        wxEmptyClipboard();
-
-        // Copy the bitmap to the clipboard
-        wxSetClipboardData(wxDF_BITMAP, newBitmap, 0, 0);
-
-#if 0 // TODO: replace this code (wxEnhMetaFile doesn't have SetClipboard)
-        if (mf)
-        {
-            // Copy the metafile to the clipboard
-            // Allow a small margin
-            bool success = mf->SetClipboard((int)(mfDC.MaxX() + 15), (int)(mfDC.MaxY() + 15));
-        }
-#endif
-
-        // Close clipboard
-        wxCloseClipboard();
-    }
-
-    delete newBitmap;
-    delete mf;
-
-  }
-  return true;
-#else
-  wxMessageBox("wxUSE_METAFILE in build required to use Clipboard", _T("Clipboard copy problem"));
-  return false;
-#endif
-}
-#endif
-    // __WXMSW__
-
-// Override this to e.g. have the shape added through a Do/Undo command system.
-// By default, we'll just add it directly to the destination diagram.
-bool wxDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc)
-{
-    diagramTo->AddShape(newShape);
-
-    if (dc && (diagramTo != this))
-    {
-        newShape->Select(true, dc);
-    }
-
-    return true;
-}
-
-/*
- * csDiagramClipboard
- */
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramClipboard, wxDiagramClipboard)
-
-// Start/end copying
-bool csDiagramClipboard::OnStartCopy(wxDiagram* diagramTo)
-{
-    // Do nothing if copying to the clipboard
-    if (diagramTo == this)
-        return true;
-
-    // Deselect all objects initially.
-
-    csDiagram* diagram = (csDiagram*) diagramTo;
-    csDiagramDocument* doc = diagram->GetDocument();
-    ((csDiagramView*)doc->GetFirstView())->SelectAll(false);
-
-    m_currentCmd = new csDiagramCommand(_T("Paste"), doc);
-
-    return true;
-}
-
-bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
-{
-    // Do nothing if copying to the clipboard
-    if (diagramTo == this)
-        return true;
-
-    csDiagram* diagram = (csDiagram*) diagramTo;
-    csDiagramDocument* doc = diagram->GetDocument();
-
-    if (m_currentCmd)
-    {
-        if (m_currentCmd->GetStates().GetCount() == 0)
-        {
-            delete m_currentCmd;
-        }
-        else
-        {
-            doc->GetCommandProcessor()->Submit(m_currentCmd);
-            m_currentCmd = NULL;
-        }
-    }
-    return true;
-}
-
-// Use the command framework to add the shapes, if we're copying to a diagram and
-// not the clipboard.
-bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* WXUNUSED(dc))
-{
-    if (diagramTo == this)
-    {
-        diagramTo->AddShape(newShape);
-    }
-    else
-    {
-        csDiagram* diagram = (csDiagram*) diagramTo;
-        /* csDiagramDocument* doc = */ diagram->GetDocument();
-
-        if (newShape->IsKindOf(CLASSINFO(wxLineShape)))
-            m_currentCmd->AddState(new csCommandState(ID_CS_ADD_LINE_SELECT, newShape, NULL));
-        else
-            m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL));
-    }
-
-    return true;
-}
diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp
deleted file mode 100644
index 8b61d315f3..0000000000
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/dialogs.cpp
-// Purpose:     Implements Studio dialogs
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "dialogs.h"
-#include "doc.h"
-#include "view.h"
-#include "studio.h"
-#include "studio_resources.h"
-
-#if wxUSE_WX_RESOURCES
-
-IMPLEMENT_CLASS(csLabelEditingDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csLabelEditingDialog, wxDialog)
-    EVT_BUTTON(wxID_OK, csLabelEditingDialog::OnOK)
-END_EVENT_TABLE()
-
-csLabelEditingDialog::csLabelEditingDialog(wxWindow* parent)
-{
-    wxLoadFromResource(this, parent, _T("shape_label_dialog"));
-
-    // Accelerators
-    wxAcceleratorEntry entries[1];
-    entries[0].Set(wxACCEL_CTRL, WXK_RETURN, wxID_OK);
-    wxAcceleratorTable accel(1, entries);
-    SetAcceleratorTable(accel);
-
-    Centre();
-
-    wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
-    wxASSERT( (textCtrl != NULL) );
-
-//    textCtrl->SetAcceleratorTable(accel);
-
-    textCtrl->SetFocus();
-}
-
-void csLabelEditingDialog::OnOK(wxCommandEvent& event)
-{
-    wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
-    wxASSERT( (textCtrl != NULL) );
-
-    SetShapeLabel(textCtrl->GetValue());
-
-    wxDialog::OnOK(event);
-}
-
-void csLabelEditingDialog::SetShapeLabel(const wxString& label)
-{
-    wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
-    wxASSERT( (textCtrl != NULL) );
-
-    m_label = label;
-
-    textCtrl->SetValue(label);
-}
-
-IMPLEMENT_CLASS(csSettingsDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csSettingsDialog, wxDialog)
-    EVT_BUTTON(wxID_OK, csSettingsDialog::OnOK)
-END_EVENT_TABLE()
-
-#define PROPERTY_DIALOG_WIDTH   400
-#define PROPERTY_DIALOG_HEIGHT  400
-
-// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
-
-csSettingsDialog::csSettingsDialog(wxWindow* parent):
-    wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
-{
-    m_generalSettings = NULL;
-    m_diagramSettings = NULL;
-
-    m_notebook = new wxNotebook(this, ID_PROPERTY_NOTEBOOK,
-         wxPoint(2, 2), wxSize(PROPERTY_DIALOG_WIDTH - 4, PROPERTY_DIALOG_HEIGHT - 4));
-
-    m_generalSettings = new wxPanel;
-
-    #ifdef  __WXDEBUG__
-    bool success =
-    #endif
-                   wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
-    wxASSERT_MSG( (success), _T("Could not load general settings panel."));
-    m_notebook->AddPage(m_generalSettings, _T("General"), true);
-
-    m_diagramSettings = new wxPanel;
-
-    #ifdef  __WXDEBUG__
-    success =
-    #endif
-              wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog"));
-    wxASSERT_MSG( (success), _T("Could not load diagram settings panel."));
-    m_notebook->AddPage(m_diagramSettings, _T("Diagram"));
-
-    int largeButtonWidth = 70;
-    int largeButtonHeight = 22;
-
-    wxButton* okButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _T("Cancel"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-    wxButton* helpButton = new wxButton(this, wxID_HELP, _T("Help"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-
-    // Constraints for the notebook
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->top.SameAs     (this, wxTop, 5);
-    c->left.SameAs    (this, wxLeft, 5);
-    c->right.SameAs   (this, wxRight, 5);
-    c->bottom.SameAs  (cancelButton, wxTop, 5);
-    m_notebook->SetConstraints(c);
-
-    // Constraints for the Help button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (this, wxRight, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    helpButton->SetConstraints(c);
-
-    // Constraints for the Cancel button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (helpButton, wxLeft, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    cancelButton->SetConstraints(c);
-
-    // Constraints for the OK button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (cancelButton, wxLeft, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    okButton->SetConstraints(c);
-
-    okButton->SetDefault();
-    okButton->SetFocus();
-
-    Layout();
-    Centre(wxBOTH);
-}
-
-void csSettingsDialog::OnOK(wxCommandEvent& event)
-{
-    wxDialog::OnOK(event);
-}
-
-bool csSettingsDialog::TransferDataToWindow()
-{
-    wxTextCtrl* gridSpacing = (wxTextCtrl*) m_diagramSettings->FindWindow(ID_GRID_SPACING);
-    wxASSERT_MSG( (gridSpacing != (wxTextCtrl*) NULL), _T("Could not find grid spacing control."));
-
-    wxChoice* gridStyle = (wxChoice*) m_diagramSettings->FindWindow(ID_GRID_STYLE);
-    wxASSERT_MSG( (gridStyle != (wxChoice*) NULL), _T("Could not find grid style control."));
-
-    gridStyle->SetSelection(wxGetApp().GetGridStyle());
-
-    wxString str;
-    str.Printf(_T("%d"), wxGetApp().GetGridSpacing());
-    gridSpacing->SetValue(str);
-
-    return true;
-}
-
-bool csSettingsDialog::TransferDataFromWindow()
-{
-    wxTextCtrl* gridSpacing = (wxTextCtrl*) m_diagramSettings->FindWindow(ID_GRID_SPACING);
-    wxASSERT_MSG( (gridSpacing != (wxTextCtrl*) NULL), _T("Could not find grid spacing control."));
-
-    wxChoice* gridStyle = (wxChoice*) m_diagramSettings->FindWindow(ID_GRID_STYLE);
-    wxASSERT_MSG( (gridStyle != (wxChoice*) NULL), _T("Could not find grid style control."));
-
-    wxGetApp().SetGridStyle(gridStyle->GetSelection());
-    wxString str = gridSpacing->GetValue();
-    long grid_spacing;
-    str.ToLong( &grid_spacing);
-    wxGetApp().SetGridSpacing(grid_spacing);
-
-    if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED)
-    {
-        wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION);
-        return false;
-    }
-
-    // Apply settings to all open diagram documents
-    wxObjectList::compatibility_iterator node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
-    while (node)
-    {
-        wxDocument* doc = (wxDocument*) node->GetData();
-        if (doc->IsKindOf(CLASSINFO(csDiagramDocument)))
-        {
-            csDiagramDocument* diagramDoc = (csDiagramDocument*) doc;
-            wxDiagram* diagram = (wxDiagram*) diagramDoc->GetDiagram();
-
-            diagram->SetGridSpacing((double) wxGetApp().GetGridSpacing());
-            switch (wxGetApp().GetGridStyle())
-            {
-                case csGRID_STYLE_NONE:
-                {
-                    diagram->SetSnapToGrid(false);
-                    break;
-                }
-                case csGRID_STYLE_INVISIBLE:
-                {
-                    diagram->SetSnapToGrid(true);
-                    break;
-                }
-                case csGRID_STYLE_DOTTED:
-                {
-                    // TODO (not implemented in OGL)
-                    break;
-                }
-            }
-        }
-        node = node->GetNext();
-    }
-
-    return true;
-}
-
-/*
- * Shape properties dialog (tabbed)
- */
-
-
-IMPLEMENT_CLASS(csShapePropertiesDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(csShapePropertiesDialog, wxDialog)
-    EVT_BUTTON(wxID_OK, csShapePropertiesDialog::OnOK)
-END_EVENT_TABLE()
-
-#define SHAPE_PROPERTY_DIALOG_WIDTH   400
-#define SHAPE_PROPERTY_DIALOG_HEIGHT  400
-
-// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
-
-csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
-    wxPanel* attributeDialog, const wxString& attributeDialogName):
-    wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
-{
-    m_attributeDialog = attributeDialog;
-    m_alternativeAttributeDialog = NULL;
-    m_generalPropertiesDialog = NULL;
-
-    m_notebook = new wxNotebook(this, ID_SHAPE_PROPERTY_NOTEBOOK,
-         wxPoint(2, 2), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH - 4, SHAPE_PROPERTY_DIALOG_HEIGHT - 4));
-
-    m_generalPropertiesDialog = new csGeneralShapePropertiesDialog;
-    #ifdef  __WXDEBUG__
-    bool success =
-    #endif
-                   wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog"));
-    wxASSERT_MSG( (success), _T("Could not load general properties panel."));
-    m_notebook->AddPage(m_generalPropertiesDialog, _T("General"));
-
-    if (!wxLoadFromResource(m_attributeDialog, m_notebook, attributeDialogName))
-    {
-        wxMessageBox(_T("Could not load the attribute dialog for this shape."), _T("Studio"), wxICON_EXCLAMATION);
-        delete m_attributeDialog;
-        m_attributeDialog = NULL;
-    }
-    else
-    {
-        m_notebook->AddPage(m_attributeDialog, _T("Attributes"));
-    }
-
-    // Try the alternative dialog (test code)
-    wxString str(attributeDialogName);
-    str += _T("1");
-    m_alternativeAttributeDialog = new wxPanel;
-    if (wxLoadFromResource(m_alternativeAttributeDialog, m_notebook, str))
-    {
-        m_notebook->AddPage(m_alternativeAttributeDialog, _T("Attributes (alternative)"));
-    }
-    else
-    {
-        delete m_alternativeAttributeDialog;
-        m_alternativeAttributeDialog = NULL;
-    }
-
-    int largeButtonWidth = 70;
-    int largeButtonHeight = 22;
-
-    wxButton* okButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _T("Cancel"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-    wxButton* helpButton = new wxButton(this, wxID_HELP, _T("Help"), wxPoint(0, 0), wxSize(largeButtonWidth, largeButtonHeight));
-
-    // Constraints for the notebook
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->top.SameAs     (this, wxTop, 5);
-    c->left.SameAs    (this, wxLeft, 5);
-    c->right.SameAs   (this, wxRight, 5);
-    c->bottom.SameAs  (helpButton, wxTop, 5);
-    m_notebook->SetConstraints(c);
-
-    // Constraints for the Help button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (this, wxRight, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    helpButton->SetConstraints(c);
-
-    // Constraints for the Cancel button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (helpButton, wxLeft, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    cancelButton->SetConstraints(c);
-
-    // Constraints for the OK button
-    c = new wxLayoutConstraints;
-    c->width.AsIs();
-    c->height.AsIs();
-    c->right.SameAs    (cancelButton, wxLeft, 5);
-    c->bottom.SameAs   (this, wxBottom, 5);
-    okButton->SetConstraints(c);
-
-    okButton->SetDefault();
-    okButton->SetFocus();
-
-    SetDefaults();
-
-    Layout();
-    Centre(wxBOTH);
-}
-
-void csShapePropertiesDialog::OnOK(wxCommandEvent& event)
-{
-    wxTextCtrl* textCtrl = (wxTextCtrl*) m_generalPropertiesDialog->FindWindow(ID_LABELTEXT);
-    wxASSERT( (textCtrl != NULL) );
-
-    m_generalPropertiesDialog->SetShapeLabel(textCtrl->GetValue());
-
-    wxDialog::OnOK(event);
-}
-
-// Set some suitable defaults in the attribute dialogs (in the first instance,
-// just set all wxChoices to the first element)
-void csShapePropertiesDialog::SetDefaults()
-{
-    if (!m_attributeDialog)
-        return;
-
-    wxWindowList::compatibility_iterator node = m_attributeDialog->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* child = (wxWindow*) node->GetData();
-        if (child->IsKindOf(CLASSINFO(wxChoice)))
-        {
-            wxChoice* choice = (wxChoice*) child;
-            choice->SetSelection(0);
-        }
-        node = node->GetNext();
-    }
-
-    if (!m_alternativeAttributeDialog)
-        return;
-
-    node = m_alternativeAttributeDialog->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* child = (wxWindow*) node->GetData();
-        if (child->IsKindOf(CLASSINFO(wxChoice)))
-        {
-            wxChoice* choice = (wxChoice*) child;
-            choice->SetSelection(0);
-        }
-        node = node->GetNext();
-    }
-}
-
-/*
- * csGeneralShapePropertiesDialog
- */
-
-IMPLEMENT_CLASS(csGeneralShapePropertiesDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csGeneralShapePropertiesDialog, wxPanel)
-END_EVENT_TABLE()
-
-csGeneralShapePropertiesDialog::csGeneralShapePropertiesDialog()
-{
-}
-
-void csGeneralShapePropertiesDialog::SetShapeLabel(const wxString& label)
-{
-    wxTextCtrl* textCtrl = (wxTextCtrl*) FindWindow(ID_LABELTEXT);
-    wxASSERT( (textCtrl != NULL) );
-
-    m_label = label;
-
-    textCtrl->SetValue(label);
-}
-
-#endif // wxUSE_WX_RESOURCES
-
-/*
- * csThinRectangleDialog
- */
-
-IMPLEMENT_CLASS(csThinRectangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csThinRectangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csThinRectangleDialog::csThinRectangleDialog()
-{
-}
-
-/*
- * csWideRectangleDialog
- */
-
-IMPLEMENT_CLASS(csWideRectangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csWideRectangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csWideRectangleDialog::csWideRectangleDialog()
-{
-}
-
-/*
- * csTriangleDialog
- */
-
-IMPLEMENT_CLASS(csTriangleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csTriangleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csTriangleDialog::csTriangleDialog()
-{
-}
-
-/*
- * csSemiCircleDialog
- */
-
-IMPLEMENT_CLASS(csSemiCircleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csSemiCircleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csSemiCircleDialog::csSemiCircleDialog()
-{
-}
-
-/*
- * csCircleDialog
- */
-
-IMPLEMENT_CLASS(csCircleDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csCircleDialog, wxPanel)
-END_EVENT_TABLE()
-
-csCircleDialog::csCircleDialog()
-{
-}
-
-/*
- * csCircleShadowDialog
- */
-
-IMPLEMENT_CLASS(csCircleShadowDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csCircleShadowDialog, wxPanel)
-END_EVENT_TABLE()
-
-csCircleShadowDialog::csCircleShadowDialog()
-{
-}
-
-/*
- * csOctagonDialog
- */
-
-IMPLEMENT_CLASS(csOctagonDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csOctagonDialog, wxPanel)
-END_EVENT_TABLE()
-
-csOctagonDialog::csOctagonDialog()
-{
-}
-
-/*
- * csGroupDialog
- */
-
-IMPLEMENT_CLASS(csGroupDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csGroupDialog, wxPanel)
-END_EVENT_TABLE()
-
-csGroupDialog::csGroupDialog()
-{
-}
-
-/*
- * csTextBoxDialog
- */
-
-IMPLEMENT_CLASS(csTextBoxDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(csTextBoxDialog, wxPanel)
-END_EVENT_TABLE()
-
-csTextBoxDialog::csTextBoxDialog()
-{
-}
diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h
deleted file mode 100644
index 10622f43a3..0000000000
--- a/contrib/samples/ogl/studio/dialogs.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/dialogs.h
-// Purpose:     Miscellaneous dialogs
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_DIALOGS_H_
-#define _STUDIO_DIALOGS_H_
-
-#include "wx/wx.h"
-#include "wx/notebook.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#if wxUSE_WX_RESOURCES
-
-/*
- * Label editing dialog (about to become obsolete)
- */
-
-class csLabelEditingDialog: public wxDialog
-{
-DECLARE_CLASS(csLabelEditingDialog)
-public:
-    csLabelEditingDialog(wxWindow* parent);
-
-    void SetShapeLabel(const wxString& label);
-    inline wxString GetShapeLabel() const { return m_label; }
-
-    void OnOK(wxCommandEvent& event);
-
-protected:
-    wxString    m_label;
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * Settings dialog (tabbed)
- */
-
-class csSettingsDialog: public wxDialog
-{
-DECLARE_CLASS(csSettingsDialog)
-public:
-    csSettingsDialog(wxWindow* parent);
-
-    void OnOK(wxCommandEvent& event);
-
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-protected:
-
-    wxPanel*    m_generalSettings;
-    wxPanel*    m_diagramSettings;
-    wxNotebook* m_notebook;
-
-DECLARE_EVENT_TABLE()
-};
-
-#define ID_PROPERTY_NOTEBOOK    1000
-#define ID_GENERAL_SETTINGS     1002
-#define ID_DIAGRAM_SETTINGS     1003
-
-/*
- * csGeneralShapePropertiesDialog
- * Name, description etc.
- */
-
-class csGeneralShapePropertiesDialog: public wxPanel
-{
-DECLARE_CLASS(csGeneralShapePropertiesDialog)
-public:
-    csGeneralShapePropertiesDialog();
-
-    void SetShapeLabel(const wxString& label);
-    inline wxString GetShapeLabel() const { return m_label; }
-
-protected:
-    wxString    m_label;
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * Shape properties dialog (tabbed)
- */
-
-class csShapePropertiesDialog: public wxDialog
-{
-DECLARE_CLASS(csShapePropertiesDialog)
-public:
-    csShapePropertiesDialog(wxWindow* parent, const wxString& title, wxPanel* attributeDialog, const wxString& attributeDialogName);
-
-    void OnOK(wxCommandEvent& event);
-
-    // Set some suitable defaults in the attribute dialogs (in the first instance,
-    // just set all wxChoices to the first element)
-    void SetDefaults();
-
-// Accessors
-    csGeneralShapePropertiesDialog* GetGeneralPropertiesDialog() const { return m_generalPropertiesDialog; }
-
-
-protected:
-
-    // Attributes, specific to each shape
-    wxPanel*                        m_attributeDialog;
-    wxPanel*                        m_alternativeAttributeDialog;
-
-   // General properties, same for each shape, e.g. name/description
-    csGeneralShapePropertiesDialog* m_generalPropertiesDialog;
-
-    wxNotebook* m_notebook;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_WX_RESOURCES
-
-#define ID_SHAPE_PROPERTY_NOTEBOOK    1000
-
-//// Specific attribute-editing panel classes below here
-
-/*
- * csThinRectangleDialog
- */
-
-class csThinRectangleDialog: public wxPanel
-{
-DECLARE_CLASS(csThinRectangleDialog)
-public:
-    csThinRectangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csWideRectangleDialog
- */
-
-class csWideRectangleDialog: public wxPanel
-{
-DECLARE_CLASS(csWideRectangleDialog)
-public:
-    csWideRectangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csTriangleDialog
- */
-
-class csTriangleDialog: public wxPanel
-{
-DECLARE_CLASS(csTriangleDialog)
-public:
-    csTriangleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csSemiCircleDialog
- */
-
-class csSemiCircleDialog: public wxPanel
-{
-DECLARE_CLASS(csSemiCircleDialog)
-public:
-    csSemiCircleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csCircleDialog
- */
-
-class csCircleDialog: public wxPanel
-{
-DECLARE_CLASS(csCircleDialog)
-public:
-    csCircleDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csCircleShadowDialog
- */
-
-class csCircleShadowDialog: public wxPanel
-{
-DECLARE_CLASS(csCircleShadowDialog)
-public:
-    csCircleShadowDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csOctagonDialog
- */
-
-class csOctagonDialog: public wxPanel
-{
-DECLARE_CLASS(csOctagonDialog)
-public:
-    csOctagonDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csGroupDialog
- */
-
-class csGroupDialog: public wxPanel
-{
-DECLARE_CLASS(csGroupDialog)
-public:
-    csGroupDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-/*
- * csTextBoxDialog
- */
-
-class csTextBoxDialog: public wxPanel
-{
-DECLARE_CLASS(csTextBoxDialog)
-public:
-    csTextBoxDialog();
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _STUDIO_DIALOGS_H_
diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
deleted file mode 100644
index ed0a3a88d8..0000000000
--- a/contrib/samples/ogl/studio/doc.cpp
+++ /dev/null
@@ -1,593 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/doc.cpp
-// Purpose:     Implements document functionality
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "view.h"
-#include "wx/ogl/basicp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument)
-
-#ifdef __VISUALC__
-#pragma warning(disable:4355)
-#endif
-
-csDiagramDocument::csDiagramDocument():m_diagram(this)
-{
-}
-
-#ifdef __VISUALC__
-#pragma warning(default:4355)
-#endif
-
-csDiagramDocument::~csDiagramDocument()
-{
-}
-
-bool csDiagramDocument::OnCloseDocument()
-{
-  m_diagram.DeleteAllShapes();
-  return true;
-}
-
-#if wxUSE_PROLOGIO
-bool csDiagramDocument::OnSaveDocument(const wxString& file)
-{
-  if (file == wxEmptyString)
-    return false;
-
-  if (!m_diagram.SaveFile(file))
-  {
-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxEmptyString)
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_T("File error"));
-
-    (void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-      GetDocumentWindow());
-    return false;
-  }
-
-  Modify(false);
-  SetFilename(file);
-  return true;
-}
-
-bool csDiagramDocument::OnOpenDocument(const wxString& file)
-{
-  if (!OnSaveModified())
-    return false;
-
-  wxString msgTitle;
-  if (wxTheApp->GetAppName() != wxEmptyString)
-    msgTitle = wxTheApp->GetAppName();
-  else
-    msgTitle = wxString(_T("File error"));
-
-  m_diagram.DeleteAllShapes();
-  if (!m_diagram.LoadFile(file))
-  {
-    (void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-     GetDocumentWindow());
-    return false;
-  }
-  SetFilename(file, true);
-  Modify(false);
-  UpdateAllViews();
-
-  return true;
-}
-#endif // wxUSE_PROLOGIO
-
-
-/*
- * Implementation of drawing command
- */
-
-csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
-    csCommandState* onlyState):
-  wxCommand(true, name)
-{
-  m_doc = doc;
-
-  if (onlyState)
-  {
-    AddState(onlyState);
-  }
-}
-
-csDiagramCommand::~csDiagramCommand()
-{
-    wxObjectList::compatibility_iterator node = m_states.GetFirst();
-    while (node)
-    {
-        csCommandState* state = (csCommandState*) node->GetData();
-        delete state;
-        node = node->GetNext();
-    }
-}
-
-void csDiagramCommand::AddState(csCommandState* state)
-{
-    state->m_doc = m_doc;
-//    state->m_cmd = m_cmd;
-    m_states.Append(state);
-}
-
-// Insert a state at the beginning of the list
-void csDiagramCommand::InsertState(csCommandState* state)
-{
-    state->m_doc = m_doc;
-//    state->m_cmd = m_cmd;
-    m_states.Insert(state);
-}
-
-// Schedule all lines connected to the states to be cut.
-void csDiagramCommand::RemoveLines()
-{
-    wxObjectList::compatibility_iterator node = m_states.GetFirst();
-    while (node)
-    {
-        csCommandState* state = (csCommandState*) node->GetData();
-        wxShape* shape = state->GetShapeOnCanvas();
-        wxASSERT( (shape != NULL) );
-
-        wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();
-        while (node1)
-        {
-            wxLineShape *line = (wxLineShape *)node1->GetData();
-            if (!FindStateByShape(line))
-            {
-                csCommandState* newState = new csCommandState(ID_CS_CUT, NULL, line);
-                InsertState(newState);
-            }
-
-            node1 = node1->GetNext();
-        }
-        node = node->GetNext();
-    }
-}
-
-csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
-{
-    wxObjectList::compatibility_iterator node = m_states.GetFirst();
-    while (node)
-    {
-        csCommandState* state = (csCommandState*) node->GetData();
-        if (shape == state->GetShapeOnCanvas() || shape == state->GetSavedState())
-            return state;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-bool csDiagramCommand::Do()
-{
-    wxObjectList::compatibility_iterator node = m_states.GetFirst();
-    while (node)
-    {
-        csCommandState* state = (csCommandState*) node->GetData();
-        if (!state->Do())
-            return false;
-        node = node->GetNext();
-    }
-    return true;
-}
-
-bool csDiagramCommand::Undo()
-{
-    // Undo in reverse order, so e.g. shapes get added
-    // back before the lines do.
-    wxObjectList::compatibility_iterator node = m_states.GetLast();
-    while (node)
-    {
-        csCommandState* state = (csCommandState*) node->GetData();
-        if (!state->Undo())
-            return false;
-        node = node->GetPrevious();
-    }
-    return true;
-}
-
-csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas)
-{
-    m_cmd = cmd;
-    m_doc = NULL;
-    m_savedState = savedState;
-    m_shapeOnCanvas = shapeOnCanvas;
-    m_linePositionFrom = 0;
-    m_linePositionTo = 0;
-}
-
-csCommandState::~csCommandState()
-{
-    if (m_savedState)
-    {
-        m_savedState->SetCanvas(NULL);
-        delete m_savedState;
-    }
-}
-
-bool csCommandState::Do()
-{
-  switch (m_cmd)
-  {
-    case ID_CS_CUT:
-    {
-        // New state is 'nothing' - maybe pass shape ID to state so we know what
-        // we're talking about.
-        // Then save old shape in m_savedState (actually swap pointers)
-
-        wxASSERT( (m_shapeOnCanvas != NULL) );
-        wxASSERT( (m_savedState == NULL) ); // new state will be 'nothing'
-        wxASSERT( (m_doc != NULL) );
-
-        wxShapeCanvas* canvas = m_shapeOnCanvas->GetCanvas();
-
-        // In case this is a line
-        wxShape* lineFrom = NULL;
-        wxShape* lineTo = NULL;
-        int attachmentFrom = 0, attachmentTo = 0;
-
-        if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            // Store the from/to info to save in the line shape
-            wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
-            lineFrom = lineShape->GetFrom();
-            lineTo = lineShape->GetTo();
-            attachmentFrom = lineShape->GetAttachmentFrom();
-            attachmentTo = lineShape->GetAttachmentTo();
-
-            m_linePositionFrom = lineFrom->GetLinePosition(lineShape);
-            m_linePositionTo = lineTo->GetLinePosition(lineShape);
-        }
-
-        m_shapeOnCanvas->Select(false);
-        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
-
-        m_shapeOnCanvas->Unlink();
-
-        m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
-
-        m_savedState = m_shapeOnCanvas;
-
-        if (m_savedState->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            // Restore the from/to info for future reference
-            wxLineShape* lineShape = (wxLineShape*) m_savedState;
-            lineShape->SetFrom(lineFrom);
-            lineShape->SetTo(lineTo);
-            lineShape->SetAttachments(attachmentFrom, attachmentTo);
-
-            wxClientDC dc(canvas);
-            canvas->PrepareDC(dc);
-
-            lineFrom->MoveLinks(dc);
-            lineTo->MoveLinks(dc);
-        }
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-        break;
-    }
-    case ID_CS_ADD_SHAPE:
-    case ID_CS_ADD_SHAPE_SELECT:
-    {
-        // The app has given the command state a new m_savedState
-        // shape, which is the new shape to add to the canvas (but
-        // not actually added until this point).
-        // The new 'saved state' is therefore 'nothing' since there
-        // was nothing there before.
-
-        wxASSERT( (m_shapeOnCanvas == NULL) );
-        wxASSERT( (m_savedState != NULL) );
-        wxASSERT( (m_doc != NULL) );
-
-        m_shapeOnCanvas = m_savedState;
-        m_savedState = NULL;
-
-        m_doc->GetDiagram()->AddShape(m_shapeOnCanvas);
-        m_shapeOnCanvas->Show(true);
-
-        wxClientDC dc(m_shapeOnCanvas->GetCanvas());
-        m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
-        csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
-        m_shapeOnCanvas->FormatText(dc, handler->m_label);
-
-        m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
-        if (m_cmd == ID_CS_ADD_SHAPE_SELECT)
-        {
-            m_shapeOnCanvas->Select(true, &dc);
-            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
-        }
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-        break;
-    }
-    case ID_CS_ADD_LINE:
-    case ID_CS_ADD_LINE_SELECT:
-    {
-        wxASSERT( (m_shapeOnCanvas == NULL) );
-        wxASSERT( (m_savedState != NULL) );
-        wxASSERT( (m_doc != NULL) );
-
-        wxLineShape *lineShape = (wxLineShape *)m_savedState;
-        wxASSERT( (lineShape->GetFrom() != NULL) );
-        wxASSERT( (lineShape->GetTo() != NULL) );
-
-        m_shapeOnCanvas = m_savedState;
-        m_savedState = NULL;
-
-        m_doc->GetDiagram()->AddShape(lineShape);
-
-        lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
-            lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
-
-        lineShape->Show(true);
-
-        wxClientDC dc(lineShape->GetCanvas());
-        lineShape->GetCanvas()->PrepareDC(dc);
-
-        // It won't get drawn properly unless you move both
-        // connected images
-        lineShape->GetFrom()->Move(dc, lineShape->GetFrom()->GetX(), lineShape->GetFrom()->GetY());
-        lineShape->GetTo()->Move(dc, lineShape->GetTo()->GetX(), lineShape->GetTo()->GetY());
-
-        if (m_cmd == ID_CS_ADD_LINE_SELECT)
-        {
-            lineShape->Select(true, &dc);
-            ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
-        }
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-        break;
-    }
-    case ID_CS_CHANGE_BACKGROUND_COLOUR:
-    case ID_CS_MOVE:
-    case ID_CS_SIZE:
-    case ID_CS_EDIT_PROPERTIES:
-    case ID_CS_FONT_CHANGE:
-    case ID_CS_ARROW_CHANGE:
-    case ID_CS_ROTATE_CLOCKWISE:
-    case ID_CS_ROTATE_ANTICLOCKWISE:
-    case ID_CS_CHANGE_LINE_ORDERING:
-    case ID_CS_CHANGE_LINE_ATTACHMENT:
-    case ID_CS_ALIGN:
-    case ID_CS_NEW_POINT:
-    case ID_CS_CUT_POINT:
-    case ID_CS_MOVE_LINE_POINT:
-    case ID_CS_STRAIGHTEN:
-    case ID_CS_MOVE_LABEL:
-    {
-        // At this point we have been given a new shape
-        // just like the old one but with a changed colour.
-        // It's now time to apply that change to the
-        // shape on the canvas, saving the old state.
-        // NOTE: this is general enough to work with MOST attribute
-        // changes!
-
-        wxASSERT( (m_shapeOnCanvas != NULL) );
-        wxASSERT( (m_savedState != NULL) ); // This is the new shape with changed colour
-        wxASSERT( (m_doc != NULL) );
-
-        wxClientDC dc(m_shapeOnCanvas->GetCanvas());
-        m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
-        bool isSelected = m_shapeOnCanvas->Selected();
-        if (isSelected)
-            m_shapeOnCanvas->Select(false, & dc);
-
-        if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
-            m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
-        {
-            m_shapeOnCanvas->Erase(dc);
-        }
-
-        // TODO: make sure the ID is the same. Or, when applying the new state,
-        // don't change the original ID.
-        wxShape* tempShape = m_shapeOnCanvas->CreateNewCopy();
-
-        // Apply the saved state to the shape on the canvas, by copying.
-        m_savedState->CopyWithHandler(*m_shapeOnCanvas);
-
-        // Delete this state now it's been used (m_shapeOnCanvas currently holds this state)
-        delete m_savedState;
-
-        // Remember the previous state
-        m_savedState = tempShape;
-
-        // Redraw the shape
-
-        if (m_cmd == ID_CS_MOVE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
-            m_cmd == ID_CS_ALIGN)
-        {
-            m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
-            csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
-            m_shapeOnCanvas->FormatText(dc, handler->m_label);
-            m_shapeOnCanvas->Draw(dc);
-        }
-        else if (m_cmd == ID_CS_CHANGE_LINE_ORDERING)
-        {
-            m_shapeOnCanvas->MoveLinks(dc);
-        }
-        else if (m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
-        {
-            wxLineShape *lineShape = (wxLineShape *)m_shapeOnCanvas;
-
-            // Have to move both sets of links since we don't know which links
-            // have been affected (unless we compared before and after states).
-            lineShape->GetFrom()->MoveLinks(dc);
-            lineShape->GetTo()->MoveLinks(dc);
-        }
-        else if (m_cmd == ID_CS_SIZE)
-        {
-            double width, height;
-            m_shapeOnCanvas->GetBoundingBoxMax(&width, &height);
-
-            m_shapeOnCanvas->SetSize(width, height);
-            m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
-
-            m_shapeOnCanvas->Show(true);
-
-            // Recursively redraw links if we have a composite.
-            if (m_shapeOnCanvas->GetChildren().GetCount() > 0)
-                m_shapeOnCanvas->DrawLinks(dc, -1, true);
-
-            m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height);
-        }
-        else if (m_cmd == ID_CS_EDIT_PROPERTIES || m_cmd == ID_CS_FONT_CHANGE)
-        {
-            csEvtHandler *handler = (csEvtHandler *)m_shapeOnCanvas->GetEventHandler();
-            m_shapeOnCanvas->FormatText(dc, handler->m_label);
-            m_shapeOnCanvas->Draw(dc);
-        }
-        else
-        {
-            m_shapeOnCanvas->Draw(dc);
-        }
-
-        if (isSelected)
-            m_shapeOnCanvas->Select(true, & dc);
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-
-        break;
-    }
-  }
-  return true;
-}
-
-bool csCommandState::Undo()
-{
-  switch (m_cmd)
-  {
-    case ID_CS_CUT:
-    {
-        wxASSERT( (m_savedState != NULL) );
-        wxASSERT( (m_doc != NULL) );
-
-        m_doc->GetDiagram()->AddShape(m_savedState);
-        m_shapeOnCanvas = m_savedState;
-        m_savedState = NULL;
-
-        if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
-            lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
-                lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo(),
-                m_linePositionFrom, m_linePositionTo);
-
-            wxShapeCanvas* canvas = lineShape->GetFrom()->GetCanvas();
-
-            wxClientDC dc(canvas);
-            canvas->PrepareDC(dc);
-
-            lineShape->GetFrom()->MoveLinks(dc);
-            lineShape->GetTo()->MoveLinks(dc);
-
-        }
-        m_shapeOnCanvas->Show(true);
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-        break;
-    }
-    case ID_CS_ADD_SHAPE:
-    case ID_CS_ADD_LINE:
-    case ID_CS_ADD_SHAPE_SELECT:
-    case ID_CS_ADD_LINE_SELECT:
-    {
-        wxASSERT( (m_shapeOnCanvas != NULL) );
-        wxASSERT( (m_savedState == NULL) );
-        wxASSERT( (m_doc != NULL) );
-
-        // In case this is a line
-        wxShape* lineFrom = NULL;
-        wxShape* lineTo = NULL;
-        int attachmentFrom = 0, attachmentTo = 0;
-
-        if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            // Store the from/to info to save in the line shape
-            wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
-            lineFrom = lineShape->GetFrom();
-            lineTo = lineShape->GetTo();
-            attachmentFrom = lineShape->GetAttachmentFrom();
-            attachmentTo = lineShape->GetAttachmentTo();
-        }
-
-        wxClientDC dc(m_shapeOnCanvas->GetCanvas());
-        m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
-
-        m_shapeOnCanvas->Select(false, &dc);
-        ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
-        m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
-        m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line
-
-        if (m_shapeOnCanvas->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            // Restore the from/to info for future reference
-            wxLineShape* lineShape = (wxLineShape*) m_shapeOnCanvas;
-            lineShape->SetFrom(lineFrom);
-            lineShape->SetTo(lineTo);
-            lineShape->SetAttachments(attachmentFrom, attachmentTo);
-        }
-
-        m_savedState = m_shapeOnCanvas;
-        m_shapeOnCanvas = NULL;
-
-        m_doc->Modify(true);
-        m_doc->UpdateAllViews();
-        break;
-    }
-    case ID_CS_CHANGE_BACKGROUND_COLOUR:
-    case ID_CS_MOVE:
-    case ID_CS_SIZE:
-    case ID_CS_EDIT_PROPERTIES:
-    case ID_CS_FONT_CHANGE:
-    case ID_CS_ARROW_CHANGE:
-    case ID_CS_ROTATE_CLOCKWISE:
-    case ID_CS_ROTATE_ANTICLOCKWISE:
-    case ID_CS_CHANGE_LINE_ORDERING:
-    case ID_CS_CHANGE_LINE_ATTACHMENT:
-    case ID_CS_ALIGN:
-    case ID_CS_NEW_POINT:
-    case ID_CS_CUT_POINT:
-    case ID_CS_MOVE_LINE_POINT:
-    case ID_CS_STRAIGHTEN:
-    case ID_CS_MOVE_LABEL:
-    {
-        // Exactly like the Do case; we're just swapping states.
-        Do();
-        break;
-    }
-  }
-
-    return true;
-}
diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h
deleted file mode 100644
index 5cd29aecdf..0000000000
--- a/contrib/samples/ogl/studio/doc.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/doc.h
-// Purpose:     Document classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_DOC_H_
-#define _STUDIO_DOC_H_
-
-#include "wx/docview.h"
-#include "wx/cmdproc.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "shapes.h"
-
-/*
- * A diagram document, which contains a diagram.
- */
-
-class csDiagramDocument: public wxDocument
-{
-  DECLARE_DYNAMIC_CLASS(csDiagramDocument)
-public:
-  csDiagramDocument();
-  ~csDiagramDocument();
-
-#if wxUSE_PROLOGIO
-  bool OnSaveDocument(const wxString& file);
-  bool OnOpenDocument(const wxString& file);
-#endif // wxUSE_PROLOGIO
-
-  inline wxDiagram *GetDiagram() { return &m_diagram; }
-
-  bool OnCloseDocument();
-
-protected:
-  csDiagram         m_diagram;
-};
-
-/*
- Do/Undo 30/7/98
-
- 1) We have a csCommandState, and in csDiagramCommand you have a list of
-    these. This allows undo to work with several shapes at once.
-
- 2) Instead of storing info about each operation, e.g. separate pens, colours,
-    etc., we simply use a copy of the shape.
-    In csCommandState, we have a pointer to the actual shape in the canvas, m_currentShape.
-    We also have wxShape* m_shapeState which stores the requested or previous state
-    (depending on whether it's before the Do or after the Do.
-
-    - In Do: save a temp copy of the old m_currentShape (i.e. the state just before it's changed).
-      Change the data pointed to by m_currentShape to the new attributes stored in m_shapeState.
-      Now assign the temp copy to m_shapeState, for use in Undo.
-
-      wxShape* temp = m_currentShape->Copy(); // Take a copy of the current state
-      m_currentShape->Set(m_shapeState);      // Apply the new state (e.g. moving, changing colour etc.)
-      delete m_shapeState;                    // Delete the previous 'old state'.
-      m_shapeState = temp;                    // Remember the new 'old state'.
-
- */
-
-
-class csCommandState;
-class csDiagramCommand: public wxCommand
-{
-    friend class csCommandState;
- public:
-  // Multi-purpose constructor for creating, deleting shapes
-  csDiagramCommand(const wxString& name, csDiagramDocument *doc,
-    csCommandState* onlyState = NULL); // Allow for the common case of just one state to change
-
-  ~csDiagramCommand();
-
-  bool Do();
-  bool Undo();
-
-  // Add a state to the end of the list
-  void AddState(csCommandState* state);
-
-  // Insert a state at the beginning of the list
-  void InsertState(csCommandState* state);
-
-  // Schedule all lines connected to the states to be cut.
-  void RemoveLines();
-
-  // Find the state that refers to this shape
-  csCommandState* FindStateByShape(wxShape* shape);
-
-  wxList& GetStates() const { return (wxList&) m_states; }
-
- protected:
-  csDiagramDocument*    m_doc;
-  wxList                m_states;
-};
-
-class csCommandState: public wxObject
-{
-    friend class csDiagramCommand;
-public:
-    csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas);
-    ~csCommandState();
-
-    bool Do();
-    bool Undo();
-
-    inline void SetSavedState(wxShape *s) { m_savedState = s; }
-    inline wxShape *GetSavedState() const { return m_savedState; }
-
-    inline void SetShapeOnCanvas(wxShape *s) { m_shapeOnCanvas = s; }
-    inline wxShape *GetShapeOnCanvas() const { return m_shapeOnCanvas; }
-protected:
-    wxShape*                m_savedState;       // Previous state, for restoring on Undo
-    wxShape*                m_shapeOnCanvas;    // The actual shape on the canvas
-    csDiagramDocument*      m_doc;
-    int                     m_cmd;
-
-    // These store the line ordering for the shapes at either end,
-    // so an un-cut line can restore the ordering properly. Otherwise
-    // it just adds the line at an arbitrary position.
-    int                     m_linePositionFrom;
-    int                     m_linePositionTo;
-};
-
-#endif
-  // _STUDIO_DOC_H_
diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp
deleted file mode 100644
index e5f97fc674..0000000000
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        ogl/stufio/mainfrm.cpp
-// Purpose:     Studio main frame
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/laywin.h"
-
-#include "studio.h"
-#include "view.h"
-#include "doc.h"
-#include "cspalette.h"
-#include "mainfrm.h"
-#include "dialogs.h"
-
-BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
-    EVT_MENU(ID_CS_ABOUT, csFrame::OnAbout)
-    EVT_MENU(wxID_EXIT, csFrame::OnQuit)
-    EVT_MENU(wxID_HELP, csFrame::OnHelp)
-    EVT_MENU(ID_CS_SETTINGS, csFrame::OnSettings)
-    EVT_SIZE(csFrame::OnSize)
-    EVT_SASH_DRAGGED(ID_LAYOUT_WINDOW_PALETTE, csFrame::OnSashDragPaletteWindow)
-    EVT_SASH_DRAGGED(ID_LAYOUT_WINDOW_PROJECT, csFrame::OnSashDragProjectWindow)
-    EVT_IDLE(csFrame::OnIdle)
-    EVT_UPDATE_UI(wxID_PRINT, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_PREVIEW, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_SAVE, csFrame::OnSaveUpdate)
-    EVT_UPDATE_UI(wxID_SAVEAS, csFrame::OnSaveUpdate)
-    EVT_UPDATE_UI(wxID_UNDO, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_REDO, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_CUT, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_COPY, csFrame::OnUpdateDisable)
-    EVT_UPDATE_UI(wxID_PASTE, csFrame::OnUpdateDisable)
-    EVT_CLOSE(csFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
-  wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
-{
-    CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
-    wxGetApp().InitToolBar(GetToolBar());
-
-    // Accelerators
-    wxAcceleratorEntry entries[4];
-
-    entries[0].Set(wxACCEL_NORMAL,  WXK_F1,        wxID_HELP);
-    entries[1].Set(wxACCEL_CTRL,   'O',            wxID_OPEN);
-    entries[2].Set(wxACCEL_CTRL,   'N',            wxID_NEW);
-    entries[3].Set(wxACCEL_CTRL,   'P',            wxID_PRINT);
-
-    wxAcceleratorTable accel(4, entries);
-    SetAcceleratorTable(accel);
-}
-
-void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-    wxHelpControllerBase* help;
-    help = wxGetApp().GetHelpController();
-    if (help)
-        help->DisplayContents();
-}
-
-void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_WX_RESOURCES
-    csSettingsDialog* dialog = new csSettingsDialog(this);
-    /* int ret = */ dialog->ShowModal();
-    dialog->Destroy();
-#endif // wxUSE_WX_RESOURCES
-}
-
-void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-      Close(true);
-}
-
-void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-      (void)wxMessageBox(_T("OGL Studio\n(c) 1999, Julian Smart"), _T("About OGL Studio"), wxICON_INFORMATION);
-}
-
-void csFrame::OnSashDragPaletteWindow(wxSashEvent& event)
-{
-    if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
-        return;
-
-    switch (event.GetId())
-    {
-        case ID_LAYOUT_WINDOW_PALETTE:
-        {
-            wxGetApp().GetDiagramPaletteSashWindow()->SetDefaultSize(wxSize(10000, event.GetDragRect().height));
-            break;
-        }
-    }
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-}
-
-void csFrame::OnSashDragProjectWindow(wxSashEvent& event)
-{
-    if (event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE)
-        return;
-
-    switch (event.GetId())
-    {
-        case ID_LAYOUT_WINDOW_PROJECT:
-        {
-            wxGetApp().GetProjectSashWindow()->SetDefaultSize(wxSize(event.GetDragRect().width, 10000));
-            break;
-        }
-    }
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-}
-
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-void csFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    int x, y;
-    GetPosition(& x, & y);
-    wxGetApp().m_mainFramePos = wxPoint(x, y);
-
-    GetSize(& x, & y);
-    wxGetApp().m_mainFrameSize = wxSize(x, y);
-
-    wxDocMDIParentFrame::OnCloseWindow(event);
-}
-
-void csFrame::OnSize(wxSizeEvent& event)
-{
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame(this);
-    event.Skip();
-}
-
-// Make sure the correct toolbars are showing for the active view
-void csFrame::OnIdle(wxIdleEvent& event)
-{
-    wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow();
-    wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
-    if (!paletteWin || !diagramToolBarWin)
-        return;
-    bool doLayout = false;
-    if (GetActiveChild())
-    {
-        if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
-        {
-            paletteWin->Show(true);
-            diagramToolBarWin->Show(true);
-
-            doLayout = true;
-        }
-    }
-    else
-    {
-        if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
-        {
-            paletteWin->Show(false);
-            diagramToolBarWin->Show(false);
-            doLayout = true;
-        }
-    }
-    if (doLayout)
-    {
-        wxLayoutAlgorithm layout;
-        layout.LayoutMDIFrame(this);
-
-#if defined(__WXMSW__)
-        // Need to do something else to get it to refresh properly
-        // when a client frame is first displayed; moving the client
-        // window doesn't cause the proper refresh. Just refreshing the
-        // client doesn't work (presumably because it's clipping the
-        // children).
-        // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize
-        // and checking if the position has changed, before redrawing the
-        // child windows.
-#if 0
-        wxMDIChildFrame* childFrame = GetActiveChild();
-        if (childFrame)
-        {
-            HWND hWnd = (HWND) childFrame->GetHWND();
-            ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE );
-
-        }
-#endif
-#endif // __WXMSW__
-    }
-    event.Skip();
-}
-
-// General handler for disabling items
-void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
-{
-    event.Enable(false);
-}
-
-void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable( (GetActiveChild() != NULL) );
-}
-
-/*
- * Child frame
- */
-
-BEGIN_EVENT_TABLE(csMDIChildFrame, wxDocMDIChildFrame)
-  EVT_ACTIVATE(csMDIChildFrame::OnActivate)
-END_EVENT_TABLE()
-
-csMDIChildFrame::csMDIChildFrame(wxDocument* doc, wxView* view, wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
-  wxDocMDIChildFrame(doc, view, parent, id, title, pos, size, style)
-{
-    // Accelerators
-    wxAcceleratorEntry entries[18];
-
-    // Usual editing functions
-    entries[0].Set(wxACCEL_NORMAL,  WXK_DELETE,     wxID_CLEAR);
-    entries[1].Set(wxACCEL_CTRL,    'X',            wxID_CUT);
-    entries[2].Set(wxACCEL_CTRL,    'C',            wxID_COPY);
-    entries[3].Set(wxACCEL_SHIFT,   WXK_INSERT,     wxID_PASTE);
-    entries[4].Set(wxACCEL_CTRL,    'V',            wxID_PASTE);
-    entries[5].Set(wxACCEL_CTRL,    'A',            ID_CS_SELECT_ALL);
-
-    // Undo/redo
-    entries[6].Set(wxACCEL_CTRL,    'Z',            wxID_UNDO);
-    entries[7].Set(wxACCEL_CTRL,    'Y',            wxID_REDO);
-
-    // Other
-    entries[8].Set(wxACCEL_NORMAL,  WXK_RETURN,     ID_CS_EDIT_PROPERTIES);
-    entries[9].Set(wxACCEL_ALT,     WXK_RETURN,     ID_CS_EDIT_PROPERTIES);
-    entries[10].Set(wxACCEL_CTRL,   'D',            wxID_DUPLICATE);
-    entries[11].Set(wxACCEL_NORMAL,  WXK_F1,        wxID_HELP);
-
-    // File handling
-    entries[12].Set(wxACCEL_CTRL,   'S',            wxID_SAVE);
-    entries[13].Set(wxACCEL_NORMAL,  WXK_F12,       wxID_SAVEAS);
-    entries[14].Set(wxACCEL_CTRL,   'O',            wxID_OPEN);
-    entries[15].Set(wxACCEL_CTRL,   'N',            wxID_NEW);
-    entries[16].Set(wxACCEL_CTRL,   'P',            wxID_PRINT);
-    entries[17].Set(wxACCEL_CTRL,   'W',            wxID_CLOSE);
-
-
-    wxAcceleratorTable accel(18, entries);
-    SetAcceleratorTable(accel);
-}
-
-void csMDIChildFrame::OnActivate(wxActivateEvent& event)
-{
-    wxDocMDIChildFrame::OnActivate(event);
-/*
-    wxSashLayoutWindow* win = wxGetApp().GetDiagramPaletteSashWindow();
-    if (!win)
-        return;
-
-    win->Show(event.GetActive());
-
-    wxLayoutAlgorithm layout;
-    layout.LayoutMDIFrame((wxMDIParentFrame*) GetParent());
-*/
-}
diff --git a/contrib/samples/ogl/studio/mainfrm.h b/contrib/samples/ogl/studio/mainfrm.h
deleted file mode 100644
index 3f4be7ec82..0000000000
--- a/contrib/samples/ogl/studio/mainfrm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/mainfrm.h
-// Purpose:     Studio main window class
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_MAINFRM_H_
-#define _STUDIO_MAINFRM_H_
-
-#include "wx/docmdi.h"
-
-class wxSashLayoutWindow;
-class wxSashEvent;
-
-class csFrame: public wxDocMDIParentFrame
-{
-  public:
-    csFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
-
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnAbout(wxCommandEvent& event);
-    void OnNewWindow(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnSashDragPaletteWindow(wxSashEvent& event);
-    void OnSashDragProjectWindow(wxSashEvent& event);
-    void OnIdle(wxIdleEvent& event);
-    void OnHelp(wxCommandEvent& event);
-    void OnSettings(wxCommandEvent& event);
-
-    // General handler for disabling items
-    void OnUpdateDisable(wxUpdateUIEvent& event);
-    void OnSaveUpdate(wxUpdateUIEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-class csMDIChildFrame: public wxDocMDIChildFrame
-{
-  public:
-    csMDIChildFrame(wxDocument* doc, wxView* view, wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
-
-    void OnActivate(wxActivateEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-  // _STUDIO_MAINFRM_H_
diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc
deleted file mode 100644
index 92cfdfef9f..0000000000
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ /dev/null
@@ -1,287 +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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_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)
-STUDIO_OBJECTS =  \
-	$(OBJS)\studio_studio.obj \
-	$(OBJS)\studio_doc.obj \
-	$(OBJS)\studio_shapes.obj \
-	$(OBJS)\studio_symbols.obj \
-	$(OBJS)\studio_view.obj \
-	$(OBJS)\studio_cspalette.obj \
-	$(OBJS)\studio_mainfrm.obj \
-	$(OBJS)\studio_project.obj \
-	$(OBJS)\studio_dialogs.obj \
-	$(OBJS)\studio_csprint.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_ADV_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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)\studio.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)\studio.exe del $(OBJS)\studio.exe
-	-if exist $(OBJS)\studio.tds del $(OBJS)\studio.tds
-	-if exist $(OBJS)\studio.ilc del $(OBJS)\studio.ilc
-	-if exist $(OBJS)\studio.ild del $(OBJS)\studio.ild
-	-if exist $(OBJS)\studio.ilf del $(OBJS)\studio.ilf
-	-if exist $(OBJS)\studio.ils del $(OBJS)\studio.ils
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS)  $(OBJS)\studio_studio.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\studio_studio.res
-|
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj: .\studio.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_doc.obj: .\doc.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_shapes.obj: .\shapes.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_symbols.obj: .\symbols.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_view.obj: .\view.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_cspalette.obj: .\cspalette.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_project.obj: .\project.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_dialogs.obj: .\dialogs.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_csprint.obj: .\csprint.cpp
-	$(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_studio.res: .\studio.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 -dNOPCH -i.\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/studio/makefile.gcc b/contrib/samples/ogl/studio/makefile.gcc
deleted file mode 100644
index e781fd8394..0000000000
--- a/contrib/samples/ogl/studio/makefile.gcc
+++ /dev/null
@@ -1,285 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_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)
-STUDIO_OBJECTS =  \
-	$(OBJS)\studio_studio.o \
-	$(OBJS)\studio_doc.o \
-	$(OBJS)\studio_shapes.o \
-	$(OBJS)\studio_symbols.o \
-	$(OBJS)\studio_view.o \
-	$(OBJS)\studio_cspalette.o \
-	$(OBJS)\studio_mainfrm.o \
-	$(OBJS)\studio_project.o \
-	$(OBJS)\studio_dialogs.o \
-	$(OBJS)\studio_csprint.o \
-	$(OBJS)\studio_studio_rc.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_ADV_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-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)\studio.exe data
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio_rc.o
-	$(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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 (studio_resources.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\studio_studio.o: ./studio.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_doc.o: ./doc.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_shapes.o: ./shapes.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_symbols.o: ./symbols.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_view.o: ./view.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_cspalette.o: ./cspalette.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_mainfrm.o: ./mainfrm.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_project.o: ./project.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_dialogs.o: ./dialogs.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_csprint.o: ./csprint.cpp
-	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\studio_studio_rc.o: ./studio.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 --define NOPCH --include-dir ./../../../include
-
-.PHONY: all clean data
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx
deleted file mode 100644
index 51a15a4d4f..0000000000
--- a/contrib/samples/ogl/studio/makefile.unx
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# File:		Makefile
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 2000 Julian Smart
-#
-# Makefile for OGL demo (GTK version)
-#
-# This makefile requires wxWindows/GTK to be 
-# installed (possibly using "make install")
-# on your system.
-#
-
-CXX = $(shell wx-config --cxx)
-WXCONFIG=../../../../wx-config
-WXINCLUDE=-I../../../../include -I../../../include
-WXLIB=-L../../../../lib -L../../../src/ogl
-
-OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
-
-studio: $(OBJECTS)
-	$(CXX) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
-
-studio.o: studio.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
-
-cspalette.o: cspalette.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
-
-doc.o: doc.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
-
-view.o: view.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
-
-dialogs.o: dialogs.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
-
-mainfrm.o: mainfrm.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
-
-project.o: project.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
-
-shapes.o: shapes.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
-
-symbols.o: symbols.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
-
-csprint.o: csprint.cpp
-	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
-
-clean: 
-	rm -f *.o studio
diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc
deleted file mode 100644
index fe0352d110..0000000000
--- a/contrib/samples/ogl/studio/makefile.vc
+++ /dev/null
@@ -1,362 +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 = 29
-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)
-STUDIO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\studio.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)
-STUDIO_OBJECTS =  \
-	$(OBJS)\studio_studio.obj \
-	$(OBJS)\studio_doc.obj \
-	$(OBJS)\studio_shapes.obj \
-	$(OBJS)\studio_symbols.obj \
-	$(OBJS)\studio_view.obj \
-	$(OBJS)\studio_cspalette.obj \
-	$(OBJS)\studio_mainfrm.obj \
-	$(OBJS)\studio_project.obj \
-	$(OBJS)\studio_dialogs.obj \
-	$(OBJS)\studio_csprint.obj \
-	$(OBJS)\studio_studio.res
-
-### 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_ADV_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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)\studio.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)\studio.exe del $(OBJS)\studio.exe
-	-if exist $(OBJS)\studio.ilk del $(OBJS)\studio.ilk
-	-if exist $(OBJS)\studio.pdb del $(OBJS)\studio.pdb
-
-$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(STUDIO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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 (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj: .\studio.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_doc.obj: .\doc.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_shapes.obj: .\shapes.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_symbols.obj: .\symbols.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_view.obj: .\view.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_cspalette.obj: .\cspalette.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_project.obj: .\project.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_dialogs.obj: .\dialogs.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_csprint.obj: .\csprint.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
-
-$(OBJS)\studio_studio.res: .\studio.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 /d NOPCH /i .\..\..\..\include $**
-
diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
deleted file mode 100644
index 80a3abec47..0000000000
--- a/contrib/samples/ogl/studio/makefile.wat
+++ /dev/null
@@ -1,317 +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_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STUDIO_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)
-STUDIO_OBJECTS =  &
-	$(OBJS)\studio_studio.obj &
-	$(OBJS)\studio_doc.obj &
-	$(OBJS)\studio_shapes.obj &
-	$(OBJS)\studio_symbols.obj &
-	$(OBJS)\studio_view.obj &
-	$(OBJS)\studio_cspalette.obj &
-	$(OBJS)\studio_mainfrm.obj &
-	$(OBJS)\studio_project.obj &
-	$(OBJS)\studio_dialogs.obj &
-	$(OBJS)\studio_csprint.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\studio.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)\studio.exe del $(OBJS)\studio.exe
-
-$(OBJS)\studio.exe :  $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
-	@%create $(OBJS)\studio.lbc
-	@%append $(OBJS)\studio.lbc option quiet
-	@%append $(OBJS)\studio.lbc name $^@
-	@%append $(OBJS)\studio.lbc option caseexact
-	@%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)\studio.lbc library %i
-	@%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res
-	@for %i in () do @%append $(OBJS)\studio.lbc option stack=%i
-	wlink @$(OBJS)\studio.lbc
-
-data : .SYMBOLIC 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\studio_studio.obj :  .AUTODEPEND .\studio.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_doc.obj :  .AUTODEPEND .\doc.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_shapes.obj :  .AUTODEPEND .\shapes.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_symbols.obj :  .AUTODEPEND .\symbols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_view.obj :  .AUTODEPEND .\view.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_cspalette.obj :  .AUTODEPEND .\cspalette.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_mainfrm.obj :  .AUTODEPEND .\mainfrm.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_project.obj :  .AUTODEPEND .\project.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_csprint.obj :  .AUTODEPEND .\csprint.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STUDIO_CXXFLAGS) $<
-
-$(OBJS)\studio_studio.res :  .AUTODEPEND .\studio.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 -dNOPCH -i=.\..\..\..\include $<
-
diff --git a/contrib/samples/ogl/studio/manual/alignb.bmp b/contrib/samples/ogl/studio/manual/alignb.bmp
deleted file mode 100644
index 6cc2e1dee4..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignb.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignl.bmp b/contrib/samples/ogl/studio/manual/alignl.bmp
deleted file mode 100644
index 30471101b1..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignl.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignr.bmp b/contrib/samples/ogl/studio/manual/alignr.bmp
deleted file mode 100644
index 14a2f85241..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignr.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/alignt.bmp b/contrib/samples/ogl/studio/manual/alignt.bmp
deleted file mode 100644
index 4505cbab56..0000000000
Binary files a/contrib/samples/ogl/studio/manual/alignt.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/arrow.bmp b/contrib/samples/ogl/studio/manual/arrow.bmp
deleted file mode 100644
index d406ceb64f..0000000000
Binary files a/contrib/samples/ogl/studio/manual/arrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/back.gif b/contrib/samples/ogl/studio/manual/back.gif
deleted file mode 100644
index 8a61076d3b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/back.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/bullet.bmp b/contrib/samples/ogl/studio/manual/bullet.bmp
deleted file mode 100644
index aad8fc793e..0000000000
Binary files a/contrib/samples/ogl/studio/manual/bullet.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/contents.gif b/contrib/samples/ogl/studio/manual/contents.gif
deleted file mode 100644
index da92528ddd..0000000000
Binary files a/contrib/samples/ogl/studio/manual/contents.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/copy.bmp b/contrib/samples/ogl/studio/manual/copy.bmp
deleted file mode 100644
index 0a26d23ec3..0000000000
Binary files a/contrib/samples/ogl/studio/manual/copy.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/copysize.bmp b/contrib/samples/ogl/studio/manual/copysize.bmp
deleted file mode 100644
index 36060ad72b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/copysize.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/cut.bmp b/contrib/samples/ogl/studio/manual/cut.bmp
deleted file mode 100644
index e0de76cf51..0000000000
Binary files a/contrib/samples/ogl/studio/manual/cut.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/cutpoint.bmp b/contrib/samples/ogl/studio/manual/cutpoint.bmp
deleted file mode 100644
index 2f7dc780a2..0000000000
Binary files a/contrib/samples/ogl/studio/manual/cutpoint.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/forward.gif b/contrib/samples/ogl/studio/manual/forward.gif
deleted file mode 100644
index 9c81e8c92f..0000000000
Binary files a/contrib/samples/ogl/studio/manual/forward.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/help.bmp b/contrib/samples/ogl/studio/manual/help.bmp
deleted file mode 100644
index 1b5e0b9603..0000000000
Binary files a/contrib/samples/ogl/studio/manual/help.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/helpcs.bmp b/contrib/samples/ogl/studio/manual/helpcs.bmp
deleted file mode 100644
index d6413e1d75..0000000000
Binary files a/contrib/samples/ogl/studio/manual/helpcs.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/horiz.bmp b/contrib/samples/ogl/studio/manual/horiz.bmp
deleted file mode 100644
index 58af34a727..0000000000
Binary files a/contrib/samples/ogl/studio/manual/horiz.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/linearrow.bmp b/contrib/samples/ogl/studio/manual/linearrow.bmp
deleted file mode 100644
index 1fd21fb08a..0000000000
Binary files a/contrib/samples/ogl/studio/manual/linearrow.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/new.bmp b/contrib/samples/ogl/studio/manual/new.bmp
deleted file mode 100644
index c832e3e7d5..0000000000
Binary files a/contrib/samples/ogl/studio/manual/new.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/newpoint.bmp b/contrib/samples/ogl/studio/manual/newpoint.bmp
deleted file mode 100644
index cb4f267afc..0000000000
Binary files a/contrib/samples/ogl/studio/manual/newpoint.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/open.bmp b/contrib/samples/ogl/studio/manual/open.bmp
deleted file mode 100644
index cc9e2881cc..0000000000
Binary files a/contrib/samples/ogl/studio/manual/open.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/paste.bmp b/contrib/samples/ogl/studio/manual/paste.bmp
deleted file mode 100644
index fd48d66c49..0000000000
Binary files a/contrib/samples/ogl/studio/manual/paste.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/pointsize.bmp b/contrib/samples/ogl/studio/manual/pointsize.bmp
deleted file mode 100644
index 8a01c8a42c..0000000000
Binary files a/contrib/samples/ogl/studio/manual/pointsize.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/preview.bmp b/contrib/samples/ogl/studio/manual/preview.bmp
deleted file mode 100644
index a8bcdf5eff..0000000000
Binary files a/contrib/samples/ogl/studio/manual/preview.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/print.bmp b/contrib/samples/ogl/studio/manual/print.bmp
deleted file mode 100644
index 885d2e8d16..0000000000
Binary files a/contrib/samples/ogl/studio/manual/print.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/redo.bmp b/contrib/samples/ogl/studio/manual/redo.bmp
deleted file mode 100644
index 5e97912b9a..0000000000
Binary files a/contrib/samples/ogl/studio/manual/redo.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/save.bmp b/contrib/samples/ogl/studio/manual/save.bmp
deleted file mode 100644
index 0df022cbb7..0000000000
Binary files a/contrib/samples/ogl/studio/manual/save.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/straight.bmp b/contrib/samples/ogl/studio/manual/straight.bmp
deleted file mode 100644
index 529366590b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/straight.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/studio.cnt b/contrib/samples/ogl/studio/manual/studio.cnt
deleted file mode 100644
index 5d0fe3d9e4..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.cnt
+++ /dev/null
@@ -1,34 +0,0 @@
-:Base studio.hlp
-1 Welcome to OGL Studio
-2 Welcome to OGL Studio=topic0
-1 Read Me
-2 Read Me=readme
-2 Change log=topic1
-2 Bugs=topic2
-1 Working with the diagram window
-2 Working with the diagram window=schedule
-2 Creating a diagram=topic3
-2 Basic editing=topic4
-2 Adding text=topic5
-2 Aligning objects=topic6
-2 Adding segments to lines and straightening them=topic7
-2 Undo/Redo=topic8
-2 Loading and saving files=topic9
-2 Copy and paste=topic10
-2 Keyboard shortcuts=topic11
-1 Menu commands
-2 Menu commands=menucommands
-2 File=topic12
-2 Edit=topic13
-2 Window=topic14
-2 Help=topic15
-1 Toolbar commands
-2 Toolbar commands=toolbarcommands
-2 Main toolbar=maintoolbar
-2 Diagram formatting toolbar=diagramformattingtoolbar
-2 Diagram palette=diagrampalette
-1 Dialogs
-2 Dialogs=dialogs
-1 How To
-2 How To=howto
-2 Create a new object=topic16
diff --git a/contrib/samples/ogl/studio/manual/studio.hlp b/contrib/samples/ogl/studio/manual/studio.hlp
deleted file mode 100644
index 6ebce911d0..0000000000
Binary files a/contrib/samples/ogl/studio/manual/studio.hlp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/studio.hpj b/contrib/samples/ogl/studio/manual/studio.hpj
deleted file mode 100644
index 8e6d98315a..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.hpj
+++ /dev/null
@@ -1,23 +0,0 @@
-[OPTIONS]
-BMROOT=. ; Assume that bitmaps are where the source is
-TITLE=OGL Studio
-CONTENTS=Contents
-; COMPRESS=12 Hall Zeck ; Max compression, but needs lots of memory
-COMPRESS=8 Zeck
-LCID=0x809 0x0 0x0 ;English (British)
-HLP=.\studio.hlp
-
-[WINDOWS]
-Main="",(553,102,400,600),20736,(r14876671),(r12632256),f3
-
-[FILES]
-studio.rtf
-
-[CONFIG]
-CreateButton("Up", "&Up", "JumpId(`studio.hlp', `Contents')")
-BrowseButtons()
-
-[MAP]
-
-[BITMAPS]
-
diff --git a/contrib/samples/ogl/studio/manual/studio.tex b/contrib/samples/ogl/studio/manual/studio.tex
deleted file mode 100644
index ab4d897258..0000000000
--- a/contrib/samples/ogl/studio/manual/studio.tex
+++ /dev/null
@@ -1,381 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}%
-\twocolwidtha{4cm}%
-\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]{{\tt #1}\index{#1}}%
-\parskip=10pt%
-\parindent=0pt%
-\title{Manual for OGL Studio}%
-\author{by Julian Smart}%
-\makeindex%
-\begin{document}%
-\maketitle%
-\pagestyle{fancyplain}%
-\bibliographystyle{plain}%
-\pagenumbering{arabic}%
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\tableofcontents%
-
-\chapter{Welcome to OGL Studio}%
-\setheader{{\it Welcome}}{}{}{}{}{{\it Welcome}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-Welcome to OGL Studio, an extended sample for the Object Graphics Library.
-
-For release information, please see the \helpref{Read Me}{readme} section.
-
-\chapter{Read Me}\label{readme}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{Change log}
-
-Version 1, February 7th, 1999
-
-\begin{itemize}\itemsep=0pt
-\item First release.
-\end{itemize}
-
-\section{Bugs}
-
-There are no known bugs.
-
-\begin{comment}
-\chapter{Getting Started}\label{gettingstarted}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\end{comment}
-
-\chapter{Working with the diagram window}\label{schedule}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes how you work in the diagram window.
-
-In addition, you may wish to refer to the following sections:
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{How To}{howto}
-%\item \helpref{Getting started}{gettingstarted}
-\item \helpref{Using Menu Commands}{menucommands}
-\item \helpref{Using Toolbar Commands}{toolbarcommands}
-\end{itemize}
-
-When you first run OGL Studio, there is a menubar, a single
-toolbar with commonly-used functionality such as loading and
-saving, a project window to the left, and an MDI (Multiple Document
-Interface) area to the right, which will contain documents.
-
-\section{Creating a diagram}
-
-To create a new diagram, click on "File|New" or the New tool.
-
-A blank document and two new toolbars will appear. The first
-new toolbar is the \helpref{diagramming formatting toolbar}{diagramformattingtoolbar}, and contains
-icons and controls for:
-
-\begin{itemize}\itemsep=0pt
-\item alignment and size cloning;
-\item arrow toggling;
-\item point size;
-\item zoom level.
-\end{itemize}
-
-The second new toolbar is called the \helpref{diagram palette}{diagrampalette} and contains:
-
-\begin{itemize}\itemsep=0pt
-\item a pointer tool used for selecting, moving and sizing objects;
-\item a text tool used for editing text or creating new text boxes;
-\item a tool for each of the symbols.
-\end{itemize}
-
-\section{Basic editing}
-
-To add a symbol, left-click on the symbol in the diagram palette,
-and then left-click on the document. The currently selected
-tool will revert to the pointer tool, so to add another object,
-click on the symbol again, then on the document.
-
-To draw a line between two objects, right-drag between the two
-objects, starting at the attachment point area you wish to start the
-line with, and ending at another appropriate attachment point
-area. The initial ordering of the lines may not be correct (lines
-may overlap, for example) so to reorder lines on a particular
-side of a object, select a line, then left-drag the desired end to a new
-position (tip: keep within the object perimeter). Left-dragging the
-line end can also be used to change the attachment point of that
-end of the line, to a new side or vertex (depending on the object).
-
-To select or deselect a object, left click the object. To select
-several objects at once, keep the shift key pressed down when
-left-clicking, or left-drag a 'lassoo' around several objects.
-
-To delete a object or line, select it and press the Delete key, or use
-"Edit|Clear", or right-click on the object to show a menu and choose
-the "Cut" item.
-
-If you are deleting a object which has one ore more lines
-attached, the lines are deleted prior to the object deletion.
-
-Shapes can be rotated by right-clicking and selecting "Rotate
-clockwise" or "Rotate anticlockwise".
-
-Line arrows can be added (pointing in the direction in which
-you created the line) by selecting the line and pressing the
-"Toggle arrow" tool on the formatting toolbar.
-
-\section{Adding text}
-
-Select the text tool (on the symbol palette) and left-click on
-a object. If you click outside a object on the document, you are
-prompted to add a new free-floating text box.
-
-Alternatively, you can select a object and press Return (or
-select the "Edit|Edit label" menu item); or right-click and
-select "Edit label" from the object menu.
-
-Change the point size using the combobox on the formatting
-toolbar.
-
-\section{Aligning objects}
-
-Select several objects and click on an alignment tool on
-the formatting toolbar. The alignment will be done with
-respect to the first object you select. You can also copy
-the size of a object to other objects with the "Copy size" tool.
-
-\section{Adding segments to lines and straightening them}
-
-To make a line have more than one segment, select the line,
-then press the "New line point" tool. Create as many new control points
-(and therefore segments) as you like. Then arrange the points
-into a rough approximation of how they should be laid out
-horizontally and vertically. Click on "Straighten lines" to
-tidy up the layout.
-
-To delete a line control point, select the line and click on
-"Cut line point" tool. An arbitrary point will be deleted.
-
-\section{Undo/Redo}
-
-Every operation can be undone, and then redone, back until
-the time at which you last saved your document. Use
-"Edit|Undo" and "Edit|Redo"; or the shortcuts Ctrl-Z and Ctrl-Y.
-
-\section{Loading and saving files}
-
-Load and save files using the main toolbar, or "File|Open...",
-"File|Save", "File|Save As..." menu items.
-
-\section{Copy and paste}
-
-OGL Studio has a diagram clipboard, into which you can copy selections. You can then
-paste the contents of clipboard into the same or another diagram window.
-
-Use "Edit|Copy" (or the toolbar copy button) to copy the selection. Use "Edit|Cut" (or the toolbar cut button) to
-copy and then delete the selection. Use "Edit|Paste" (or the toolbar paste button) to copy the selection to
-the current diagram window.
-
-Under Windows, copy and cutting also copies the selection to the Windows clipboard into metafile (vector)
-format, and Windows bitmap format. Note that not all Windows applications can accept the vector format.
-If the application seems to be pasting the wrong format into the document, try using that application's
-"Edit|Paste Special..." menu item, if one exists.
-
-\section{Keyboard shortcuts}
-
-The following keyboard shortcuts are available. {\bf Note:} The OGL Studio menus indicate which shortcuts are
-available.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{Delete}{Clear selected object(s)}
-\twocolitem{Enter}{Edit text for selected object}
-\twocolitem{Ctrl-A}{Select all}
-\twocolitem{Ctrl-C}{Copy the selection to the clipboard}
-\twocolitem{Ctrl-D}{Duplicate the selection}
-\twocolitem{Ctrl-O}{Open a diagram}
-\twocolitem{Ctrl-N}{Create a new diagram}
-\twocolitem{Ctrl-P}{Print (not implemented)}
-\twocolitem{Ctrl-S}{Save the diagram file without prompting}
-\twocolitem{Ctrl-V}{Paste the selection}
-\twocolitem{Ctrl-W}{Close the current window}
-\twocolitem{Ctrl-X}{Cut the selection}
-\twocolitem{Ctrl-Z}{Undo last action}
-\twocolitem{Ctrl-Y}{Redo current action on the undo stack}
-\twocolitem{Ctrl-Enter}{Confirm the label editing operation (dismisses the dialog)}
-\twocolitem{Esc}{Cancel the label editing dialog}
-\twocolitem{F1}{Invoke the manual}
-\twocolitem{F12}{Save the diagram file, prompting for a filename}
-\end{twocollist}
-
-\chapter{Menu commands}\label{menucommands}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes the menu commands.
-
-\section{File}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf New...}}{Creates a new diagram window.}
-\twocolitem{{\bf Open...}}{Opens a diagram file.}
-\twocolitem{{\bf Close}}{Closes the current window.}
-\twocolitem{{\bf Save}}{Saves the current diagram without prompting.}
-\twocolitem{{\bf Save As...}}{Saves the current diagram, prompting for a filename.}
-\twocolitem{{\bf Print...}}{Prints the current diagram (not implemented).}
-\twocolitem{{\bf Print Setup...}}{Invokes the printer setup dialog.}
-\twocolitem{{\bf Print Preview}}{Invokes print preview for this diagram (not implemented).}
-\twocolitem{{\bf Exit}}{Exits the program.}
-\end{twocollist}
-
-Further menu items appended to the end of the File menu allow you
-to load previously-saved diagram files quickly.
-
-\section{Edit}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Undo}}{Undoes the previous action.}
-\twocolitem{{\bf Redo}}{Redoes the previously undone action.}
-\twocolitem{{\bf Cut}}{Deletes the current selection and places it on the clipboard.}
-\twocolitem{{\bf Copy}}{Copies the current selection onto the clipboard, both to the internal
-diagram clipboard and under Windows, to the Windows clipboard, in metafile and bitmap formats.}
-\twocolitem{{\bf Paste}}{Pastes from the internal diagram clipboard to the currently active window.}
-\twocolitem{{\bf Duplicate}}{Duplicates the current selection, placing the objects further down and to the right.}
-\twocolitem{{\bf Clear}}{Clears the current selection without placing it on the clipboard.}
-\twocolitem{{\bf Select All}}{Selects all objects.}
-\twocolitem{{\bf Edit Label...}}{Invokes a dialog to edit the label of the currently selected object.}
-\end{twocollist}
-
-\begin{comment}%
-\section{View}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Toolbar}}{Toggles the toolbar on and off.}
-\twocolitem{{\bf Status Bar}}{Toggles the status bar on and off.}
-\twocolitem{{\bf Settings}}{Invokes the \helpref{Settings dialog}{settings} to allow you to adjust a variety of
-settings.}
-\end{twocollist}
-\end{comment}%
-
-\section{Window}
-
-The Window menu is shown when one or more child window is active.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Cascade}}{Arranges the child windows in a cascade.}
-\twocolitem{{\bf Tile}}{Arranges the child windows in a tiled formation.}
-\twocolitem{{\bf Arrange Icons}}{Arranges the minimized icons.}
-\twocolitem{{\bf Next}}{Activates the next MDI window.}
-\end{twocollist}
-
-Further menu items appended to the end of the Window menu allow you
-to restore and activate any child window.
-
-\section{Help}
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf Help Contents}}{Invokes the on-line help, showing the contents page.}
-\twocolitem{{\bf About}}{Displays a small dialog giving copyright and version information.}
-\end{twocollist}
-
-\chapter{Toolbar commands}\label{toolbarcommands}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-This section describes the commands associated with the various toolbars and diagram palette.
-
-\section{Main toolbar}\label{maintoolbar}
-
-The main toolbar is active all the time, with buttons greyed out if not appropriate to the current context.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{new.bmp}}{{\bf New} Creates a new diagram window.}
-\twocolitem{\image{1cm;0cm}{open.bmp}}{{\bf Open} Opens a diagram file.}
-\twocolitem{\image{1cm;0cm}{save.bmp}}{{\bf Save} Saves the current diagram without prompting.}
-\twocolitem{\image{1cm;0cm}{print.bmp}}{{\bf Print} Prints the current diagram (not implemented).}
-\twocolitem{\image{1cm;0cm}{copy.bmp}}{{\bf Copy} Copies the current selection onto the internal clipboard, and under Windows, into the Windows clipboard
-in metafile and bitmap formats.}
-\twocolitem{\image{1cm;0cm}{cut.bmp}}{{\bf Cut} Deletes the current selection and puts it on the clipboard.}
-\twocolitem{\image{1cm;0cm}{paste.bmp}}{{\bf Paste} Pastes the contents of the internal diagram clipboard onto the
-current diagram window.}
-\twocolitem{\image{1cm;0cm}{undo.bmp}}{{\bf Undo} Undoes the last command.}
-\twocolitem{\image{1cm;0cm}{redo.bmp}}{{\bf Redo} Redoes the last command.}
-\twocolitem{\image{1cm;0cm}{help.bmp}}{{\bf Help button} Invokes on-line help.}
-\end{twocollist}
-
-\section{Diagram formatting toolbar}\label{diagramformattingtoolbar}
-
-The diagram toolbar is visible only when a diagram window is active.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{alignl.bmp}}{{\bf Align left} Aligns the selected objects to the left side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignr.bmp}}{{\bf Align right} Aligns the selected objects to the right side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignt.bmp}}{{\bf Align top} Aligns the selected objects to the top side of the last selection.}
-\twocolitem{\image{1cm;0cm}{alignb.bmp}}{{\bf Align bottom} Aligns the selected objects to the bottom side of the last selection.}
-\twocolitem{\image{1cm;0cm}{horiz.bmp}}{{\bf Align horizontally} Aligns the selected objects to be centered horizontally with respect to the last selection.}
-\twocolitem{\image{1cm;0cm}{vert.bmp}}{{\bf Align vertically} Aligns the selected objects to be centered vertically with respect to the last selection.}
-\twocolitem{\image{1cm;0cm}{copysize.bmp}}{{\bf Copy size} Makes the selected objects the same size as the last selection.}
-\twocolitem{\image{1cm;0cm}{linearrow.bmp}}{{\bf Line arrow} Toggles an arrow on or off for the selected objects.}
-\twocolitem{\image{1cm;0cm}{newpoint.bmp}}{{\bf New point} Inserts a control point into the selected line(s).}
-\twocolitem{\image{1cm;0cm}{cutpoint.bmp}}{{\bf Cut point} Deletes a control point from the selected line(s).}
-\twocolitem{\image{1cm;0cm}{straight.bmp}}{{\bf Straighten} Straightens line segments that are nearly horizontal
-or vertical.}
-\twocolitem{\image{1cm;0cm}{pointsize.bmp}}{{\bf Point size} Allows selection of the point size for the current
-selection.}
-\twocolitem{\image{1cm;0cm}{zoom.bmp}}{{\bf Zoom control} Allows selection of the zoom level for the current diagram.}
-\end{twocollist}
-
-\section{Diagram palette}\label{diagrampalette}
-
-The diagram palette is visible only when a diagram window is active. It contains the tools for
-adding objects and text to a diagram.
-
-\begin{twocollist}
-\twocolitem{\image{1cm;0cm}{arrow.bmp}}{{\bf Pointer tool} Click on this to allow dragging and selection of objects.}
-\twocolitem{\image{1cm;0cm}{texttool.bmp}}{{\bf Text tool} Click on this, then click on objects or the diagram background
-to edit object or free-floating text labels.}
-\end{twocollist}
-
-The other tools on this palette represent demo objects.
-
-To place an object on a diagram, click on its symbol, then left-click on the diagram. You will need to click
-on the palette symbol each time you wish to create an object, since the palette selection reverts to the pointer tool
-after each object is created.
-
-\chapter{Dialogs}\label{dialogs}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-To be written.
-
-\chapter{How To}\label{howto}%
-\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\section{Create a new object}
-
-Create a new diagram window if you have not already. Then:
-
-\begin{itemize}\itemsep=0pt
-\item Left-click on the required object on the palette, then left-click on the diagram window.
-\end{itemize}
-
-
-% This section commented out
-\begin{comment}
-\bibliography{refs}
-\addcontentsline{toc}{chapter}{Bibliography}
-\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\end{comment}
-
-\addcontentsline{toc}{chapter}{Index}
-\printindex%
-
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\end{document}
diff --git a/contrib/samples/ogl/studio/manual/tex2rtf.ini b/contrib/samples/ogl/studio/manual/tex2rtf.ini
deleted file mode 100644
index f44fc89982..0000000000
--- a/contrib/samples/ogl/studio/manual/tex2rtf.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; Tex2RTF initialisation file
-runTwice = yes
-titleFontSize = 12
-authorFontSize = 10
-chapterFontSize = 12
-sectionFontSize = 12
-subsectionFontSize = 12
-headerRule = yes
-footerRule = yes
-useHeadingStyles = yes
-contentsDepth = 2
-listItemIndent=40
-winHelpContents = yes
-winHelpVersion = 4 ; 3 for Windows 3.x, 4 for Windows 95
-winHelpTitle = "OGL Studio"
-generateHPJ = yes
-htmlBrowseButtons = bitmap
-truncateFilenames = yes
-htmlIndex = no
-htmlFrameContents = no
diff --git a/contrib/samples/ogl/studio/manual/texttool.bmp b/contrib/samples/ogl/studio/manual/texttool.bmp
deleted file mode 100644
index 09c989aac1..0000000000
Binary files a/contrib/samples/ogl/studio/manual/texttool.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tick.bmp b/contrib/samples/ogl/studio/manual/tick.bmp
deleted file mode 100644
index c0d66c9460..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tick.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/toback.bmp b/contrib/samples/ogl/studio/manual/toback.bmp
deleted file mode 100644
index d2e5efffce..0000000000
Binary files a/contrib/samples/ogl/studio/manual/toback.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tofront.bmp b/contrib/samples/ogl/studio/manual/tofront.bmp
deleted file mode 100644
index 5b17cc44c8..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tofront.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool1.bmp b/contrib/samples/ogl/studio/manual/tool1.bmp
deleted file mode 100644
index cb1760d285..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool1.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool2.bmp b/contrib/samples/ogl/studio/manual/tool2.bmp
deleted file mode 100644
index a18faccff7..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool2.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool3.bmp b/contrib/samples/ogl/studio/manual/tool3.bmp
deleted file mode 100644
index 6a49f459c3..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool3.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/tool4.bmp b/contrib/samples/ogl/studio/manual/tool4.bmp
deleted file mode 100644
index 95c2061a90..0000000000
Binary files a/contrib/samples/ogl/studio/manual/tool4.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/undo.bmp b/contrib/samples/ogl/studio/manual/undo.bmp
deleted file mode 100644
index 17447ace6b..0000000000
Binary files a/contrib/samples/ogl/studio/manual/undo.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/up.gif b/contrib/samples/ogl/studio/manual/up.gif
deleted file mode 100644
index 316d0d2a14..0000000000
Binary files a/contrib/samples/ogl/studio/manual/up.gif and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/vert.bmp b/contrib/samples/ogl/studio/manual/vert.bmp
deleted file mode 100644
index dfd7b5cb53..0000000000
Binary files a/contrib/samples/ogl/studio/manual/vert.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/manual/zoom.bmp b/contrib/samples/ogl/studio/manual/zoom.bmp
deleted file mode 100644
index c6a137ada5..0000000000
Binary files a/contrib/samples/ogl/studio/manual/zoom.bmp and /dev/null differ
diff --git a/contrib/samples/ogl/studio/project.cpp b/contrib/samples/ogl/studio/project.cpp
deleted file mode 100644
index aeb0ed4f2b..0000000000
--- a/contrib/samples/ogl/studio/project.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        project.cpp
-// Purpose:     Studio project classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/laywin.h"
-#include "studio.h"
-#include "project.h"
-
-IMPLEMENT_CLASS(csProjectTreeCtrl, wxTreeCtrl)
-
-BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
-
-  wxTreeCtrl(parent, id, pos, size, style),
-  m_imageList(16, 16)
-{
-    m_imageList.Add(wxIcon(_T("folder1")));
-    m_imageList.Add(wxIcon(_T("file1")));
-
-    SetImageList(& m_imageList);
-}
-
-csProjectTreeCtrl::~csProjectTreeCtrl()
-{
-    SetImageList(NULL);
-}
-
-// Create the project window
-bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
-{
-#if 0
-    // Create a layout window
-    wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_PROJECT, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
-    win->SetDefaultSize(wxSize(150, 10000));
-    win->SetOrientation(wxLAYOUT_VERTICAL);
-    win->SetAlignment(wxLAYOUT_LEFT);
-    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    win->SetSashVisible(wxSASH_RIGHT, true);
-    win->SetExtraBorderSize(5);
-
-    m_projectSashWindow = win;
-
-    m_projectTreeCtrl = new csProjectTreeCtrl(win, ID_WINDOW_PROJECT_TREE, wxDefaultPosition,
-        wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER);
-
-    // For now, hide the window
-    m_projectSashWindow->Show(false);
-#endif
-
-    return true;
-}
-
-// Fill out the project tree control
-void csApp::FillProjectTreeCtrl()
-{
-#if 0
-    csProjectTreeCtrl& tree = *GetProjectTreeCtrl();
-
-    // Dummy data for now
-    long level0 = tree.InsertItem(0, "Applications", 0, 0);
-    long level1 = tree.InsertItem(level0, "Projects", 0, 0);
-    tree.InsertItem(level1, "project1", 1, 1);
-    tree.InsertItem(level1, "project2", 1, 1);
-#endif
-}
-
diff --git a/contrib/samples/ogl/studio/project.h b/contrib/samples/ogl/studio/project.h
deleted file mode 100644
index 2d0969e0c9..0000000000
--- a/contrib/samples/ogl/studio/project.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/project.h
-// Purpose:     Studio project classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_PROJECT_H_
-#define _STUDIO_PROJECT_H_
-
-#include "wx/treectrl.h"
-#include "wx/imaglist.h"
-
-/*
- * This is the project tree control.
- */
-
-class csProjectTreeCtrl: public wxTreeCtrl
-{
-
-DECLARE_CLASS(csProjectTreeCtrl)
-public:
-
-    csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-       long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT);
-
-    ~csProjectTreeCtrl();
-
-    wxImageList *GetImageList() const { return (wxImageList *)&m_imageList; }
-protected:
-    wxImageList m_imageList;
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-  // _STUDIO_PROJECT_H_
diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
deleted file mode 100644
index e7125a4a24..0000000000
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ /dev/null
@@ -1,1197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/shapes.cpp
-// Purpose:     Implements Studio shapes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-#include "cspalette.h"
-#include "dialogs.h"
-
-#define csSTANDARD_SHAPE_WIDTH      100
-
-IMPLEMENT_CLASS(csDiagram, wxDiagram)
-
-csDiagram::~csDiagram()
-{
-    DeleteAllShapes();
-}
-
-void csDiagram::Redraw(wxDC& dc)
-{
-    wxDiagram::Redraw(dc);
-
-    // Draw line crossings
-    wxLineCrossings lineCrossings;
-    lineCrossings.FindCrossings(*this);
-    lineCrossings.DrawCrossings(*this, dc);
-}
-
-/*
- * csEvtHandler: an event handler class for all shapes
- */
-
-IMPLEMENT_DYNAMIC_CLASS(csEvtHandler, wxShapeEvtHandler)
-
-csEvtHandler::csEvtHandler(wxShapeEvtHandler *prev, wxShape *shape, const wxString& lab):
-  wxShapeEvtHandler(prev, shape)
-{
-    m_label = lab;
-}
-
-csEvtHandler::~csEvtHandler()
-{
-}
-
-// Copy any event handler data
-void csEvtHandler::CopyData(wxShapeEvtHandler& copy)
-{
-    wxShapeEvtHandler::CopyData(copy);
-
-    csEvtHandler& csCopy = (csEvtHandler&) copy;
-    csCopy.m_label = m_label;
-}
-
-void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  csDiagramView* view = ((csCanvas*)GetShape()->GetCanvas())->GetView();
-  view->ReflectPointSize(GetShape()->GetFont()->GetPointSize());
-
-  if (GetShape()->IsKindOf(CLASSINFO(wxLineShape)))
-      view->ReflectArrowState((wxLineShape*) GetShape());
-
-  csEditorToolPalette *palette = wxGetApp().GetDiagramPalette();
-  if (palette->GetSelection() == PALETTE_TEXT_TOOL)
-  {
-        view->ReflectPointSize(GetShape()->GetFont()->GetPointSize());
-
-        EditProperties();
-#if 0
-        csLabelEditingDialog* dialog = new csLabelEditingDialog(GetShape()->GetCanvas()->GetParent());
-        dialog->SetShapeLabel(m_label);
-        if (dialog->ShowModal() == wxID_CANCEL)
-        {
-            dialog->Destroy();
-            return;
-        }
-
-        wxString newLabel = dialog->GetShapeLabel();
-        dialog->Destroy();
-
-        wxShape* newShape = GetShape()->CreateNewCopy();
-
-        csEvtHandler* handler = (csEvtHandler *)newShape->GetEventHandler();
-        handler->m_label = newLabel;
-
-        view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Edit label", (csDiagramDocument*) view->GetDocument(),
-            new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, GetShape())));
-#endif
-        return;
-  }
-
-  if (keys == 0)
-  {
-    // If no shift key, then everything is deselected.
-    // If the shape was selected, deselect it and vice versa.
-    bool selected = GetShape()->Selected();
-
-    view->SelectAll(false);
-
-    selected = !selected;
-
-    GetShape()->Select(selected, &dc);
-    GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
-
-    view->SelectShape(GetShape(), selected);
-  }
-  else if (keys & KEY_SHIFT)
-  {
-    if (GetShape()->Selected())
-    {
-        GetShape()->Select(false, &dc);
-        view->SelectShape(GetShape(), false);
-    }
-    else
-    {
-        GetShape()->Select(true, &dc);
-        view->SelectShape(GetShape(), true);
-    }
-    GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
-  }
-  else if (keys & KEY_CTRL)
-  {
-    // Do something for CONTROL
-  }
-  else
-  {
-#if wxUSE_STATUSBAR
-    ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);
-#endif // wxUSE_STATUSBAR
-  }
-}
-
-void csEvtHandler::OnRightClick(double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-    // Have to convert back to physical coordinates from logical coordinates.
-
-    int viewStartX, viewStartY;
-    int unitX, unitY;
-    GetShape()->GetCanvas()->GetViewStart(& viewStartX, & viewStartY);
-    GetShape()->GetCanvas()->GetScrollPixelsPerUnit(& unitX, & unitY);
-
-    int x1 = (int)(x * GetShape()->GetCanvas()->GetScaleX());
-    int y1 = (int)(y * GetShape()->GetCanvas()->GetScaleY());
-
-    int menuX = (int) (x1 - (viewStartX * unitX)) ;
-    int menuY = (int) (y1 - (viewStartY * unitY));
-
-    wxGetApp().GetShapeEditMenu()->SetClientData((char*) GetShape());
-    wxGetApp().GetShapeEditMenu()->Enable(ID_CS_ROTATE_CLOCKWISE, !GetShape()->IsKindOf(CLASSINFO(wxLineShape)));
-    wxGetApp().GetShapeEditMenu()->Enable(ID_CS_ROTATE_ANTICLOCKWISE, !GetShape()->IsKindOf(CLASSINFO(wxLineShape)));
-
-    GetShape()->GetCanvas()->PopupMenu(wxGetApp().GetShapeEditMenu(), menuX, menuY);
-}
-
-/*
- * Implement connection of two shapes by right-dragging between them.
- */
-
-void csEvtHandler::OnBeginDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetLogicalFunction(OGLRBLF);
-  dc.SetPen(dottedPen);
-  double xp, yp;
-  GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp);
-  dc.DrawLine((wxCoord)xp, (wxCoord)yp, (wxCoord)x, (wxCoord)y);
-  GetShape()->GetCanvas()->CaptureMouse();
-}
-
-void csEvtHandler::OnDragRight(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int attachment)
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetLogicalFunction(OGLRBLF);
-  dc.SetPen(dottedPen);
-  double xp, yp;
-  GetShape()->GetAttachmentPositionEdge(attachment, &xp, &yp);
-  dc.DrawLine((wxCoord)xp, (wxCoord)yp, (wxCoord)x, (wxCoord)y);
-}
-
-void csEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int attachment)
-{
-  GetShape()->GetCanvas()->ReleaseMouse();
-  csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
-  // Check if we're on an object
-  int new_attachment;
-  wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
-
-  if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
-  {
-        wxLineShape* theShape = new csLineShape;
-
-        theShape->AssignNewIds();
-        theShape->SetEventHandler(new csEvtHandler(theShape, theShape, wxEmptyString));
-        theShape->SetPen(wxBLACK_PEN);
-        theShape->SetBrush(wxRED_BRUSH);
-
-        wxToolBar* toolbar = wxGetApp().GetDiagramToolBar();
-        bool haveArrow = toolbar->GetToolState(DIAGRAM_TOOLBAR_LINE_ARROW);
-
-        wxLineShape *lineShape = (wxLineShape *)theShape;
-
-        // Yes, you can have more than 2 control points, in which case
-        // it becomes a multi-segment line.
-        lineShape->MakeLineControlPoints(2);
-
-        if (haveArrow)
-            lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, _T("Normal arrowhead"));
-
-        lineShape->SetFrom(GetShape());
-        lineShape->SetTo(otherShape);
-        lineShape->SetAttachments(attachment, new_attachment);
-
-        canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(
-            new csDiagramCommand(_T("Line"), (csDiagramDocument *)canvas->GetView()->GetDocument(),
-                    new csCommandState(ID_CS_ADD_LINE, lineShape, NULL)));
-  }
-}
-
-static double g_DragOffsetX = 0.0;
-static double g_DragOffsetY = 0.0;
-static double g_DragStartX = 0.0;
-static double g_DragStartY = 0.0;
-
-void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (GetShape()->GetParent())
-    {
-      GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
-      GetShape()->GetParent()->GetEventHandler()->OnDragLeft(draw, x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-  double xx, yy;
-  xx = x + g_DragOffsetX;
-  yy = y + g_DragOffsetY;
-
-  GetShape()->GetCanvas()->Snap(&xx, &yy);
-
-  double offsetX = xx - g_DragStartX;
-  double offsetY = yy - g_DragStartY;
-
-//  m_xpos = xx; m_ypos = yy;
-  double w, h;
-  GetShape()->GetBoundingBoxMax(&w, &h);
-  GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-
-  // Draw bounding box for other selected shapes
-  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-     wxShape* shape = (wxShape*) node->GetData();
-     if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
-     {
-        shape->GetBoundingBoxMax(&w, &h);
-        shape->OnDrawOutline(dc, shape->GetX() + offsetX, shape->GetY() + offsetY, w, h);
-     }
-     node = node->GetNext();
-  }
-}
-
-void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (GetShape()->GetParent())
-    {
-      GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
-      GetShape()->GetParent()->GetEventHandler()->OnBeginDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  // New policy: don't erase shape until end of drag.
-//  Erase(dc);
-
-  g_DragOffsetX = GetShape()->GetX() - x;
-  g_DragOffsetY = GetShape()->GetY() - y;
-
-  double xx, yy;
-  xx = x + g_DragOffsetX;
-  yy = y + g_DragOffsetY;
-
-  GetShape()->GetCanvas()->Snap(&xx, &yy);
-
-  g_DragStartX = GetShape()->GetX();
-  g_DragStartY = GetShape()->GetY();
-
-  double offsetX = xx - g_DragStartX;
-  double offsetY = yy - g_DragStartY;
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  double w, h;
-  GetShape()->GetBoundingBoxMax(&w, &h);
-  GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-
-  // Draw bounding box for other selected shapes
-  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-     wxShape* shape = (wxShape*) node->GetData();
-     if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
-     {
-        shape->GetBoundingBoxMax(&w, &h);
-        shape->OnDrawOutline(dc, shape->GetX() + offsetX, shape->GetY() + offsetY, w, h);
-     }
-     node = node->GetNext();
-  }
-
-  GetShape()->GetCanvas()->CaptureMouse();
-}
-
-
-void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
-  canvas->ReleaseMouse();
-  if ((GetShape()->GetSensitivityFilter() & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (GetShape()->GetParent())
-    {
-      GetShape()->GetParent()->HitTest(x, y, &attachment, &dist);
-      GetShape()->GetParent()->GetEventHandler()->OnEndDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(canvas);
-  canvas->PrepareDC(dc);
-
-  dc.SetLogicalFunction(wxCOPY);
-
-  double xx = x + g_DragOffsetX;
-  double yy = y + g_DragOffsetY;
-
-  canvas->Snap(&xx, &yy);
-
-  double offsetX = xx - g_DragStartX;
-  double offsetY = yy - g_DragStartY;
-
-  wxShape* newShape = GetShape()->CreateNewCopy();
-
-  newShape->SetX(xx);
-  newShape->SetY(yy);
-
-  csDiagramCommand* cmd = new csDiagramCommand(_T("Move"), (csDiagramDocument*)canvas->GetView()->GetDocument(),
-                new csCommandState(ID_CS_MOVE, newShape, GetShape()));
-
-  // Move line points
-  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-     wxShape* shape = (wxShape*) node->GetData();
-     // Only move the line point(s) if both ends move too
-     if (shape->IsKindOf(CLASSINFO(wxLineShape)) &&
-           ((wxLineShape*)shape)->GetTo()->Selected() && ((wxLineShape*)shape)->GetFrom()->Selected())
-     {
-        wxLineShape* lineShape = (wxLineShape*) shape;
-
-        if (lineShape->GetLineControlPoints()->GetCount() > 2)
-        {
-            wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
-
-            wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();
-            while (node1)
-            {
-                wxRealPoint *point = (wxRealPoint *)node1->GetData();
-                point->x += offsetX;
-                point->y += offsetY;
-                node1 = node1->GetNext();
-            }
-            cmd->AddState(new csCommandState(ID_CS_MOVE_LINE_POINT, newLineShape, lineShape));
-            lineShape->Erase(dc);
-        }
-     }
-     node = node->GetNext();
-  }
-
-  // Add other selected node shapes, if any
-  node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-     wxShape* shape = (wxShape*) node->GetData();
-     if (shape->Selected() && !shape->IsKindOf(CLASSINFO(wxLineShape)) && (shape != GetShape()))
-     {
-        wxShape* newShape2 = shape->CreateNewCopy();
-        newShape2->SetX(shape->GetX() + offsetX);
-        newShape2->SetY(shape->GetY() + offsetY);
-        cmd->AddState(new csCommandState(ID_CS_MOVE, newShape2, shape));
-     }
-     node = node->GetNext();
-  }
-
-  canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-}
-
-void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
-  wxShape* shape = GetShape();
-  csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
-  if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-  {
-    // TODO: Do/Undo support for line operations
-    ((wxLineShape*)shape)->wxLineShape::OnSizingEndDragLeft(pt, x, y, keys, attachment);
-#if 0
-        wxLineShape* lineShape = (wxLineShape*) shape;
-
-        wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
-
-        wxClientDC dc(canvas);
-        canvas->PrepareDC(dc);
-
-        shape->SetDisableLabel(false);
-
-        if (lpt->m_type == CONTROL_POINT_LINE)
-        {
-            canvas->Snap(&x, &y);
-
-            dc.SetLogicalFunction(wxCOPY);
-            lpt->SetX(x); lpt->SetY(y);
-            lpt->m_point->x = x; lpt->m_point->y = y;
-
-            this->OnMoveLink(dc);
-        }
-        if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM)
-        {
-            if (lpt->m_oldCursor)
-                canvas->SetCursor(lpt->m_oldCursor);
-            lineShape->Erase(dc);
-
-            lpt->SetX(x); lpt->SetY(y);
-
-            if (lineShape->GetFrom())
-            {
-                lineShape->GetFrom()->MoveLineToNewAttachment(dc, lineShape, x, y);
-            }
-        }
-        if (lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
-        {
-            if (lpt->m_oldCursor)
-                canvas->SetCursor(lpt->m_oldCursor);
-
-            lpt->SetX(x); lpt->SetY(y);
-
-            if (lineShape->GetTo())
-            {
-                lineShape->GetTo()->MoveLineToNewAttachment(dc, lineShape, x, y);
-            }
-        }
-#endif
-        return;
-  }
-
-  wxClientDC dc(canvas);
-  canvas->PrepareDC(dc);
-
-  canvas->ReleaseMouse();
-  dc.SetLogicalFunction(wxCOPY);
-
-//  shape->Erase(dc);
-/*
-  shape->Recompute();
-  shape->ResetControlPoints();
-  if (!pt->m_eraseObject)
-    shape->Show(false);
-*/
-
-  wxShape* newShape = shape->CreateNewCopy();
-
-  if (newShape->IsKindOf(CLASSINFO(wxPolygonShape)))
-  {
-    wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
-    newShape->SetSize(ppt->GetNewSize().x, ppt->GetNewSize().y);
-
-    ((wxPolygonShape *)newShape)->CalculateBoundingBox();
-    ((wxPolygonShape *)newShape)->CalculatePolygonCentre();
-    newShape->ResetControlPoints();
-  }
-  else
-  {
-    newShape->SetSize(pt->sm_controlPointDragEndWidth, pt->sm_controlPointDragEndHeight);
-    if (shape->GetCentreResize())
-    {
-      // Old position is fine
-    }
-    else
-    {
-      newShape->SetX(pt->sm_controlPointDragPosX);
-      newShape->SetY(pt->sm_controlPointDragPosY);
-    }
-  }
-
-  csDiagramCommand* cmd = new csDiagramCommand(_T("Size"), (csDiagramDocument*)canvas->GetView()->GetDocument(),
-                new csCommandState(ID_CS_SIZE, newShape, shape));
-
-  canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
-}
-
-void csEvtHandler::OnEndSize(double WXUNUSED(x), double WXUNUSED(y))
-{
-  wxClientDC dc(GetShape()->GetCanvas());
-  GetShape()->GetCanvas()->PrepareDC(dc);
-
-  GetShape()->FormatText(dc, m_label);
-}
-
-void csEvtHandler::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
-    csCanvas *canvas = (csCanvas *)GetShape()->GetCanvas();
-
-    // We actually submit two different states: one to change the ordering, and another
-    // to change the attachment for the line.
-    // Problem. If we refresh after the attachment change, we'll get a flicker.
-    // We really want to do both in a oner.
-
-    csDiagramCommand* cmd = new csDiagramCommand(_T("Change attachment"), (csDiagramDocument*)canvas->GetView()->GetDocument());
-
-    wxLineShape* newLine = (wxLineShape*) line->CreateNewCopy();
-    if (line->GetTo() == GetShape())
-        newLine->SetAttachmentTo(attachment);
-    else
-        newLine->SetAttachmentFrom(attachment);
-
-    cmd->AddState(new csCommandState(ID_CS_CHANGE_LINE_ATTACHMENT, newLine, line));
-
-    // Change ordering
-    wxShape* newShape = GetShape()->CreateNewCopy();
-    newShape->ApplyAttachmentOrdering(ordering);
-
-    cmd->AddState(new csCommandState(ID_CS_CHANGE_LINE_ORDERING, newShape, GetShape()));
-
-    canvas->GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-}
-
-void csEvtHandler::OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-    EditProperties();
-}
-
-// Popup up a property dialog
-bool csEvtHandler::EditProperties()
-{
-    wxShape* shape = GetShape();
-
-    // For now, no line property editing
-    if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        return false;
-
-    csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
-
-    wxPanel* attributeDialog;
-    wxString attributeDialogName;
-    wxString title;
-
-    if (shape->IsKindOf(CLASSINFO(csThinRectangleShape)))
-    {
-        attributeDialog = new csThinRectangleDialog;
-        attributeDialogName = _T("thin_rectangle");
-        title = _T("Thin Rectangle Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csWideRectangleShape)))
-    {
-        attributeDialog = new csWideRectangleDialog;
-        attributeDialogName = _T("wide_rectangle");
-        title = _T("Wide Rectangle Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csTriangleShape)))
-    {
-        attributeDialog = new csTriangleDialog;
-        attributeDialogName = _T("triangle");
-        title = _T("Triangle Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csSemiCircleShape)))
-    {
-        attributeDialog = new csSemiCircleDialog;
-        attributeDialogName = _T("semi_circle");
-        title = _T("Semicircle Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csCircleShape)))
-    {
-        attributeDialog = new csCircleDialog;
-        attributeDialogName = _T("circle");
-        title = _T("Circle Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csCircleShadowShape)))
-    {
-        attributeDialog = new csCircleShadowDialog;
-        attributeDialogName = _T("circle_shadow");
-        title = _T("Circle Shadow Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csTextBoxShape)))
-    {
-        attributeDialog = new csTextBoxDialog;
-        attributeDialogName = _T("text_box");
-        title = _T("Text Box Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csGroupShape)))
-    {
-        attributeDialog = new csGroupDialog;
-        attributeDialogName = _T("group");
-        title = _T("Group Properties");
-    }
-    else if (shape->IsKindOf(CLASSINFO(csOctagonShape)))
-    {
-        attributeDialog = new csOctagonDialog;
-        attributeDialogName = _T("octagon");
-        title = _T("Octagon Properties");
-    }
-    else
-    {
-        wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
-        return false;
-    }
-
-    wxString newLabel(m_label);
-
-#if wxUSE_WX_RESOURCES
-    csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
-    dialog->GetGeneralPropertiesDialog()->SetShapeLabel(m_label);
-    if (dialog->ShowModal() == wxID_CANCEL)
-    {
-        dialog->Destroy();
-        return false;
-    }
-
-    newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
-    dialog->Destroy();
-#else
-    wxUnusedVar(attributeDialog);
-#endif // wxUSE_WX_RESOURCES
-
-    wxShape* newShape = shape->CreateNewCopy();
-
-    csEvtHandler* handler2 = (csEvtHandler *)newShape->GetEventHandler();
-    handler2->m_label = newLabel;
-
-    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
-                new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
-
-    return true;
-}
-
-/*
- * Diagram
- */
-
-#if wxUSE_PROLOGIO
-bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
-  wxDiagram::OnShapeSave(db, shape, expr);
-  csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
-  expr.AddAttributeValueString(_T("label"), handler->m_label);
-  return true;
-}
-
-bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
-  wxDiagram::OnShapeLoad(db, shape, expr);
-  wxString label = wxEmptyString;
-  expr.GetAttributeValue(_T("label"), label);
-  csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
-  shape.SetEventHandler(handler);
-
-  return true;
-}
-#endif // wxUSE_PROLOGIO
-
-IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
-
-csThinRectangleShape::csThinRectangleShape()
-{
-    SetDrawnPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetDrawnBrush(brush);
-
-    double w = csSTANDARD_SHAPE_WIDTH/2;
-    double h = csSTANDARD_SHAPE_WIDTH;
-
-    DrawRectangle(wxRect((int)(- w/2), (int)(- h/2), (int)(w), (int)(h)));
-    CalculateSize();
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
-
-csWideRectangleShape::csWideRectangleShape()
-{
-    SetDrawnPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetDrawnBrush(brush);
-
-    double w = csSTANDARD_SHAPE_WIDTH;
-    double h = w/2.0;
-
-    DrawRoundedRectangle(wxRect((int)(- w/2), (int)(- h/2), (int)(w), (int)(h)), -0.3);
-    CalculateSize();
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
-
-csTriangleShape::csTriangleShape()
-{
-    SetDrawnPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetDrawnBrush(brush);
-
-    double w = csSTANDARD_SHAPE_WIDTH;
-    double h = (csSTANDARD_SHAPE_WIDTH*2.0)/3.0;
-
-    // Triangle, from top vertex
-    wxPoint* points = new wxPoint[3];
-
-
-    points[0] = wxPoint( 0 ,  (int)(- h / 2) );
-    points[1] = wxPoint( (int)(w / 2) ,  (int)(h / 2) );
-    points[2] = wxPoint( (int)(-w / 2),  (int)(h / 2) );
-
-    DrawPolygon(3, points, oglMETAFLAGS_OUTLINE);
-
-    delete[] points;
-
-    // Add another triangle at the top for the black bit
-    SetDrawnBrush(wxBLACK_BRUSH);
-
-    points = new wxPoint[3];
-
-    // Calculate where the new points will be, using the proportions
-    // of the triangle.
-    double h1 = 8; // Height of little triangle.
-
-    /*
-        Formula: ((w/2) / h) = w1 / h1
-        w1 = ((w/2) / h) * h1;
-    */
-    double ratio = ((w/2.0) / h) ;
-    double w1 = ratio * h1;
-
-    points[0] = wxPoint(0  ,  (int) (- h / 2 ));
-    points[1] = wxPoint( (int) w1,  (int) (- h / 2 + h1));
-    points[2] = wxPoint( (int) -w1, (int) (- h / 2 + h1));
-
-    DrawPolygon(3, points);
-
-    delete[] points;
-
-    CalculateSize();
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
-
-csSemiCircleShape::csSemiCircleShape()
-{
-    // Zero degrees
-    DrawAtAngle(oglDRAWN_ANGLE_0);
-
-    double w = csSTANDARD_SHAPE_WIDTH;
-    double h = w/2.0;
-
-    SetDrawnPen(wxTRANSPARENT_PEN);
-    SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
-    // Draw a dummy rectangle that will be used for calculating the
-    // bounding box, since we can't calculate the bounding box for
-    // an arbitrary arc (not implemented)
-
-    DrawRectangle(wxRect((int)(-w/2.0), (int)(-h/2.0), (int)(w), (int)(h)));
-
-    SetDrawnPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetDrawnBrush(brush);
-
-    DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(2*h)), 0.0, 180.0);
-    DrawLine(wxPoint((int)(-w/2), (int)(h/2)), wxPoint((int)(w/2), (int)(h/2)));
-
-    CalculateSize();
-
-    /// 90 degrees
-
-    w = csSTANDARD_SHAPE_WIDTH/2;
-    h = csSTANDARD_SHAPE_WIDTH;
-
-    DrawAtAngle(oglDRAWN_ANGLE_90);
-
-    SetDrawnPen(wxTRANSPARENT_PEN);
-    SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
-    DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
-    SetDrawnPen(wxBLACK_PEN);
-    SetDrawnBrush(brush);
-
-    DrawEllipticArc(wxRect((int)(-w/2 - w), (int)(-h/2), (int)(2*w), (int)(h)), 270.0, 90.0);
-    DrawLine(wxPoint((int)(-w/2), (int)(-h/2)), wxPoint((int)(-w/2), (int)(h/2)));
-
-    CalculateSize();
-
-    /// 180 degrees
-
-    DrawAtAngle(oglDRAWN_ANGLE_180);
-
-    w = csSTANDARD_SHAPE_WIDTH;
-    h = csSTANDARD_SHAPE_WIDTH/2;
-
-    SetDrawnPen(wxTRANSPARENT_PEN);
-    SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
-    DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
-    SetDrawnPen(wxBLACK_PEN);
-    SetDrawnBrush(brush);
-
-    DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2 - h), (int)(w), (int)(2*h)), 180.0, 0.0);
-    DrawLine(wxPoint((int)(-w/2), (int)(-h/2)), wxPoint((int)(w/2), (int)(-h/2)));
-
-    CalculateSize();
-
-    /// 270 degrees
-
-    DrawAtAngle(oglDRAWN_ANGLE_270);
-
-    w = csSTANDARD_SHAPE_WIDTH/2;
-    h = csSTANDARD_SHAPE_WIDTH;
-
-    SetDrawnPen(wxTRANSPARENT_PEN);
-    SetDrawnBrush(wxTRANSPARENT_BRUSH);
-
-    DrawRectangle(wxRect((int)(-w/2), (int)(-h/2), (int)(w), (int)(h)));
-
-    SetDrawnPen(wxBLACK_PEN);
-    SetDrawnBrush(brush);
-
-    DrawEllipticArc(wxRect((int)(-w/2), (int)(-h/2), (int)(2*w), (int)(h)), 90.0, 270.0);
-    DrawLine(wxPoint((int)(w/2),(int)(-h/2)), wxPoint((int)(w/2), (int)(h/2)));
-
-    CalculateSize();
-
-    // Reset to zero
-    DrawAtAngle(oglDRAWN_ANGLE_0);
-    CalculateSize();
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
-
-csCircleShape::csCircleShape()
-{
-    SetPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetBrush(brush);
-
-    SetSize(csSTANDARD_SHAPE_WIDTH*0.6, csSTANDARD_SHAPE_WIDTH*0.6);
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
-
-csCircleShadowShape::csCircleShadowShape()
-{
-    SetPen(wxBLACK_PEN);
-    wxBrush* brush = wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID);
-    SetBrush(brush);
-
-    SetSize(csSTANDARD_SHAPE_WIDTH*0.6, csSTANDARD_SHAPE_WIDTH*0.6);
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-    SetShadowMode(SHADOW_RIGHT);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csOctagonShape, wxPolygonShape)
-
-csOctagonShape::csOctagonShape()
-{
-    SetPen(wxBLACK_PEN);
-    SetBrush(wxTheBrushList->FindOrCreateBrush(wxColour(220, 220, 220), wxSOLID));
-
-    double w = csSTANDARD_SHAPE_WIDTH*0.5;
-    double h = csSTANDARD_SHAPE_WIDTH*0.5;
-
-    double prop = h/3.0;
-
-    wxList* points = new wxList;
-    points->Append((wxObject*) new wxRealPoint(-w/2.0 + prop, -h/2.0));
-    points->Append((wxObject*) new wxRealPoint(w/2.0 - prop, -h/2.0));
-    points->Append((wxObject*) new wxRealPoint(w/2.0, -h/2.0 + prop));
-    points->Append((wxObject*) new wxRealPoint(w/2.0, h/2.0 - prop));
-    points->Append((wxObject*) new wxRealPoint(w/2.0 - prop, h/2.0));
-    points->Append((wxObject*) new wxRealPoint(-w/2.0 + prop, h/2.0));
-    points->Append((wxObject*) new wxRealPoint(-w/2.0, h/2.0 - prop));
-    points->Append((wxObject*) new wxRealPoint(-w/2.0, -h/2.0 + prop));
-
-    Create(points);
-
-    SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-// This is a transparent shape for drawing around other shapes.
-IMPLEMENT_DYNAMIC_CLASS(csGroupShape, wxRectangleShape)
-
-csGroupShape::csGroupShape()
-{
-    SetPen(wxThePenList->FindOrCreatePen(_T("BLACK"), 1, wxDOT));
-    SetBrush(wxTRANSPARENT_BRUSH);
-
-    SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
-    SetCentreResize(false);
-}
-
-void csGroupShape::OnDraw(wxDC& dc)
-{
-    wxRectangleShape::OnDraw(dc);
-}
-
-// Must modify the hit-test so it doesn't obscure shapes that are inside.
-bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance)
-{
-    *attachment = 0;
-    *distance = 0.0;
-
-    double width = 0.0, height = 0.0;
-    GetBoundingBoxMin(&width, &height);
-
-    double x1 = GetX() - (width/2.0);
-    double y1 = GetY() - (height/2.0);
-    double x2 = GetX() + (width/2.0);
-    double y2 = GetY() + (height/2.0);
-
-    double edgeTolerance = 4.0;
-
-    // Test each edge in turn
-
-    // Top/bottom edges
-    if (x >= x1 && x <= x2)
-    {
-        if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
-            return true;
-        if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
-            return true;
-    }
-    // Left/right edges
-    if (y >= y1 && y <= y2)
-    {
-        if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
-            return true;
-        if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
-            return true;
-    }
-
-    return false;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
-
-csTextBoxShape::csTextBoxShape()
-{
-    SetPen(wxTRANSPARENT_PEN);
-    SetBrush(wxTRANSPARENT_BRUSH);
-
-    SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH/2.0);
-
-    SetAttachmentMode(ATTACHMENT_MODE_NONE);
-    SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
-    SetCentreResize(false);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
-
-csLineShape::csLineShape()
-{
-}
-
-bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoint* lpt, const wxRealPoint& pt)
-{
-    csDiagramView* view = ((csCanvas*)GetCanvas())->GetView();
-
-    // Temporarily set the new shape properties so we can copy it
-    lpt->SetX(pt.x); lpt->SetY(pt.y);
-    lpt->m_point->x = pt.x; lpt->m_point->y = pt.y;
-
-    wxLineShape* newShape = (wxLineShape*) this->CreateNewCopy();
-
-    // Now set them back again
-    lpt->SetX(lpt->m_originalPos.x); lpt->SetY(lpt->m_originalPos.y);
-    lpt->m_point->x = lpt->m_originalPos.x; lpt->m_point->y = lpt->m_originalPos.y;
-
-    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
-                new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
-
-    return true;
-}
-
-wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
-{
-    return new csLabelShape(parent, region, w, h);
-}
-
-#if 0
-bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display)
-{
-    csDiagramView* view = ((csCanvas*)GetCanvas())->GetView();
-
-    wxLineShape* newShape = (wxLineShape*) this->CreateNewCopy();
-
-    wxLineShape::OnLabelMovePre(dc, labelShape, x, y, old_x, old_y, display);
-
-    view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
-                new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
-  return true;
-}
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(csLabelShape, wxLabelShape)
-
-csLabelShape::csLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h):
-  wxLabelShape(parent, region, w, h)
-{
-}
-
-// TODO: not sure how intercept normal behaviour (OnMovePre) to make
-// label movement undo-able.
-void csLabelShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-    wxLabelShape::OnEndDragLeft(x, y, keys, attachment);
-}
-
-
-// Menu for editing shapes
-void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event)
-{
-    wxShape* shape = (wxShape*) menu.GetClientData();
-    csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
-
-    switch (event.GetId())
-    {
-        case ID_CS_EDIT_PROPERTIES:
-        {
-            csEvtHandler* handler1 = (csEvtHandler *)shape->GetEventHandler();
-            handler1->EditProperties();
-#if 0
-            csEvtHandler* handler1 = (csEvtHandler *)shape->GetEventHandler();
-            csLabelEditingDialog* dialog = new csLabelEditingDialog(shape->GetCanvas()->GetParent());
-            dialog->SetShapeLabel(handler1->m_label);
-            if (dialog->ShowModal() == wxID_CANCEL)
-            {
-                dialog->Destroy();
-                return;
-            }
-
-            wxString newLabel = dialog->GetShapeLabel();
-            dialog->Destroy();
-
-            wxShape* newShape = shape->CreateNewCopy();
-
-            csEvtHandler* handler2 = (csEvtHandler *)newShape->GetEventHandler();
-            handler2->m_label = newLabel;
-
-            view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Edit label", (csDiagramDocument*) view->GetDocument(),
-                new csCommandState(ID_CS_EDIT_LABEL, newShape, shape)));
-#endif
-            break;
-        }
-        case wxID_CUT:
-        {
-            wxList list;
-            list.Append(shape);
-            view->DoCut(list);
-            break;
-        }
-        case ID_CS_ROTATE_CLOCKWISE:
-        case ID_CS_ROTATE_ANTICLOCKWISE:
-        {
-            if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-                break;
-
-            double theta = shape->GetRotation();
-            const double myPi = M_PI;
-            double ninetyDegrees = myPi/2.0;
-
-            wxString opStr;
-            if (event.GetId() == ID_CS_ROTATE_CLOCKWISE)
-            {
-                theta += ninetyDegrees;
-                opStr = _T("Rotate clockwise");
-            }
-            else
-            {
-                theta -= ninetyDegrees;
-                opStr = _T("Rotate anticlockwise");
-            }
-
-            if (theta >= 2.0*myPi || theta < 0.0)
-                theta = 0.0;
-            wxShape* newShape = shape->CreateNewCopy();
-            newShape->Rotate(0.0, 0.0, theta);
-            wxList newShapes;
-            wxList oldShapes;
-            newShapes.Append(newShape);
-            oldShapes.Append(shape);
-            view->DoCmd(newShapes, oldShapes, event.GetId(), opStr);
-            break;
-        }
-        default:
-            break;
-    }
-}
-
-BEGIN_EVENT_TABLE(ShapeEditMenu, wxMenu)
-    EVT_COMMAND_RANGE(1, 65000, wxEVT_COMMAND_MENU_SELECTED, ShapeEditMenu::OnCommand)
-END_EVENT_TABLE()
-
-void ShapeEditMenu::OnCommand(wxCommandEvent& event)
-{
-    studioShapeEditProc(*this, event);
-}
diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h
deleted file mode 100644
index 7f4548ba38..0000000000
--- a/contrib/samples/ogl/studio/shapes.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/shapes.h
-// Purpose:     Shape classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_SHAPES_H_
-#define _STUDIO_SHAPES_H_
-
-#include "wx/docview.h"
-#include "wx/string.h"
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-#include "wx/ogl/basicp.h"
-#include "wx/ogl/linesp.h"
-#include "wx/ogl/drawn.h"
-
-class csDiagramDocument;
-
-/*
- * Override a few members for this application
- */
-
-class csDiagram: public wxDiagram
-{
-DECLARE_CLASS(csDiagram)
-public:
-    csDiagram(csDiagramDocument* doc) { m_doc = doc; }
-    ~csDiagram();
-#if wxUSE_PROLOGIO
-    bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-    bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif // wxUSE_PROLOGIO
-
-    inline csDiagramDocument* GetDocument() const { return m_doc; }
-    virtual void Redraw(wxDC& dc);
-
-protected:
-    csDiagramDocument* m_doc;
-};
-
-class wxDiagramClipboard: public wxDiagram
-{
-DECLARE_DYNAMIC_CLASS(wxDiagramClipboard)
-public:
-    wxDiagramClipboard() {}
-    ~wxDiagramClipboard() {}
-
-    // Copy selection to clipboard
-    bool Copy(wxDiagram* diagram);
-
-    // Copy contents to the diagram, with new ids.
-    // If dc is non-NULL, the pasted shapes will be selected.
-    // The offsets are used to place the shapes at a different position
-    // from the original (for example, for duplicating shapes).
-    bool Paste(wxDiagram* diagram, wxDC* dc = NULL,
-        int offsetX = 0, int offsetY = 0);
-
-#ifdef __WXMSW__
-    // Draw contents to a Windows metafile device context and bitmap, and then copy
-    // to the Windows clipboard.
-    bool CopyToClipboard(double scale);
-#endif
-
-// Overridables
-    // Start/end copying
-    virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
-    virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return true; };
-
-    // Override this to e.g. have the shape added through a Do/Undo command system.
-    // By default, we'll just add it directly to the destination diagram, and
-    // select the shape (if dc is non-NULL).
-    virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
-
-protected:
-    bool DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bool newIds,
-                    wxDC* dc, int offsetX = 0, int offsetY = 0);
-
-};
-
-class csDiagramCommand;
-
-class csDiagramClipboard: public wxDiagramClipboard
-{
-DECLARE_DYNAMIC_CLASS(csDiagramClipboard)
-public:
-    csDiagramClipboard() { m_currentCmd = NULL; }
-    ~csDiagramClipboard() {}
-
-    // Start/end copying
-    virtual bool OnStartCopy(wxDiagram* diagramTo);
-    virtual bool OnEndCopy(wxDiagram* diagramTo);
-
-    virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
-
-protected:
-    csDiagramCommand*   m_currentCmd;
-};
-
-
-/*
- * The Studio shapes
- * N.B. TODO: these should really all have another constructor
- * for the ready-initialised shape, with the default one not having any
- * data. Otherwise when copying a shape, you have to delete the old data
- * first -> slightly less efficient. The initialised shapes are only required
- * for the first creation of the shape in the palette, everything else is copied.
- */
-
-class csThinRectangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csThinRectangleShape)
-public:
-    csThinRectangleShape();
-};
-
-class csWideRectangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csWideRectangleShape)
-public:
-    csWideRectangleShape();
-};
-
-class csTriangleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csTriangleShape)
-public:
-    csTriangleShape();
-};
-
-class csSemiCircleShape: public wxDrawnShape
-{
-DECLARE_DYNAMIC_CLASS(csSemiCircleShape)
-public:
-    csSemiCircleShape();
-};
-
-class csCircleShape: public wxCircleShape
-{
-DECLARE_DYNAMIC_CLASS(csCircleShape)
-public:
-    csCircleShape();
-};
-
-class csCircleShadowShape: public wxCircleShape
-{
-DECLARE_DYNAMIC_CLASS(csCircleShadowShape)
-public:
-    csCircleShadowShape();
-};
-
-class csOctagonShape: public wxPolygonShape
-{
-DECLARE_DYNAMIC_CLASS(csOctagonShape)
-public:
-    csOctagonShape();
-
-    // The attachments are as if it's a rectangle
-    bool GetAttachmentPosition(int attachment, double *x, double *y,
-                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL)
-    { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
-    int GetNumberOfAttachments() const
-    { return wxShape::GetNumberOfAttachments(); }
-    bool AttachmentIsValid(int attachment) const
-    { return wxShape::AttachmentIsValid(attachment); }
-};
-
-// This is a transparent shape for drawing around other shapes.
-class csGroupShape: public wxRectangleShape
-{
-DECLARE_DYNAMIC_CLASS(csGroupShape)
-public:
-    csGroupShape();
-
-    void OnDraw(wxDC& dc);
-    // Must modify the hit-test so it doesn't obscure shapes that are inside.
-    bool HitTest(double x, double y, int* attachment, double* distance);
-};
-
-class csTextBoxShape: public wxRectangleShape
-{
-DECLARE_DYNAMIC_CLASS(csTextBoxShape)
-public:
-    csTextBoxShape();
-};
-
-class csLineShape: public wxLineShape
-{
-DECLARE_DYNAMIC_CLASS(csLineShape)
-public:
-    csLineShape();
-
-    virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
-    wxLabelShape* OnCreateLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-};
-
-/*
- * Temporary arc label object
- */
-
-class csLabelShape: public wxLabelShape
-{
-  DECLARE_DYNAMIC_CLASS(csLabelShape)
-
- public:
-  csLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
-
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-};
-
-/*
- * All shape event behaviour is routed through this handler, so we don't
- * have to derive from each shape class. We plug this in to each shape.
- */
-
-class csEvtHandler: public wxShapeEvtHandler
-{
- DECLARE_DYNAMIC_CLASS(csEvtHandler)
- public:
-  csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString);
-  ~csEvtHandler();
-
-  void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-  void OnBeginDragRight(double x, double y, int keys = 0, int attachment = 0);
-  void OnDragRight(bool draw, double x, double y, int keys = 0, int attachment = 0);
-  void OnEndDragRight(double x, double y, int keys = 0, int attachment = 0);
-  void OnEndSize(double x, double y);
-  void OnDragLeft(bool draw, double x, double y, int keys = 0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys = 0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys = 0, int attachment = 0);
-  void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys = 0, int attachment = 0);
-  void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
-
-  void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-
-  // Copy any event handler data
-  virtual void CopyData(wxShapeEvtHandler& copy);
-
-  // Popup up a property dialog
-  virtual bool EditProperties();
-
-public:
-  wxString m_label;
-};
-
-class ShapeEditMenu: public wxMenu
-{
-public:
-    ShapeEditMenu() {}
-
-    void OnCommand(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-extern void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event);
-
-#endif
-  // _STUDIO_SHAPES_H_
diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl
deleted file mode 100644
index bae5d0377a..0000000000
--- a/contrib/samples/ogl/studio/studio.bkl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../../build/bakefiles/common_samples.bkl"/>
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../../include</set>
-    <include file="../../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="studio" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            studio.cpp
-            doc.cpp
-            shapes.cpp
-            symbols.cpp
-            view.cpp
-            cspalette.cpp
-            mainfrm.cpp
-            project.cpp
-            dialogs.cpp
-            csprint.cpp
-        </sources>
-        <contrib-lib>ogl</contrib-lib>
-        <contrib-lib>deprecated</contrib-lib>
-        <wx-lib>adv</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>studio.rc</win32-res>
-    </exe>
-
-    <wx-data id="data">
-        <files>
-            studio_resources.wxr
-        </files>
-    </wx-data>
-
-</makefile>
diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
deleted file mode 100644
index 982a0bf50b..0000000000
--- a/contrib/samples/ogl/studio/studio.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        Studio.cpp
-// Purpose:     Studio application class
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "wx/config.h"
-#include "wx/laywin.h"
-#include "wx/helpwin.h"
-
-#include "studio.h"
-#include "view.h"
-#include "doc.h"
-#include "mainfrm.h"
-#include "cspalette.h"
-#include "project.h"
-#include "symbols.h"
-
-#include "bitmaps/new.xpm"
-#include "bitmaps/open.xpm"
-#include "bitmaps/save.xpm"
-#include "bitmaps/copy.xpm"
-#include "bitmaps/cut.xpm"
-#include "bitmaps/paste.xpm"
-#include "bitmaps/print.xpm"
-#include "bitmaps/help.xpm"
-#include "bitmaps/undo.xpm"
-#include "bitmaps/redo.xpm"
-
-#include "bitmaps/alignl.xpm"
-#include "bitmaps/alignr.xpm"
-#include "bitmaps/alignt.xpm"
-#include "bitmaps/alignb.xpm"
-#include "bitmaps/horiz.xpm"
-#include "bitmaps/vert.xpm"
-#include "bitmaps/copysize.xpm"
-#include "bitmaps/linearrow.xpm"
-#include "bitmaps/newpoint.xpm"
-#include "bitmaps/cutpoint.xpm"
-#include "bitmaps/straight.xpm"
-
-#include "studio.xpm"
-
-IMPLEMENT_APP(csApp)
-
-csApp::csApp()
-{
-    m_docManager = NULL;
-    m_diagramPalette = NULL;
-    m_diagramToolBar = NULL;
-    m_projectTreeCtrl = NULL;
-    m_diagramPaletteSashWindow = NULL;
-    m_projectSashWindow = NULL;
-    m_symbolDatabase = NULL;
-    m_pointSizeComboBox = NULL;
-    m_zoomComboBox = NULL;
-    m_shapeEditMenu = NULL;
-
-    // Configuration
-    m_mainFramePos.x = 20;
-    m_mainFramePos.y = 20;
-    m_mainFrameSize.x = 500;
-    m_mainFrameSize.y = 400;
-    m_gridStyle = csGRID_STYLE_INVISIBLE;
-    m_gridSpacing = 5;
-}
-
-csApp::~csApp()
-{
-}
-
-// Initialise this in OnInit, not statically
-bool csApp::OnInit(void)
-{
-#if wxUSE_WX_RESOURCES
-    if (!wxResourceParseFile(_T("studio_resources.wxr")))
-    {
-        wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio"));
-        return false;
-    }
-#endif
-
-#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
-    m_helpController = new wxWinHelpController;
-#else
-    m_helpController = new wxHtmlHelpController;
-#endif
-
-    m_helpController->Initialize(_T("studio.hlp"));
-
-    ReadOptions();
-
-    wxOGLInitialize();
-
-    InitSymbols();
-
-    //// Create a document manager
-    m_docManager = new wxDocManager;
-
-    //// Create a template relating drawing documents to their views
-    (void) new wxDocTemplate(m_docManager, _T("Diagram"), _T("*.dia"), wxEmptyString, _T("dia"), _T("Diagram Doc"), _T("Diagram View"),
-            CLASSINFO(csDiagramDocument), CLASSINFO(csDiagramView));
-
-    // Create the main frame window.
-    // Note that we use a frame style that doesn't have wxCLIP_CHILDREN in it
-    // (the default frame style contains wxCLIP_CHILDREN), otherwise the client
-    // area doesn't refresh properly when we change its position, under Windows.
-
-#define wxDEFAULT_FRAME_STYLE_NO_CLIP \
-    (wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN)
-
-    csFrame* frame = new csFrame(m_docManager, NULL, wxID_ANY, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
-                     wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL);
-
-    // Give it an icon
-    frame->SetIcon(wxIcon(studio_xpm));
-
-    // Make a menubar
-    wxMenu *fileMenu = new wxMenu;
-
-    fileMenu->Append(wxID_NEW, _T("&New...\tCtrl+N"));
-    fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
-
-    fileMenu->AppendSeparator();
-
-    fileMenu->Append(wxID_PRINT, _T("&Print...\tCtrl+P"));
-    fileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
-    fileMenu->Append(wxID_PREVIEW, _T("Print Pre&view"));
-    fileMenu->AppendSeparator();
-    fileMenu->Append(wxID_EXIT, _T("E&xit"));
-
-    // A history of files visited. Use this menu.
-    m_docManager->FileHistoryUseMenu(fileMenu);
-
-    wxMenu *viewMenu = new wxMenu;
-    viewMenu->Append(ID_CS_SETTINGS, _T("&Settings..."));
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_HELP, _T("&Help Contents\tF1"));
-    helpMenu->Append(ID_CS_ABOUT, _T("&About"));
-
-    wxMenuBar *menuBar = new wxMenuBar;
-
-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(viewMenu, _T("&View"));
-    menuBar->Append(helpMenu, _T("&Help"));
-
-    // Associate the menu bar with the frame
-    frame->SetMenuBar(menuBar);
-
-    // Load the file history
-    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
-    m_docManager->FileHistoryLoad(config);
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar();
-#endif // wxUSE_STATUSBAR
-
-    // The ordering of these is important for layout purposes
-    CreateDiagramToolBar(frame);
-    CreatePalette(frame);
-
-    /*
-    CreateProjectWindow(frame);
-    FillProjectTreeCtrl();
-    */
-
-    // Create the shape editing menu
-    m_shapeEditMenu = new ShapeEditMenu;
-    m_shapeEditMenu->Append(ID_CS_EDIT_PROPERTIES, _T("Edit properties"));
-    m_shapeEditMenu->AppendSeparator();
-    m_shapeEditMenu->Append(ID_CS_ROTATE_CLOCKWISE, _T("Rotate clockwise"));
-    m_shapeEditMenu->Append(ID_CS_ROTATE_ANTICLOCKWISE, _T("Rotate anticlockwise"));
-    m_shapeEditMenu->AppendSeparator();
-    m_shapeEditMenu->Append(ID_CS_CUT, _T("Cut"));
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-int csApp::OnExit(void)
-{
-    WriteOptions();
-
-    delete m_symbolDatabase;
-    m_symbolDatabase = NULL;
-
-    delete m_docManager;
-    m_docManager = NULL;
-
-    delete m_shapeEditMenu;
-    m_shapeEditMenu = NULL;
-
-    delete m_helpController;
-    m_helpController = NULL;
-
-    wxOGLCleanUp();
-
-    return 0;
-}
-
-/*
- * Centralised code for creating a document frame.
- * Called from view.cpp, when a view is created.
- */
-
-wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet)
-{
-    //// Make a child frame
-    csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), wxID_ANY, _T("Child Frame"),
-                                                    wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
-
-#ifdef __WXMSW__
-    subframe->SetIcon(wxString(_T("chart")));
-#endif
-#ifdef __X__
-    subframe->SetIcon(wxIcon(_T("doc.xbm")));
-#endif
-
-    //// Make a menubar
-    wxMenu *fileMenu = new wxMenu;
-
-    fileMenu->Append(wxID_NEW, _T("&New...\tCtrl+N"));
-    fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
-    fileMenu->Append(wxID_CLOSE, _T("&Close\tCtrl+W"));
-    fileMenu->Append(wxID_SAVE, _T("&Save\tCtrl+S"));
-    fileMenu->Append(wxID_SAVEAS, _T("Save &As...\tF12"));
-
-    fileMenu->AppendSeparator();
-    fileMenu->Append(wxID_PRINT, _T("&Print...\tCtrl+P"));
-    fileMenu->Append(wxID_PRINT_SETUP, _T("Print &Setup..."));
-    fileMenu->Append(wxID_PREVIEW, _T("Print Pre&view"));
-
-    fileMenu->AppendSeparator();
-    fileMenu->Append(wxID_EXIT, _T("E&xit"));
-
-    wxMenu* editMenu = new wxMenu;
-    editMenu->Append(wxID_UNDO, _T("&Undo\tCtrl+Z"));
-    editMenu->Append(wxID_REDO, _T("&Redo\tCtrl+Y"));
-    editMenu->AppendSeparator();
-    editMenu->Append(wxID_CUT, _T("Cu&t\tCtrl+X"));
-    editMenu->Append(wxID_COPY, _T("&Copy\tCtrl+C"));
-    editMenu->Append(wxID_PASTE, _T("&Paste\tCtrl+V"));
-    editMenu->Append(wxID_DUPLICATE, _T("&Duplicate\tCtrl+D"));
-    editMenu->AppendSeparator();
-    editMenu->Append(wxID_CLEAR, _T("Cle&ar\tDelete"));
-    editMenu->Append(ID_CS_SELECT_ALL, _T("Select A&ll\tCtrl+A"));
-    editMenu->AppendSeparator();
-    editMenu->Append(ID_CS_EDIT_PROPERTIES, _T("Edit P&roperties..."));
-
-    *editMenuRet = editMenu;
-
-    m_docManager->FileHistoryUseMenu(fileMenu);
-    m_docManager->FileHistoryAddFilesToMenu(fileMenu);
-
-    doc->GetCommandProcessor()->SetEditMenu(editMenu);
-
-    wxMenu *viewMenu = new wxMenu;
-    viewMenu->Append(ID_CS_SETTINGS, _T("&Settings..."));
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_HELP, _T("&Help Contents\tF1"));
-    helpMenu->Append(ID_CS_ABOUT, _T("&About"));
-
-    wxMenuBar *menuBar = new wxMenuBar;
-
-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(editMenu, _T("&Edit"));
-    menuBar->Append(viewMenu, _T("&View"));
-    menuBar->Append(helpMenu, _T("&Help"));
-
-    //// Associate the menu bar with the frame
-    subframe->SetMenuBar(menuBar);
-
-    return subframe;
-}
-
-// Creates a canvas. Called by OnInit as a child of the main window
-csCanvas *csApp::CreateCanvas(wxView *view, wxMDIChildFrame *parent)
-{
-    int width, height;
-    parent->GetClientSize(&width, &height);
-
-    // Non-retained canvas
-    csCanvas *canvas = new csCanvas((csDiagramView*) view, parent, 1000, wxPoint(0, 0), wxSize(width, height), wxSUNKEN_BORDER);
-
-    wxColour bgColour(_T("WHITE"));
-    canvas->SetBackgroundColour(bgColour);
-
-    wxCursor cursor(wxCURSOR_HAND);
-    canvas->SetCursor(cursor);
-
-    // Give it scrollbars
-    canvas->SetScrollbars(20, 20, 100, 100);
-
-    return canvas;
-}
-
-void csApp::InitToolBar(wxToolBar* toolBar)
-{
-    wxBitmap* bitmaps[10];
-
-    bitmaps[0] = new wxBitmap( new_xpm );
-    bitmaps[1] = new wxBitmap( open_xpm );
-    bitmaps[2] = new wxBitmap( save_xpm );
-    bitmaps[3] = new wxBitmap( copy_xpm );
-    bitmaps[4] = new wxBitmap( cut_xpm );
-    bitmaps[5] = new wxBitmap( paste_xpm );
-    bitmaps[6] = new wxBitmap( print_xpm );
-    bitmaps[7] = new wxBitmap( help_xpm );
-    bitmaps[8] = new wxBitmap( undo_xpm );
-    bitmaps[9] = new wxBitmap( redo_xpm );
-
-    toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file"));
-    toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file"));
-    toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file"));
-    toolBar->AddSeparator();
-    toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print"));
-    toolBar->AddSeparator();
-    toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy"));
-    toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut"));
-    toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste"));
-    toolBar->AddSeparator();
-    toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo"));
-    toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo"));
-    toolBar->AddSeparator();
-    toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help"));
-
-    toolBar->Realize();
-
-    toolBar->EnableTool(wxID_COPY, false);
-    toolBar->EnableTool(wxID_PASTE, false);
-    toolBar->EnableTool(wxID_PRINT, false);
-    toolBar->EnableTool(wxID_UNDO, false);
-    toolBar->EnableTool(wxID_REDO, false);
-
-    int i;
-    for (i = 0; i < 10; i++)
-        delete bitmaps[i];
-}
-
-// Create and initialise the diagram toolbar
-void csApp::CreateDiagramToolBar(wxFrame* parent)
-{
-    // First create a layout window
-    wxSashLayoutWindow* win = new wxSashLayoutWindow(parent, ID_LAYOUT_WINDOW_DIAGRAM_TOOLBAR, wxDefaultPosition, wxSize(200, 30), wxNO_BORDER|wxSW_3D|wxCLIP_CHILDREN);
-    win->SetDefaultSize(wxSize(10000, 30));
-    win->SetOrientation(wxLAYOUT_HORIZONTAL);
-    win->SetAlignment(wxLAYOUT_TOP);
-    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
-    m_diagramToolBarSashWindow = win;
-    m_diagramToolBarSashWindow->Show(false);
-
-    // Create the actual toolbar
-    m_diagramToolBar = new wxToolBar(win, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT);
-
-    wxBitmap* bitmaps[11];
-
-    bitmaps[0] = new wxBitmap( alignl_xpm );
-    bitmaps[1] = new wxBitmap( alignr_xpm );
-    bitmaps[2] = new wxBitmap( alignt_xpm );
-    bitmaps[3] = new wxBitmap( alignb_xpm );
-    bitmaps[4] = new wxBitmap( horiz_xpm );
-    bitmaps[5] = new wxBitmap( vert_xpm );
-    bitmaps[6] = new wxBitmap( copysize_xpm );
-    bitmaps[7] = new wxBitmap( linearrow_xpm );
-    bitmaps[8] = new wxBitmap( newpoint_xpm );
-    bitmaps[9] = new wxBitmap( cutpoint_xpm );
-    bitmaps[10] = new wxBitmap( straight_xpm );
-
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align left"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align right"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align top"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align bottom"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align horizontally"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align vertically"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy size"));
-    m_diagramToolBar->AddSeparator();
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultCoord, wxDefaultCoord, NULL, _T("Toggle arrow"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New line point"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut line point"));
-    m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Straighten lines"));
-
-    m_diagramToolBar->Realize();
-
-    int i;
-    for (i = 0; i < 11; i++)
-        delete bitmaps[i];
-
-    // Create a combobox for point size
-    int maxPointSize = 40;
-    wxString *pointSizes = new wxString[maxPointSize];
-    for (i = 1; i <= maxPointSize; i++)
-    {
-        pointSizes[i-1].Printf(_T("%d"), i);
-    }
-
-    int controlX = 260;
-    int pointSizeW = 40;
-    int pointSizeH = 18;
-    int zoomW = 60;
-    int zoomH = 18;
-#ifdef __WXMOTIF__
-    controlX += 75;
-    pointSizeW = 60;
-    pointSizeH = 22;
-    zoomW = 60;
-    zoomH = 22;
-#endif
-
-    m_pointSizeComboBox = new wxComboBox(m_diagramToolBar, ID_WINDOW_POINT_SIZE_COMBOBOX,
-        wxEmptyString, wxPoint(controlX, 1), wxSize(pointSizeW, pointSizeH), maxPointSize, pointSizes);
-    delete[] pointSizes;
-
-#ifdef __WXGTK__
-    m_diagramToolBar->AddControl(m_pointSizeComboBox);
-#endif
-
-    m_pointSizeComboBox->SetSelection(10 - 1);
-
-    // Create a combobox for zooming
-    int maxZoom = 200;
-    int minZoom = 5;
-    int increment = 5;
-    int noStrings = (maxZoom - minZoom)/5 ;
-    wxString *zoomStrings = new wxString[noStrings];
-    for (i = 0; i < noStrings; i ++)
-    {
-        zoomStrings[noStrings - i - 1].Printf(_T("%d%%"), (i*increment + minZoom));
-    }
-
-    controlX += pointSizeW + 10;
-
-    m_zoomComboBox = new wxComboBox(m_diagramToolBar, ID_WINDOW_ZOOM_COMBOBOX,
-        wxEmptyString, wxPoint(controlX, 1), wxSize(zoomW, zoomH), noStrings, zoomStrings);
-    delete[] zoomStrings;
-
-#ifdef __WXGTK__
-    m_diagramToolBar->AddControl(m_zoomComboBox);
-#endif
-
-    // i = (zoom - minZoom)/increment
-    // index = noStrings - i - 1
-    // 100%
-    i = (100 - minZoom)/increment;
-    m_zoomComboBox->SetSelection(noStrings - i - 1);
-}
-
-// Read/write configuration information
-bool csApp::ReadOptions()
-{
-    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
-
-    config.Read(_T("mainX"), & m_mainFramePos.x);
-    config.Read(_T("mainY"), & m_mainFramePos.y);
-    config.Read(_T("mainWidth"), & m_mainFrameSize.x);
-    config.Read(_T("mainHeight"), & m_mainFrameSize.y);
-    config.Read(_T("gridStyle"), & m_gridStyle);
-    config.Read(_T("gridSpacing"), & m_gridSpacing);
-
-    return true;
-}
-
-bool csApp::WriteOptions()
-{
-    wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
-
-    config.Write(_T("mainX"), (long) m_mainFramePos.x);
-    config.Write(_T("mainY"), (long) m_mainFramePos.y);
-    config.Write(_T("mainWidth"), (long) m_mainFrameSize.x);
-    config.Write(_T("mainHeight"), (long) m_mainFrameSize.y);
-    config.Write(_T("gridStyle"), (long) m_gridStyle);
-    config.Write(_T("gridSpacing"), (long) m_gridSpacing);
-
-    m_docManager->FileHistorySave(config);
-
-    return true;
-}
-
diff --git a/contrib/samples/ogl/studio/studio.dsp b/contrib/samples/ogl/studio/studio.dsp
deleted file mode 100644
index c64ca72b93..0000000000
--- a/contrib/samples/ogl/studio/studio.dsp
+++ /dev/null
@@ -1,516 +0,0 @@
-# Microsoft Developer Studio Project File - Name="studio" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=studio - 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 "studio.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 "studio.mak" CFG="studio - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "studio - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "studio - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "studio - 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)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\studio.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\studio.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 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\studio.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\studio.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 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\studio.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\studio.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 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\studio.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\studio.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 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\studio.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\studio.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 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\studio.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\studio.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 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\studio.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\studio.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 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\studio.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\studio.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 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\studio.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\studio.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 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_ogl.lib wxmswuniv29u_deprecated.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\studio.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\studio.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 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_ogl.lib wxmswuniv29ud_deprecated.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\studio.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\studio.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 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_ogl.lib wxmswuniv29_deprecated.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\studio.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\studio.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 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_ogl.lib wxmswuniv29d_deprecated.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\studio.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\studio.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 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_ogl.lib wxmsw29u_deprecated.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\studio.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\studio.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 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_ogl.lib wxmsw29ud_deprecated.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\studio.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\studio.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 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_ogl.lib wxmsw29_deprecated.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "studio - 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\studio"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\studio"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\studio.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\studio.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 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_ogl.lib wxmsw29d_deprecated.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "studio - Win32 DLL Universal Unicode Release"
-# Name "studio - Win32 DLL Universal Unicode Debug"
-# Name "studio - Win32 DLL Universal Release"
-# Name "studio - Win32 DLL Universal Debug"
-# Name "studio - Win32 DLL Unicode Release"
-# Name "studio - Win32 DLL Unicode Debug"
-# Name "studio - Win32 DLL Release"
-# Name "studio - Win32 DLL Debug"
-# Name "studio - Win32 Universal Unicode Release"
-# Name "studio - Win32 Universal Unicode Debug"
-# Name "studio - Win32 Universal Release"
-# Name "studio - Win32 Universal Debug"
-# Name "studio - Win32 Unicode Release"
-# Name "studio - Win32 Unicode Debug"
-# Name "studio - Win32 Release"
-# Name "studio - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\cspalette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\csprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dialogs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainfrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\project.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\shapes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\symbols.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/ogl/studio/studio.h b/contrib/samples/ogl/studio/studio.h
deleted file mode 100644
index c23652ad89..0000000000
--- a/contrib/samples/ogl/studio/studio.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/studio.h
-// Purpose:     Studio application class
-// Author:      Julian Smart
-// Modified by:
-// Created:     27/7/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_STUDIO_H_
-#define _STUDIO_STUDIO_H_
-
-#include "wx/docmdi.h"
-#include "wx/help.h"
-#include "wx/cshelp.h"
-#include "wx/helphtml.h"
-#ifdef __WXMSW__
-    #include "wx/msw/helpchm.h"
-#else
-    #include "wx/html/helpctrl.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-#include "wx/ogl/canvas.h"
-#include "shapes.h"
-
-class csEditorToolPalette;
-class csProjectTreeCtrl;
-class csCanvas;
-class csSymbolDatabase;
-class wxSashLayoutWindow;
-class csFrame;
-
-// Grid style
-#define csGRID_STYLE_NONE       0
-#define csGRID_STYLE_INVISIBLE  1
-#define csGRID_STYLE_DOTTED     2
-
-// Define a new application
-class csApp: public wxApp
-{
-    friend class csFrame;
-public:
-    csApp();
-    ~csApp();
-
-// Operations
-    bool OnInit(void);
-    int OnExit(void);
-
-    // Read/write configuration information
-    bool ReadOptions();
-    bool WriteOptions();
-
-    // Create the diagram tool palette
-    bool CreatePalette(wxFrame *parent);
-
-    // Create the project window
-    bool CreateProjectWindow(wxFrame *parent);
-
-    // Initialise the general toolbar
-    void InitToolBar(wxToolBar* toolBar);
-
-    // Create and initialise the diagram toolbar
-    void CreateDiagramToolBar(wxFrame* parent);
-
-    wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenu);
-    csCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);
-
-    // Fill out the project tree control
-    void FillProjectTreeCtrl();
-
-    // Add symbols to database
-    void InitSymbols();
-
-// Accessors
-    csEditorToolPalette* GetDiagramPalette() const { return m_diagramPalette; }
-    wxToolBar* GetDiagramToolBar() const { return m_diagramToolBar; }
-    csProjectTreeCtrl* GetProjectTreeCtrl() const { return m_projectTreeCtrl; }
-    wxSashLayoutWindow* GetDiagramPaletteSashWindow() const { return m_diagramPaletteSashWindow; }
-    wxSashLayoutWindow* GetProjectSashWindow() const { return m_projectSashWindow; }
-    wxSashLayoutWindow* GetDiagramToolBarSashWindow() const { return m_diagramToolBarSashWindow; }
-    csSymbolDatabase* GetSymbolDatabase() const { return m_symbolDatabase; }
-    wxComboBox* GetPointSizeComboBox() const { return m_pointSizeComboBox; }
-    wxComboBox* GetZoomComboBox() const { return m_zoomComboBox; }
-    wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; }
-    wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; }
-    wxDocManager* GetDocManager() const { return m_docManager; }
-    wxHelpControllerBase* GetHelpController() const { return m_helpController; }
-
-    int GetGridStyle() const { return m_gridStyle; }
-    void SetGridStyle(int style) { m_gridStyle = style; }
-
-    int GetGridSpacing() const { return m_gridSpacing; }
-    void SetGridSpacing(int spacing) { m_gridSpacing = spacing; }
-
-protected:
-    wxDocManager*           m_docManager;
-    wxSashLayoutWindow*     m_diagramPaletteSashWindow;
-    wxSashLayoutWindow*     m_diagramToolBarSashWindow;
-    wxSashLayoutWindow*     m_projectSashWindow;
-    csEditorToolPalette*    m_diagramPalette;
-    csProjectTreeCtrl*      m_projectTreeCtrl;
-    csSymbolDatabase*       m_symbolDatabase;
-    wxToolBar*              m_diagramToolBar;
-    wxComboBox*             m_pointSizeComboBox;
-    wxComboBox*             m_zoomComboBox;
-    wxMenu*                 m_shapeEditMenu;
-
-    // Configuration
-    wxPoint                 m_mainFramePos;
-    wxSize                  m_mainFrameSize;
-    int                     m_gridStyle;
-    int                     m_gridSpacing;
-
-    // Diagram clipboard
-    csDiagramClipboard      m_diagramClipboard;
-
-    // Help instance
-    wxHelpControllerBase*   m_helpController;
-};
-
-DECLARE_APP(csApp)
-
-#define ID_CS_CUT                         wxID_CUT
-#define ID_CS_ADD_SHAPE                   2
-#define ID_CS_ADD_LINE                    3
-// #define ID_CS_EDIT_LABEL                  4
-#define ID_CS_EDIT_PROPERTIES             4
-#define ID_CS_CHANGE_BACKGROUND_COLOUR    5
-#define ID_CS_MOVE                        6
-#define ID_CS_SIZE                        7
-#define ID_CS_FONT_CHANGE                 8
-#define ID_CS_ARROW_CHANGE                9
-#define ID_CS_ROTATE_CLOCKWISE            11
-#define ID_CS_ROTATE_ANTICLOCKWISE        12
-#define ID_CS_CHANGE_LINE_ORDERING        13  // Change the list of lines for a wxShape
-#define ID_CS_CHANGE_LINE_ATTACHMENT      14  // Change the attachment point for one end of a line
-#define ID_CS_ALIGN                       15
-#define ID_CS_NEW_POINT                   16
-#define ID_CS_CUT_POINT                   17
-#define ID_CS_STRAIGHTEN                  18
-#define ID_CS_MOVE_LINE_POINT             19
-#define ID_CS_MOVE_LABEL                  20
-#define ID_CS_ADD_SHAPE_SELECT            21
-#define ID_CS_ADD_LINE_SELECT             22
-
-#define ID_CS_ABOUT                       100
-#define ID_CS_SELECT_ALL                  102
-#define ID_CS_SETTINGS                    103
-
-#define ID_LAYOUT_WINDOW_PALETTE          200
-#define ID_LAYOUT_WINDOW_DIAGRAM_TOOLBAR  201
-#define ID_LAYOUT_WINDOW_PROJECT          202
-
-#define ID_DIAGRAM_PALETTE                250
-
-#define ID_WINDOW_PROJECT_TREE            300
-#define ID_WINDOW_POINT_SIZE_COMBOBOX     301
-#define ID_WINDOW_ZOOM_COMBOBOX           302
-
-#define DIAGRAM_TOOLBAR_ALIGNL            500
-#define DIAGRAM_TOOLBAR_ALIGNR            501
-#define DIAGRAM_TOOLBAR_ALIGNB            502
-#define DIAGRAM_TOOLBAR_ALIGNT            503
-#define DIAGRAM_TOOLBAR_ALIGN_HORIZ       504
-#define DIAGRAM_TOOLBAR_ALIGN_VERT        505
-#define DIAGRAM_TOOLBAR_COPY_SIZE         506
-#define DIAGRAM_TOOLBAR_LINE_ARROW        507
-#define DIAGRAM_TOOLBAR_NEW_POINT         508
-#define DIAGRAM_TOOLBAR_CUT_POINT         509
-#define DIAGRAM_TOOLBAR_STRAIGHTEN        510
-
-#endif
-  // _STUDIO_STUDIO_H_
diff --git a/contrib/samples/ogl/studio/studio.ico b/contrib/samples/ogl/studio/studio.ico
deleted file mode 100644
index 7cb092e04c..0000000000
Binary files a/contrib/samples/ogl/studio/studio.ico and /dev/null differ
diff --git a/contrib/samples/ogl/studio/studio.rc b/contrib/samples/ogl/studio/studio.rc
deleted file mode 100644
index e63bd2bfab..0000000000
--- a/contrib/samples/ogl/studio/studio.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-aaaa                    ICON    "studio.ico"
-
-/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
-#define IHaveMDIParentIcon
-#define IHaveMDIChildIcon
-
-wxSTD_MDIPARENTFRAME        ICON    "studio.ico"
-wxSTD_MDICHILDFRAME         ICON    "studio.ico"
-
-studio                      ICON    "studio.ico"
-folder1                     ICON    "bitmaps/folder1.ico"
-file1                       ICON    "bitmaps/file1.ico"
-
-arrowtool                   BITMAP  "bitmaps/arrow.bmp"
-texttool                    BITMAP  "bitmaps/texttool.bmp"
-
-#include "wx/msw/wx.rc"
-
diff --git a/contrib/samples/ogl/studio/studio.xpm b/contrib/samples/ogl/studio/studio.xpm
deleted file mode 100644
index cd5b1cbc14..0000000000
--- a/contrib/samples/ogl/studio/studio.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *studio_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/contrib/samples/ogl/studio/studio_resources.h b/contrib/samples/ogl/studio/studio_resources.h
deleted file mode 100644
index 92a49c0f36..0000000000
--- a/contrib/samples/ogl/studio/studio_resources.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * studio_resources.h
- * Window identifiers file written by Dialog Editor
- */
-
-#define ID_GRID_STYLE 6004
-#define ID_TEXTCTRL5115 5115
-#define ID_TEXTCTRL5107 5107
-#define ID_LABEL_DIALOG 6008
-#define ID_GRID_SPACING 6007
-#define IDD_LABEL_ENTRY 100
-#define ID_STATIC 300
-#define ID_DIALOG100 100
-#define ID_DIALOG6001 6001
-#define ID_STATIC6005 6005
-#define ID_STATIC6006 6006
-#define ID_STATIC5116 5116
-#define ID_STATIC6009 6009
-#define ID_LABELTEXT 101
-#define ID_CONTROL101 106
-#define ID_CONTROL102 107
-#define ID_CONTROL111 111
-#define ID_CONTROL120 120
-#define ID_CONTROL103 108
-#define ID_CONTROL121 5105
-#define ID_CONTROL130 5114
-#define ID_CONTROL104 109
-#define ID_CONTROL122 5106
-#define ID_CONTROL131 121
-#define ID_CONTROL105 110
-#define ID_CONTROL114 115
-#define ID_CONTROL123 5107
-#define ID_CONTROL132 122
-#define ID_CONTROL124 5108
-#define ID_CONTROL116 116
-#define ID_CONTROL125 5109
-#define ID_CONTROL117 117
-#define ID_CONTROL126 5110
-#define ID_CONTROL118 118
-#define ID_CONTROL127 5111
-#define ID_CONTROL119 119
-#define ID_CONTROL128 5112
-#define ID_CONTROL129 5113
-#define ID_GENERAL_SETTINGS_DIALOG 2000
diff --git a/contrib/samples/ogl/studio/studio_resources.wxr b/contrib/samples/ogl/studio/studio_resources.wxr
deleted file mode 100644
index b5b240a20a..0000000000
--- a/contrib/samples/ogl/studio/studio_resources.wxr
+++ /dev/null
@@ -1,191 +0,0 @@
-static char *semi_circle = "dialog(name = 'semi_circle',\
-  style = 'wxNO_BORDER',\
-  title = 'SemiCircle',\
-  id = 100,\
-  x = 10, y = 40, width = 365, height = 405,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 14, 163, 64, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [107, wxTextCtrl, '', '0', 'textctrl8', 108, 162, 120, 19, ''],\
-  control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 14, 208, 79, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [109, wxTextCtrl, '1', '0', 'textctrl10', 108, 206, 30, 19, '1'],\
-  control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 14, 245, 54, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [111, wxTextCtrl, '', '0', 'textctrl12', 108, 245, 120, 19, ''],\
-  control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 12, 13, 236, 44, ['Process', 'Application', 'Project'], 3],\
-  control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 174, 68, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
-  control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 12, 69, 81, 63, ['Permanent', 'Temporary'], 2],\
-  control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 154, 208, 68, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 230, 205, 40, 19, '1']).";
-
-static char *general_shape_properties_dialog = "panel(name = 'general_shape_properties_dialog',\
-  style = 'wxNO_BORDER',\
-  title = 'General',\
-  id = 100,\
-  x = 10, y = 40, width = 400, height = 400,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [101, wxTextCtrl, '', '0', 'textctrl3', 8, 31, 203, 24, ''],\
-  control = [300, wxStaticText, 'Name:', '0', 'message4', 8, 11, 41, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5115, wxTextCtrl, '', 'wxTE_MULTILINE', 'textctrl1', 8, 101, 204, 100, ''],\
-  control = [5116, wxStaticText, 'Description:', '0', 'statictext2', 9, 79, 66, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
-
-static char *diagram_settings_dialog = "dialog(name = 'diagram_settings_dialog',\
-  style = 'wxNO_BORDER',\
-  title = 'Diagram settings',\
-  id = 6001,\
-  x = 10, y = 40, width = 400, height = 300,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [6004, wxChoice, '', '0', 'choice4', 13, 31, 85, 21, ['None', 'Invisible', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted', 'Dotted']],\
-  control = [6005, wxStaticText, 'Grid style:', '0', 'statictext5', 13, 11, 56, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [6006, wxStaticText, 'Grid spacing:', '0', 'statictext6', 137, 11, 72, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [6007, wxTextCtrl, '', '0', 'textctrl7', 136, 31, 66, 21, '']).";
-
-static char *general_settings_dialog = "dialog(name = 'general_settings_dialog',\
-  style = 'wxNO_BORDER | wxCAPTION | wxSYSTEM_MENU',\
-  title = '',\
-  id = 2000,\
-  x = 10, y = 40, width = 375, height = 325,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [300, wxStaticText, 'Project path:', '0', 'statictext3', 12, 15, 70, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5107, wxTextCtrl, '', '0', 'textctrl4', 12, 34, 183, 24, '']).";
-
-static char *wide_rectangle = "dialog(name = 'wide_rectangle',\
-  style = 'wxNO_BORDER',\
-  title = 'Wide Rectangle',\
-  id = 100,\
-  x = 10, y = 40, width = 355, height = 405,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 13, 184, 64, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [107, wxTextCtrl, '', '0', 'textctrl8', 13, 184, 120, 19, ''],\
-  control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 13, 184, 79, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [109, wxTextCtrl, '', '0', 'textctrl10', 13, 184, 30, 19, ''],\
-  control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 13, 184, 54, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [111, wxTextCtrl, '', '0', 'textctrl12', 13, 184, 120, 19, ''],\
-  control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 11, 313, 46, ['Process', 'Application', 'Project'], 3],\
-  control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 166, 70, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
-  control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2]).";
-
-static char *thin_rectangle = "dialog(name = 'thin_rectangle',\
-  style = 'wxNO_BORDER',\
-  title = 'Thin Rectangle',\
-  id = 100,\
-  x = 10, y = 40, width = 361, height = 405,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 12, 169, 64, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [107, wxTextCtrl, '', '0', 'textctrl8', 106, 168, 120, 19, ''],\
-  control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 12, 204, 79, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [109, wxTextCtrl, '1', '0', 'textctrl10', 106, 202, 30, 19, '1'],\
-  control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 12, 267, 54, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [111, wxTextCtrl, '', '0', 'textctrl12', 106, 265, 120, 19, ''],\
-  control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
-  control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 176, 73, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
-  control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2],\
-  control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 205, 68, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 228, 202, 40, 19, '1'],\
-  control = [5113, wxStaticText, 'Num Fields', '0', 'statictext3', 12, 234, 62, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5114, wxTextCtrl, '1', '0', 'textctrl4', 106, 234, 40, 19, '1']).";
-
-static char *circle = "dialog(name = 'circle',\
-  style = 'wxNO_BORDER',\
-  title = 'Circle',\
-  id = 100,\
-  x = 10, y = 40, width = 361, height = 405,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 12, 169, 64, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [107, wxTextCtrl, '', '0', 'textctrl8', 106, 168, 120, 19, ''],\
-  control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 12, 204, 79, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [109, wxTextCtrl, '1', '0', 'textctrl10', 106, 202, 30, 19, '1'],\
-  control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 12, 267, 54, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [111, wxTextCtrl, '', '0', 'textctrl12', 106, 265, 120, 19, ''],\
-  control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 13, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
-  control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 176, 73, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
-  control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 14, 73, 81, 63, ['Permanent', 'Temporary'], 2],\
-  control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 205, 68, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 228, 202, 40, 19, '1'],\
-  control = [5113, wxStaticText, 'Num Fields', '0', 'statictext3', 12, 234, 62, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5114, wxTextCtrl, '1', '0', 'textctrl4', 106, 234, 40, 19, '1']).";
-
-static char *triangle = "dialog(name = 'triangle',\
-  style = 'wxNO_BORDER',\
-  title = 'Triangle',\
-  id = 100,\
-  x = 10, y = 40, width = 362, height = 405,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 0,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [106, wxStaticText, 'Segment Id', '0', 'statictext7', 16, 170, 64, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [107, wxTextCtrl, '', '0', 'textctrl8', 110, 169, 120, 19, ''],\
-  control = [108, wxStaticText, 'Num Channels', '0', 'statictext9', 16, 213, 79, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [109, wxTextCtrl, '1', '0', 'textctrl10', 110, 213, 30, 19, '1'],\
-  control = [110, wxStaticText, 'Attributes', '0', 'statictext11', 16, 252, 54, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [111, wxTextCtrl, '', '0', 'textctrl12', 110, 252, 120, 19, ''],\
-  control = [5106, wxRadioBox, 'Scope', 'wxRA_SPECIFY_COLS', 'radiobox1', 14, 16, 236, 44, ['Process', 'Application', 'Project'], 3],\
-  control = [5108, wxRadioBox, 'Resource', 'wxRA_SPECIFY_ROWS', 'radiobox3', 178, 75, 72, 82, ['Heap', 'Segment', 'Any'], 3],\
-  control = [5109, wxRadioBox, 'Volatility', 'wxRA_SPECIFY_ROWS', 'radiobox4', 15, 75, 81, 63, ['Permanent', 'Temporary'], 2],\
-  control = [5111, wxStaticText, 'Num Events', '0', 'statictext1', 156, 215, 68, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5112, wxTextCtrl, '1', '0', 'textctrl2', 227, 213, 40, 19, '1']).";
-
-static char *shape_label_dialog = "dialog(name = 'shape_label_dialog',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
-  title = 'Edit Shape Label',\
-  id = 6008,\
-  x = 10, y = 10, width = 190, height = 60,\
-  background_colour = 'C0C0C0',\
-  use_dialog_units = 1,\
-  use_system_defaults = 0,\
-  font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\
-  control = [6009, wxStaticText, 'Please enter a label for this shape.', '0', 'statictext2', 8, 6, 100, 6, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [101, wxTextCtrl, '', '0', 'textctrl4', 8, 18, 168, 11, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5100, wxButton, 'OK', '0', 'button5', 100, 37, 36, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\
-  control = [5101, wxButton, 'Cancel', '0', 'button6', 140, 37, 36, 13, '',\
-      [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
-
diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp
deleted file mode 100644
index 5aaffd6816..0000000000
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/symbols.cpp
-// Purpose:     Implements the Studio symbol database
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-#include "studio.h"
-#include "doc.h"
-#include "shapes.h"
-#include "view.h"
-#include "symbols.h"
-
-/*
- * csSymbol
- * Represents information about a symbol.
- */
-
-csSymbol::csSymbol(const wxString& name, wxShape* shape)
-{
-    m_name = name;
-    m_shape = shape;
-    m_toolId = 0;
-}
-
-csSymbol::~csSymbol()
-{
-    delete m_shape;
-}
-
-/*
- * A table of all possible shapes.
- * We can use this to construct a palette, etc.
- */
-csSymbolDatabase::csSymbolDatabase()
-{
-    m_currentId = 800;
-}
-
-csSymbolDatabase::~csSymbolDatabase()
-{
-    ClearSymbols();
-}
-
-void csSymbolDatabase::AddSymbol(csSymbol* symbol)
-{
-    symbol->SetToolId(m_currentId);
-    m_symbols.Append(symbol);
-
-    m_currentId ++;
-}
-
-void csSymbolDatabase::ClearSymbols()
-{
-    wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
-    while (node)
-    {
-        csSymbol* symbol = (csSymbol*) node->GetData();
-        delete symbol;
-
-        node = node->GetNext();
-    }
-    m_symbols.Clear();
-}
-
-csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
-{
-    wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
-    while (node)
-    {
-        csSymbol* symbol = (csSymbol*) node->GetData();
-        if (symbol->GetName() == name)
-            return symbol;
-
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-csSymbol* csSymbolDatabase::FindSymbol(int toolId) const
-{
-    wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
-    while (node)
-    {
-        csSymbol* symbol = (csSymbol*) node->GetData();
-        if (symbol->GetToolId() == toolId)
-            return symbol;
-
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-// Add symbols to database
-void csApp::InitSymbols()
-{
-    m_symbolDatabase = new csSymbolDatabase;
-
-    wxShape* shape = new csCircleShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Circle"), shape));
-
-    shape = new csCircleShadowShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Circle shadow"), shape));
-
-    shape = new csThinRectangleShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Thin Rectangle"), shape));
-
-    shape = new csWideRectangleShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Wide Rectangle"), shape));
-
-    shape = new csSemiCircleShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("SemiCircle"), shape));
-
-    shape = new csTriangleShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Triangle"), shape));
-
-    shape = new csOctagonShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Octagon"), shape));
-
-    shape = new csGroupShape();
-    shape->AssignNewIds();
-    shape->SetEventHandler(new csEvtHandler(shape, shape, wxEmptyString));
-
-    m_symbolDatabase->AddSymbol(new csSymbol(_T("Group"), shape));
-}
-
-wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& toolSize)
-{
-    symbol->GetShape()->Recompute();
-
-    wxBitmap *newBitmap = new wxBitmap(toolSize.x, toolSize.y);
-
-    // Test code
-#if 0
-    wxMemoryDC memDC;
-    memDC.SelectObject(*newBitmap);
-    memDC.SetPen(* wxBLACK_PEN);
-    memDC.SetBrush(* wxWHITE_BRUSH);
-    memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
-    memDC.SetLogicalFunction(wxCOPY);
-    memDC.Clear();
-
-    memDC.DrawLine(0, 0, toolSize.x, toolSize.y);
-    memDC.DrawLine(0, toolSize.y, toolSize.x, 0);
-
-    memDC.SelectObject(wxNullBitmap);
-#endif
-
-#if 1
-    wxMemoryDC memDC;
-
-    double height, width, maxSize;
-    symbol->GetShape()->GetBoundingBoxMax(&width, &height);
-
-    if (height > width)
-        maxSize = height;
-    else
-        maxSize = width;
-
-    double borderMargin = 4.0;
-    double scaleFactor = (double)(toolSize.x / (maxSize + 2*borderMargin));
-    double centreX = (double)((toolSize.x/scaleFactor)/2.0)-1;
-    double centreY = centreX;
-
-    memDC.SelectObject(*newBitmap);
-
-    memDC.SetUserScale(scaleFactor, scaleFactor);
-
-    memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
-    memDC.Clear();
-
-    symbol->GetShape()->Show(true);
-    symbol->GetShape()->Move(memDC, centreX, centreY);
-
-    memDC.SelectObject(wxNullBitmap);
-#endif
-
-    return newBitmap;
-}
diff --git a/contrib/samples/ogl/studio/symbols.h b/contrib/samples/ogl/studio/symbols.h
deleted file mode 100644
index 8ee823780f..0000000000
--- a/contrib/samples/ogl/studio/symbols.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/symbols.h
-// Purpose:     Symbol classes (symbol database)
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_SYMBOLS_H_
-#define _STUDIO_SYMBOLS_H_
-
-#include "wx/docview.h"
-#include "wx/string.h"
-
-#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
-
-/*
- * csSymbol
- * Represents information about a symbol.
- */
-
-class csSymbol: public wxObject
-{
-public:
-    csSymbol(const wxString& name, wxShape* shape);
-    ~csSymbol();
-
-    inline void SetName(const wxString& name) { m_name = name; }
-    inline wxString GetName() const { return m_name; }
-
-    inline void SetShape(wxShape* shape) { m_shape = shape; }
-    inline wxShape* GetShape() const { return m_shape; }
-
-    inline void SetToolId(int id) { m_toolId = id; }
-    inline int GetToolId() const { return m_toolId; }
-protected:
-    wxString    m_name;
-    wxShape*    m_shape;
-    int         m_toolId;
-};
-
-/*
- * A table of all possible shapes.
- * We can use this to construct a palette, etc.
- */
-class csSymbolDatabase: public wxObject
-{
-public:
-    csSymbolDatabase();
-    ~csSymbolDatabase();
-
-// Accessors
-    inline wxList& GetSymbols() const { return (wxList&) m_symbols; }
-
-// Operations
-    void AddSymbol(csSymbol* symbol);
-    void ClearSymbols();
-    csSymbol* FindSymbol(const wxString& name) const;
-    csSymbol* FindSymbol(int toolId) const;
-    wxBitmap* CreateToolBitmap(csSymbol* symbol, const wxSize& sz);
-
-protected:
-    wxList          m_symbols;
-    int             m_currentId;
-};
-
-#endif
-  // _STUDIO_SYMBOLS_H_
diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp
deleted file mode 100644
index 8a5e625c62..0000000000
--- a/contrib/samples/ogl/studio/view.cpp
+++ /dev/null
@@ -1,1038 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/view.cpp
-// Purpose:     Implements view functionality
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/colordlg.h"
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
-#endif
-
-#include "studio.h"
-#include "doc.h"
-#include "view.h"
-#include "cspalette.h"
-#include "symbols.h"
-#include "dialogs.h"
-#include "wx/ogl/basicp.h"
-#include "wx/ogl/linesp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView)
-
-BEGIN_EVENT_TABLE(csDiagramView, wxView)
-    EVT_MENU(wxID_CUT, csDiagramView::OnCut)
-    EVT_MENU(wxID_COPY, csDiagramView::OnCopy)
-    EVT_MENU(wxID_CLEAR, csDiagramView::OnClear)
-    EVT_MENU(wxID_PASTE, csDiagramView::OnPaste)
-    EVT_MENU(wxID_DUPLICATE, csDiagramView::OnDuplicate)
-    EVT_MENU(ID_CS_CHANGE_BACKGROUND_COLOUR, csDiagramView::OnChangeBackgroundColour)
-    EVT_MENU(ID_CS_EDIT_PROPERTIES, csDiagramView::OnEditProperties)
-    EVT_MENU(ID_CS_SELECT_ALL, csDiagramView::OnSelectAll)
-    EVT_TOOL(DIAGRAM_TOOLBAR_LINE_ARROW, csDiagramView::OnToggleArrowTool)
-    EVT_COMBOBOX(ID_WINDOW_POINT_SIZE_COMBOBOX, csDiagramView::OnPointSizeComboSel)
-    EVT_COMBOBOX(ID_WINDOW_ZOOM_COMBOBOX, csDiagramView::OnZoomSel)
-    EVT_TEXT(ID_WINDOW_POINT_SIZE_COMBOBOX, csDiagramView::OnPointSizeComboText)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNL, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNR, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNB, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGNT, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGN_HORIZ, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_ALIGN_VERT, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_COPY_SIZE, csDiagramView::OnAlign)
-    EVT_TOOL(DIAGRAM_TOOLBAR_NEW_POINT, csDiagramView::OnNewLinePoint)
-    EVT_TOOL(DIAGRAM_TOOLBAR_CUT_POINT, csDiagramView::OnCutLinePoint)
-    EVT_TOOL(DIAGRAM_TOOLBAR_STRAIGHTEN, csDiagramView::OnStraightenLines)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNL, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNR, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNB, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGNT, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGN_HORIZ, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_ALIGN_VERT, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_COPY_SIZE, csDiagramView::OnAlignUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_NEW_POINT, csDiagramView::OnNewLinePointUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_CUT_POINT, csDiagramView::OnCutLinePointUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_STRAIGHTEN, csDiagramView::OnStraightenLinesUpdate)
-    EVT_UPDATE_UI(DIAGRAM_TOOLBAR_LINE_ARROW, csDiagramView::OnToggleArrowToolUpdate)
-    EVT_UPDATE_UI(wxID_CUT, csDiagramView::OnCutUpdate)
-    EVT_UPDATE_UI(wxID_COPY, csDiagramView::OnCopyUpdate)
-    EVT_UPDATE_UI(wxID_CLEAR, csDiagramView::OnClearUpdate)
-    EVT_UPDATE_UI(wxID_PASTE, csDiagramView::OnPasteUpdate)
-    EVT_UPDATE_UI(wxID_DUPLICATE, csDiagramView::OnDuplicateUpdate)
-    EVT_UPDATE_UI(ID_CS_EDIT_PROPERTIES, csDiagramView::OnEditPropertiesUpdate)
-    EVT_UPDATE_UI(wxID_UNDO, csDiagramView::OnUndoUpdate)
-    EVT_UPDATE_UI(wxID_REDO, csDiagramView::OnRedoUpdate)
-END_EVENT_TABLE()
-
-// What to do when a view is created. Creates actual
-// windows for displaying the view.
-bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
-{
-  wxMenu* editMenu;
-  frame = wxGetApp().CreateChildFrame(doc, this, &editMenu);
-  canvas = wxGetApp().CreateCanvas(this, frame);
-  canvas->SetView(this);
-
-  SetFrame(frame);
-  Activate(true);
-
-  // Initialize the edit menu Undo and Redo items
-  doc->GetCommandProcessor()->SetEditMenu(editMenu);
-  doc->GetCommandProcessor()->Initialize();
-
-  wxShapeCanvas *shapeCanvas = (wxShapeCanvas *)canvas;
-  csDiagramDocument *diagramDoc = (csDiagramDocument *)doc;
-  shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
-  diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
-
-  diagramDoc->GetDiagram()->SetGridSpacing((double) wxGetApp().GetGridSpacing());
-
-    switch (wxGetApp().GetGridStyle())
-    {
-        case csGRID_STYLE_NONE:
-        {
-            diagramDoc->GetDiagram()->SetSnapToGrid(false);
-            break;
-        }
-        case csGRID_STYLE_INVISIBLE:
-        {
-            diagramDoc->GetDiagram()->SetSnapToGrid(true);
-            break;
-        }
-        case csGRID_STYLE_DOTTED:
-        {
-            // TODO (not implemented in OGL)
-            break;
-        }
-    }
-
-
-  return true;
-}
-
-csDiagramView::~csDiagramView(void)
-{
-    if (frame)
-    {
-        ((wxDocMDIChildFrame*)frame)->SetView(NULL);
-    }
-}
-
-// Sneakily gets used for default print/preview
-// as well as drawing on the screen.
-void csDiagramView::OnDraw(wxDC *WXUNUSED(dc))
-{
-}
-
-void csDiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
-{
-  if (canvas)
-    canvas->Refresh();
-}
-
-// Clean up windows used for displaying the view.
-bool csDiagramView::OnClose(bool deleteWindow)
-{
-  if (!GetDocument()->Close())
-    return false;
-
-  csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
-  diagramDoc->GetDiagram()->SetCanvas(NULL);
-
-  canvas->ClearBackground();
-  canvas->SetDiagram(NULL);
-  canvas->SetView(NULL);
-  canvas = NULL;
-
-  wxMenu* fileMenu = frame->GetMenuBar()->GetMenu(0);
-
-  // Remove file menu from those managed by the command history
-  wxGetApp().GetDocManager()->FileHistoryRemoveMenu(fileMenu);
-
-  Activate(false);
-  frame->Show(false);
-
-  if (deleteWindow)
-  {
-    frame->Destroy();
-  }
-
-  return true;
-}
-
-// Adds or removes shape from m_selections
-void csDiagramView::SelectShape(wxShape* shape, bool select)
-{
-    if (select && !m_selections.Member(shape))
-        m_selections.Append(shape);
-    else if (!select)
-        m_selections.DeleteObject(shape);
-}
-
-void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
-{
-    SelectAll(true);
-}
-
-wxShape *csDiagramView::FindFirstSelectedShape(void)
-{
-  csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-    wxShape *eachShape = (wxShape *)node->GetData();
-    if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected())
-    {
-      return eachShape;
-    }
-    else node = node->GetNext();
-  }
-  return NULL;
-}
-
-void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
-{
-  csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-  wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
-  while (node)
-  {
-    wxShape *eachShape = (wxShape *)node->GetData();
-    if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected() && ((toFind == NULL) || (eachShape->IsKindOf(toFind))))
-    {
-      selections.Append(eachShape);
-    }
-    node = node->GetNext();
-  }
-}
-
-void csDiagramView::OnUndoUpdate(wxUpdateUIEvent& event)
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    event.Enable(doc->GetCommandProcessor()->CanUndo());
-}
-
-void csDiagramView::OnRedoUpdate(wxUpdateUIEvent& event)
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    event.Enable(doc->GetCommandProcessor()->CanRedo());
-}
-
-void csDiagramView::OnCut(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    // Copy the shapes to the clipboard
-    wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram());
-
-    wxList selections;
-    FindSelectedShapes(selections);
-
-    DoCut(selections);
-}
-
-void csDiagramView::OnClear(wxCommandEvent& WXUNUSED(event))
-{
-    wxList selections;
-    FindSelectedShapes(selections);
-
-    DoCut(selections);
-}
-
-void csDiagramView::OnCopy(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    // Copy the shapes to the clipboard
-    if (wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram()))
-    {
-#ifdef __WXMSW__
-        // Copy to the Windows clipboard
-        wxGetApp().GetDiagramClipboard().CopyToClipboard(1.0);
-#endif
-    }
-}
-
-void csDiagramView::OnPaste(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    wxGetApp().GetDiagramClipboard().Paste(doc->GetDiagram());
-}
-
-void csDiagramView::OnDuplicate(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    // Do a copy, then a paste
-    wxGetApp().GetDiagramClipboard().Copy(doc->GetDiagram());
-
-    // Apply an offset. Really, this offset should keep being incremented,
-    // but where do we reset it again?
-    wxGetApp().GetDiagramClipboard().Paste(doc->GetDiagram(), NULL, 20, 20);
-}
-
-void csDiagramView::OnCutUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnClearUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnCopyUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnPasteUpdate(wxUpdateUIEvent& event)
-{
-    int n = wxGetApp().GetDiagramClipboard().GetCount();
-
-    event.Enable( (n > 0) );
-}
-
-void csDiagramView::OnDuplicateUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable( (m_selections.GetCount() > 0) );
-}
-
-void csDiagramView::DoCut(wxList& shapes)
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    if (shapes.GetCount() > 0)
-    {
-        csDiagramCommand* cmd = new csDiagramCommand(_T("Cut"), doc);
-
-        wxObjectList::compatibility_iterator node = shapes.GetFirst();
-        while (node)
-        {
-            wxShape *theShape = (wxShape*) node->GetData();
-            csCommandState* state = new csCommandState(ID_CS_CUT, NULL, theShape);
-
-            // Insert lines at the front, so they are cut first.
-            // Otherwise we may try to remove a shape with a line still
-            // attached.
-            if (theShape->IsKindOf(CLASSINFO(wxLineShape)))
-                cmd->InsertState(state);
-            else
-                cmd->AddState(state);
-
-            node = node->GetNext();
-        }
-        cmd->RemoveLines(); // Schedule any connected lines, not already mentioned,
-                            // to be removed first
-
-        doc->GetCommandProcessor()->Submit(cmd);
-    }
-}
-
-// Generalised command
-void csDiagramView::DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op)
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    if (shapes.GetCount() > 0)
-    {
-        csDiagramCommand* command = new csDiagramCommand(op, doc);
-
-        wxObjectList::compatibility_iterator node = shapes.GetFirst();
-        wxObjectList::compatibility_iterator node1 = oldShapes.GetFirst();
-        while (node && node1)
-        {
-            wxShape *theShape = (wxShape*) node->GetData();
-            wxShape *oldShape = (wxShape*) node1->GetData();
-            csCommandState* state = new csCommandState(cmd, theShape, oldShape);
-            command->AddState(state);
-
-            node = node->GetNext();
-            node1 = node1->GetNext();
-        }
-        doc->GetCommandProcessor()->Submit(command);
-    }
-}
-
-void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    wxList selections;
-    FindSelectedShapes(selections);
-
-    if (selections.GetCount() > 0)
-    {
-        wxColourData data;
-        data.SetChooseFull(true);
-        if (selections.GetCount() == 1)
-        {
-            wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData();
-            data.SetColour(firstShape->GetBrush()->GetColour());
-        }
-
-        wxColourDialog *dialog = new wxColourDialog(frame, &data);
-        wxBrush *theBrush = NULL;
-        if (dialog->ShowModal() == wxID_OK)
-        {
-          wxColourData retData = dialog->GetColourData();
-          wxColour col = retData.GetColour();
-          theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
-        }
-        dialog->Close(true);
-        if (!theBrush)
-            return;
-
-        csDiagramCommand* cmd = new csDiagramCommand(_T("Change colour"), doc);
-
-        wxObjectList::compatibility_iterator node = selections.GetFirst();
-        while (node)
-        {
-            wxShape *theShape = (wxShape*) node->GetData();
-            wxShape* newShape = theShape->CreateNewCopy();
-            newShape->SetBrush(theBrush);
-
-            csCommandState* state = new csCommandState(ID_CS_CHANGE_BACKGROUND_COLOUR, newShape, theShape);
-            cmd->AddState(state);
-
-            node = node->GetNext();
-        }
-        doc->GetCommandProcessor()->Submit(cmd);
-    }
-}
-
-void csDiagramView::OnEditProperties(wxCommandEvent& WXUNUSED(event))
-{
-      wxShape *theShape = FindFirstSelectedShape();
-      if (theShape)
-        ((csEvtHandler *)theShape->GetEventHandler())->EditProperties();
-}
-
-void csDiagramView::OnEditPropertiesUpdate(wxUpdateUIEvent& event)
-{
-    wxList selections;
-    FindSelectedShapes(selections);
-    event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnPointSizeComboSel(wxCommandEvent& event)
-{
-    wxComboBox* combo = (wxComboBox*) event.GetEventObject();
-    wxASSERT( combo != NULL );
-
-    int newPointSize = (combo->GetSelection() + 1);
-
-    ApplyPointSize(newPointSize);
-
-}
-
-// TODO: must find out how to intercept the Return key, rather than
-// every key stroke. But for now, do every key stroke.
-void csDiagramView::OnPointSizeComboText(wxCommandEvent& event)
-{
-    wxComboBox* combo = (wxComboBox*) event.GetEventObject();
-    wxASSERT( combo != NULL );
-
-    wxString str(combo->GetValue());
-    long newPointSize;
-    str.ToLong( &newPointSize );
-
-    if (newPointSize < 2)
-        return;
-
-    ApplyPointSize(newPointSize);
-}
-
-void csDiagramView::ApplyPointSize(int pointSize)
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    wxList selections;
-    FindSelectedShapes(selections);
-
-    if (selections.GetCount() > 0)
-    {
-        csDiagramCommand* cmd = new csDiagramCommand(_T("Point size"), doc);
-
-        wxObjectList::compatibility_iterator node = selections.GetFirst();
-        while (node)
-        {
-            wxShape *theShape = (wxShape*) node->GetData();
-            wxShape *newShape = theShape->CreateNewCopy();
-
-            wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
-                theShape->GetFont()->GetFamily(),
-                theShape->GetFont()->GetStyle(),
-                theShape->GetFont()->GetWeight(),
-                theShape->GetFont()->GetUnderlined(),
-                theShape->GetFont()->GetFaceName());
-
-            newShape->SetFont(newFont);
-
-            csCommandState* state = new csCommandState(ID_CS_FONT_CHANGE, newShape, theShape);
-
-            cmd->AddState(state);
-
-            node = node->GetNext();
-        }
-        doc->GetCommandProcessor()->Submit(cmd);
-    }
-}
-
-void csDiagramView::OnZoomSel(wxCommandEvent& event)
-{
-    int maxZoom = 200;
-    int minZoom = 5;
-    int inc = 5;
-    int noStrings = (maxZoom - minZoom)/inc ;
-
-    wxComboBox* combo = (wxComboBox*) event.GetEventObject();
-    wxASSERT( combo != NULL );
-
-    int scale = (int) ((noStrings - combo->GetSelection() - 1)*inc + minZoom);
-
-    canvas->SetScale((double) (scale/100.0), (double) (scale/100.0));
-    canvas->Refresh();
-}
-
-// Select or deselect all
-void csDiagramView::SelectAll(bool select)
-{
-    wxClientDC dc(canvas);
-    canvas->PrepareDC(dc);
-
-    if (!select)
-    {
-        wxList selections;
-        FindSelectedShapes(selections);
-
-        wxObjectList::compatibility_iterator node = selections.GetFirst();
-        while (node)
-        {
-            wxShape *theShape = (wxShape*) node->GetData();
-            theShape->Select(false, &dc);
-            SelectShape(theShape, false);
-
-            node = node->GetNext();
-        }
-    }
-    else
-    {
-        csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-        wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
-        while (node)
-        {
-            wxShape *eachShape = (wxShape *)node->GetData();
-            if (eachShape->GetParent() == NULL &&
-                !eachShape->IsKindOf(CLASSINFO(wxControlPoint)) &&
-                !eachShape->IsKindOf(CLASSINFO(wxLabelShape)))
-            {
-                eachShape->Select(true, &dc);
-                SelectShape(eachShape, true);
-            }
-            node = node->GetNext();
-        }
-    }
-}
-
-
-void csDiagramView::OnToggleArrowTool(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-
-    bool state = wxGetApp().GetDiagramToolBar()->GetToolState(DIAGRAM_TOOLBAR_LINE_ARROW);
-    wxString stateName;
-    if (state)
-        stateName = _T("Arrow on");
-    else
-        stateName = _T("Arrow off");
-
-    wxList selections;
-    FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-
-    if (selections.GetCount() > 0)
-    {
-        csDiagramCommand* cmd = new csDiagramCommand(stateName, doc);
-
-        wxObjectList::compatibility_iterator node = selections.GetFirst();
-        while (node)
-        {
-            wxLineShape *theShape = (wxLineShape*) node->GetData();
-            wxLineShape *newShape = NULL;
-
-            if (state)
-            {
-                // Add arrow
-                if (theShape->GetArrows().GetCount() == 0)
-                {
-                    newShape = (wxLineShape*) theShape->CreateNewCopy();
-                    newShape->AddArrow(ARROW_ARROW, ARROW_POSITION_MIDDLE, 10.0, 0.0, _T("Normal arrowhead"));
-                }
-            }
-            else
-            {
-                if (theShape->GetArrows().GetCount() > 0)
-                {
-                    newShape = (wxLineShape*) theShape->CreateNewCopy();
-                    newShape->ClearArrowsAtPosition();
-                }
-            }
-
-            // If the new state is the same as the old, don't bother adding it to the command state.
-            if (newShape)
-            {
-                csCommandState* state = new csCommandState(ID_CS_ARROW_CHANGE, newShape, theShape);
-                cmd->AddState(state);
-            }
-
-            node = node->GetNext();
-        }
-        doc->GetCommandProcessor()->Submit(cmd);
-    }
-}
-
-void csDiagramView::OnToggleArrowToolUpdate(wxUpdateUIEvent& event)
-{
-    wxList selections;
-    FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-    event.Enable( (selections.GetCount() > 0) );
-}
-
-// Make the point size combobox reflect this
-void csDiagramView::ReflectPointSize(int pointSize)
-{
-    wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
-    comboBox->SetSelection(pointSize -1);
-}
-
-// Make the arrow toggle button reflect the state of the line
-void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
-{
-    bool haveArrow = false;
-    wxObjectList::compatibility_iterator node = lineShape->GetArrows().GetFirst();
-    while (node)
-    {
-      wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-      if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd())
-        haveArrow = true;
-      node = node->GetNext();
-    }
-
-    wxGetApp().GetDiagramToolBar()->ToggleTool(DIAGRAM_TOOLBAR_LINE_ARROW, haveArrow);
-}
-
-void csDiagramView::OnAlign(wxCommandEvent& event)
-{
-    // Make a copy of the selections, keeping only those shapes
-    // that are top-level non-line shapes.
-    wxList selections;
-    wxObjectList::compatibility_iterator node = GetSelectionList().GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if ((shape->GetParent() == NULL) && (!shape->IsKindOf(CLASSINFO(wxLineShape))))
-        {
-            selections.Append(shape);
-        }
-        node = node->GetNext();
-    }
-
-    if (selections.GetCount() == 0)
-        return;
-
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    csDiagramCommand* cmd = new csDiagramCommand(_T("Align"), doc);
-
-    node = selections.GetFirst();
-    wxShape* firstShape = (wxShape*) node->GetData();
-
-    double x = firstShape->GetX();
-    double y = firstShape->GetY();
-    double width, height;
-    firstShape->GetBoundingBoxMax(&width, &height);
-
-    node = selections.GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (shape != firstShape)
-        {
-            /* double x1 = */ shape->GetX();
-            /* double y1 = */ shape->GetY();
-            double width1, height1;
-            shape->GetBoundingBoxMax(& width1, & height1);
-
-            wxShape* newShape = shape->CreateNewCopy();
-
-            switch (event.GetId())
-            {
-                case DIAGRAM_TOOLBAR_ALIGNL:
-                {
-                    double x2 = (double)(x - (width/2.0) + (width1/2.0));
-                    newShape->SetX(x2);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_ALIGNR:
-                {
-                    double x2 = (double)(x + (width/2.0) - (width1/2.0));
-                    newShape->SetX(x2);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_ALIGNB:
-                {
-                    double y2 = (double)(y + (height/2.0) - (height1/2.0));
-                    newShape->SetY(y2);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_ALIGNT:
-                {
-                    double y2 = (double)(y - (height/2.0) + (height1/2.0));
-                    newShape->SetY(y2);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_ALIGN_HORIZ:
-                {
-                    newShape->SetX(x);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_ALIGN_VERT:
-                {
-                    newShape->SetY(y);
-                    break;
-                }
-                case DIAGRAM_TOOLBAR_COPY_SIZE:
-                {
-                    newShape->SetSize(width, height);
-                    break;
-                }
-            }
-            csCommandState* state = new csCommandState(ID_CS_ALIGN, newShape, shape);
-            cmd->AddState(state);
-        }
-        node = node->GetNext();
-    }
-    doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnAlignUpdate(wxUpdateUIEvent& event)
-{
-    // This is an approximation, since there may be lines
-    // amongst the selections.
-    event.Enable( (m_selections.GetCount() > 1) ) ;
-}
-
-void csDiagramView::OnNewLinePoint(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    csDiagramCommand* cmd = new csDiagramCommand(_T("New line point"), doc);
-
-    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxShape* newShape = shape->CreateNewCopy();
-            ((wxLineShape*)newShape)->InsertLineControlPoint(NULL);
-            csCommandState* state = new csCommandState(ID_CS_NEW_POINT, newShape, shape);
-            cmd->AddState(state);
-        }
-        node = node->GetNext();
-    }
-    doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnCutLinePoint(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    csDiagramCommand* cmd = new csDiagramCommand(_T("Cut line point"), doc);
-
-    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxShape* newShape = shape->CreateNewCopy();
-            ((wxLineShape*)newShape)->DeleteLineControlPoint();
-            csCommandState* state = new csCommandState(ID_CS_CUT_POINT, newShape, shape);
-            cmd->AddState(state);
-        }
-        node = node->GetNext();
-    }
-    doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnStraightenLines(wxCommandEvent& WXUNUSED(event))
-{
-    csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
-    csDiagramCommand* cmd = new csDiagramCommand(_T("Straighten lines"), doc);
-
-    wxObjectList::compatibility_iterator node = m_selections.GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxShape* newShape = shape->CreateNewCopy();
-            ((wxLineShape*)newShape)->Straighten();
-            csCommandState* state = new csCommandState(ID_CS_STRAIGHTEN, newShape, shape);
-            cmd->AddState(state);
-        }
-        node = node->GetNext();
-    }
-    doc->GetCommandProcessor()->Submit(cmd);
-}
-
-void csDiagramView::OnNewLinePointUpdate(wxUpdateUIEvent& event)
-{
-    wxList selections;
-    FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-    event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnCutLinePointUpdate(wxUpdateUIEvent& event)
-{
-    wxList selections;
-    FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-    event.Enable( (selections.GetCount() > 0) );
-}
-
-void csDiagramView::OnStraightenLinesUpdate(wxUpdateUIEvent& event)
-{
-    wxList selections;
-    FindSelectedShapes(selections, CLASSINFO(wxLineShape));
-    event.Enable( (selections.GetCount() > 0) );
-}
-
-/*
- * Window implementations
- */
-
-IMPLEMENT_CLASS(csCanvas, wxShapeCanvas)
-
-BEGIN_EVENT_TABLE(csCanvas, wxShapeCanvas)
-    EVT_MOUSE_EVENTS(csCanvas::OnMouseEvent)
-    EVT_PAINT(csCanvas::OnPaint)
-END_EVENT_TABLE()
-
-// Define a constructor for my canvas
-csCanvas::csCanvas(csDiagramView *v, wxWindow *parent, wxWindowID id, const wxPoint& pos,
-    const wxSize& size, long style):
- wxShapeCanvas(parent, id, pos, size, style)
-{
-  m_view = v;
-}
-
-csCanvas::~csCanvas(void)
-{
-}
-
-void csCanvas::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2)
-{
-    wxPen dottedPen(*wxBLACK, 1, wxDOT);
-    dc.SetPen(dottedPen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    dc.DrawRectangle((long) x1, (long) y1, (long) (x2 - x1), (long) (y2 - y1));
-}
-
-void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
-{
-    csEditorToolPalette *palette = wxGetApp().GetDiagramPalette();
-
-    if (palette->GetSelection() == PALETTE_ARROW)
-    {
-        GetView()->SelectAll(false);
-
-        wxClientDC dc(this);
-        PrepareDC(dc);
-
-        Redraw(dc);
-        return;
-    }
-
-    if (palette->GetSelection() == PALETTE_TEXT_TOOL)
-    {
-        wxString newLabel;
-
-#if wxUSE_WX_RESOURCES
-        // Ask for a label and create a new free-floating text region
-        csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
-
-        dialog->SetShapeLabel( wxEmptyString );
-        dialog->SetTitle(_T("New text box"));
-        if (dialog->ShowModal() == wxID_CANCEL)
-        {
-            dialog->Destroy();
-            return;
-        }
-
-        newLabel = dialog->GetShapeLabel();
-        dialog->Destroy();
-#endif // wxUSE_WX_RESOURCES
-
-        wxShape* shape = new csTextBoxShape;
-        shape->AssignNewIds();
-        shape->SetEventHandler(new csEvtHandler(shape, shape, newLabel));
-
-        wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
-        wxString str(comboBox->GetValue());
-        long pointSize;
-        str.ToLong( &pointSize );
-
-        wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
-                shape->GetFont()->GetFamily(),
-                shape->GetFont()->GetStyle(),
-                shape->GetFont()->GetWeight(),
-                shape->GetFont()->GetUnderlined(),
-                shape->GetFont()->GetFaceName());
-
-        shape->SetFont(newFont);
-
-        shape->SetX(x);
-        shape->SetY(y);
-
-        csDiagramCommand* cmd = new csDiagramCommand(_T("Text box"),
-            (csDiagramDocument *)GetView()->GetDocument(),
-            new csCommandState(ID_CS_ADD_SHAPE, shape, NULL));
-        GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
-        palette->SetSelection(PALETTE_ARROW);
-
-        return;
-    }
-
-    csSymbol* symbol = wxGetApp().GetSymbolDatabase()->FindSymbol(palette->GetSelection());
-    if (symbol)
-    {
-        wxShape* theShape = symbol->GetShape()->CreateNewCopy();
-
-        wxComboBox* comboBox = wxGetApp().GetPointSizeComboBox();
-        wxString str(comboBox->GetValue());
-        long pointSize;
-        str.ToLong( &pointSize );
-
-        wxFont* newFont = wxTheFontList->FindOrCreateFont(pointSize,
-                symbol->GetShape()->GetFont()->GetFamily(),
-                symbol->GetShape()->GetFont()->GetStyle(),
-                symbol->GetShape()->GetFont()->GetWeight(),
-                symbol->GetShape()->GetFont()->GetUnderlined(),
-                symbol->GetShape()->GetFont()->GetFaceName());
-
-        theShape->SetFont(newFont);
-
-        theShape->AssignNewIds();
-        theShape->SetX(x);
-        theShape->SetY(y);
-
-        csDiagramCommand* cmd = new csDiagramCommand(symbol->GetName(),
-            (csDiagramDocument *)GetView()->GetDocument(),
-            new csCommandState(ID_CS_ADD_SHAPE, theShape, NULL));
-        GetView()->GetDocument()->GetCommandProcessor()->Submit(cmd);
-
-        palette->SetSelection(PALETTE_ARROW);
-    }
-}
-
-void csCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-// Initial point
-static double sg_initialX, sg_initialY;
-
-void csCanvas::OnDragLeft(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys))
-{
-    wxClientDC dc(this);
-    PrepareDC(dc);
-
-    dc.SetLogicalFunction(OGLRBLF);
-    DrawOutline(dc, sg_initialX, sg_initialY, x, y);
-}
-
-void csCanvas::OnBeginDragLeft(double x, double y, int WXUNUSED(keys))
-{
-    sg_initialX = x;
-    sg_initialY = y;
-
-    wxClientDC dc(this);
-    PrepareDC(dc);
-
-    dc.SetLogicalFunction(OGLRBLF);
-    DrawOutline(dc, sg_initialX, sg_initialY, x, y);
-    CaptureMouse();
-}
-
-void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
-{
-    ReleaseMouse();
-
-    wxClientDC dc(this);
-    PrepareDC(dc);
-
-    // Select all images within the rectangle
-    float min_x, max_x, min_y, max_y;
-    min_x = wxMin(x, sg_initialX);
-    max_x = wxMax(x, sg_initialX);
-    min_y = wxMin(y, sg_initialY);
-    max_y = wxMax(y, sg_initialY);
-
-    wxObjectList::compatibility_iterator node = GetDiagram()->GetShapeList()->GetFirst();
-    while (node)
-    {
-        wxShape *shape = (wxShape *)node->GetData();
-        if (shape->GetParent() == NULL && !shape->IsKindOf(CLASSINFO(wxControlPoint)))
-        {
-            float image_x = shape->GetX();
-            float image_y = shape->GetY();
-            if (image_x >= min_x && image_x <= max_x &&
-                image_y >= min_y && image_y <= max_y)
-            {
-                shape->Select(true, &dc);
-                GetView()->SelectShape(shape, true);
-            }
-        }
-        node = node->GetNext();
-    }
-}
-
-void csCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void csCanvas::OnMouseEvent(wxMouseEvent& event)
-{
-    wxShapeCanvas::OnMouseEvent(event);
-}
-
-void csCanvas::OnPaint(wxPaintEvent& event)
-{
-//  if (GetDiagram())
-    wxShapeCanvas::OnPaint(event);
-}
diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h
deleted file mode 100644
index c3fc46c3f3..0000000000
--- a/contrib/samples/ogl/studio/view.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/samples/ogl/studio/view.h
-// Purpose:     View-related classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _STUDIO_VIEW_H_
-#define _STUDIO_VIEW_H_
-
-#include "doc.h"
-#include "wx/ogl/ogl.h"
-
-class csDiagramView;
-class csCanvas: public wxShapeCanvas
-{
-DECLARE_CLASS(csCanvas)
- public:
-
-  csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxRETAINED);
-  ~csCanvas(void);
-
-  void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
-
-  void OnMouseEvent(wxMouseEvent& event);
-  void OnPaint(wxPaintEvent& event);
-
-  virtual void OnLeftClick(double x, double y, int keys = 0);
-  virtual void OnRightClick(double x, double y, int keys = 0);
-
-  virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragLeft(double x, double y, int keys=0);
-  virtual void OnEndDragLeft(double x, double y, int keys=0);
-
-  virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
-  virtual void OnBeginDragRight(double x, double y, int keys=0);
-  virtual void OnEndDragRight(double x, double y, int keys=0);
-
-  inline csDiagramView*  GetView() const { return m_view; }
-  inline void SetView(csDiagramView* view) { m_view = view; }
-
- protected:
-  csDiagramView*    m_view;
-
-DECLARE_EVENT_TABLE()
-};
-
-class csDiagramView: public wxView
-{
-  DECLARE_DYNAMIC_CLASS(csDiagramView)
- public:
-  csDiagramView(void) { canvas = NULL; frame = NULL; };
-  ~csDiagramView(void);
-
-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = true);
-  void OnSelectAll(wxCommandEvent& event);
-
-  wxShape *FindFirstSelectedShape(void);
-
-  // Scans the canvas for selections (doesn't use m_selections)
-  void FindSelectedShapes(wxList& selections, wxClassInfo* toFind = NULL);
-
-  // The selections in the order in which they were selected
-  inline wxList& GetSelectionList() const { return (wxList&) m_selections; }
-
-  // Adds or removes shape from m_selections
-  void SelectShape(wxShape* shape, bool select);
-
-  // Apply point size to current shapes
-  void ApplyPointSize(int pointSize);
-
-  // Make the point size combobox reflect this
-  void ReflectPointSize(int pointSize);
-
-  // Make the arrow toggle button reflect the state of the line
-  void ReflectArrowState(wxLineShape* lineShape);
-
-  // Do a cut operation for the given list of shapes
-  void DoCut(wxList& shapes);
-
-  // Do a general command
-  void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
-
-  // Select or deselect all
-  void SelectAll(bool select = true);
-
-// Event handlers
-  void OnCut(wxCommandEvent& event);
-  void OnCopy(wxCommandEvent& event);
-  void OnPaste(wxCommandEvent& event);
-  void OnDuplicate(wxCommandEvent& event);
-  void OnClear(wxCommandEvent& event);
-  void OnChangeBackgroundColour(wxCommandEvent& event);
-  void OnEditProperties(wxCommandEvent& event);
-  void OnPointSizeComboSel(wxCommandEvent& event);
-  void OnPointSizeComboText(wxCommandEvent& event);
-  void OnToggleArrowTool(wxCommandEvent& event);
-  void OnZoomSel(wxCommandEvent& event);
-  void OnAlign(wxCommandEvent& event);
-  void OnNewLinePoint(wxCommandEvent& event);
-  void OnCutLinePoint(wxCommandEvent& event);
-  void OnStraightenLines(wxCommandEvent& event);
-
-// UI update handles
-  void OnToggleArrowToolUpdate(wxUpdateUIEvent& event);
-  void OnEditPropertiesUpdate(wxUpdateUIEvent& event);
-  void OnCutUpdate(wxUpdateUIEvent& event);
-  void OnClearUpdate(wxUpdateUIEvent& event);
-  void OnCopyUpdate(wxUpdateUIEvent& event);
-  void OnPasteUpdate(wxUpdateUIEvent& event);
-  void OnDuplicateUpdate(wxUpdateUIEvent& event);
-  void OnAlignUpdate(wxUpdateUIEvent& event);
-  void OnNewLinePointUpdate(wxUpdateUIEvent& event);
-  void OnCutLinePointUpdate(wxUpdateUIEvent& event);
-  void OnStraightenLinesUpdate(wxUpdateUIEvent& event);
-  void OnUndoUpdate(wxUpdateUIEvent& event);
-  void OnRedoUpdate(wxUpdateUIEvent& event);
-
-DECLARE_EVENT_TABLE()
-
-public:
-  wxMDIChildFrame*      frame;
-  csCanvas*     canvas;
-  wxList        m_selections;
-};
-
-#endif
-    // _STUDIO_VIEW_H_
diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
deleted file mode 100644
index 3ec57fe71a..0000000000
--- a/contrib/samples/plot/Makefile.in
+++ /dev/null
@@ -1,192 +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.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-PLOT_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)
-PLOT_OBJECTS =  \
-	$(__plot_os2_lib_res) \
-	plot_plot.o \
-	$(__plot___win32rc)
-
-### 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@__plot___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C plot$(EXEEXT)
-@COND_PLATFORM_MAC_1@__plot___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___plot___os2_emxbindcmd = $(NM) plot$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep plot$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__plot___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___plot___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_OS2_1@__plot_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle
-@COND_TOOLKIT_COCOA@____plot_BUNDLE_TGT_REF_DEP = plot.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____plot_BUNDLE_TGT_REF_DEP = plot.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@__plot___win32rc = plot_plot_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 = $(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 plot$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: plot$(EXEEXT) $(__plot_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f plot$(EXEEXT)
-	rm -rf plot.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
-	$(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(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)
-	$(__plot___mac_rezcmd)
-	$(__plot___mac_setfilecmd)
-	$(__plot___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p plot.app/Contents
-	mkdir -p plot.app/Contents/MacOS
-	mkdir -p plot.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/plot/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >plot.app/Contents/PkgInfo
-	
-	
-	ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@plot_bundle: $(____plot_BUNDLE_TGT_REF_DEP)
-
-plot_plot.o: $(srcdir)/plot.cpp
-	$(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $(srcdir)/plot.cpp
-
-plot_plot_rc.o: $(srcdir)/plot.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 --include-dir $(srcdir)/../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean plot_bundle
diff --git a/contrib/samples/plot/makefile.bcc b/contrib/samples/plot/makefile.bcc
deleted file mode 100644
index 65b4fa8172..0000000000
--- a/contrib/samples/plot/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 = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_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)
-PLOT_OBJECTS =  \
-	$(OBJS)\plot_plot.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)\plot.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)\plot.exe del $(OBJS)\plot.exe
-	-if exist $(OBJS)\plot.tds del $(OBJS)\plot.tds
-	-if exist $(OBJS)\plot.ilc del $(OBJS)\plot.ilc
-	-if exist $(OBJS)\plot.ild del $(OBJS)\plot.ild
-	-if exist $(OBJS)\plot.ilf del $(OBJS)\plot.ilf
-	-if exist $(OBJS)\plot.ils del $(OBJS)\plot.ils
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS)  $(OBJS)\plot_plot.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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)\plot_plot.res
-|
-
-$(OBJS)\plot_plot.obj: .\plot.cpp
-	$(CXX) -q -c -P -o$@ $(PLOT_CXXFLAGS) $**
-
-$(OBJS)\plot_plot.res: .\plot.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 -dNOPCH -i.\..\..\include $**
-
diff --git a/contrib/samples/plot/makefile.gcc b/contrib/samples/plot/makefile.gcc
deleted file mode 100644
index a210bd0e3b..0000000000
--- a/contrib/samples/plot/makefile.gcc
+++ /dev/null
@@ -1,232 +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 = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_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)
-PLOT_OBJECTS =  \
-	$(OBJS)\plot_plot.o \
-	$(OBJS)\plot_plot_rc.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)\plot.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot_rc.o
-	$(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot  $(__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)\plot_plot.o: ./plot.cpp
-	$(CXX) -c -o $@ $(PLOT_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\plot_plot_rc.o: ./plot.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 --define NOPCH --include-dir ./../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/samples/plot/makefile.vc b/contrib/samples/plot/makefile.vc
deleted file mode 100644
index c10c5f1b2d..0000000000
--- a/contrib/samples/plot/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 = 29
-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)
-PLOT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\plot.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)
-PLOT_OBJECTS =  \
-	$(OBJS)\plot_plot.obj \
-	$(OBJS)\plot_plot.res
-
-### 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)\plot.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)\plot.exe del $(OBJS)\plot.exe
-	-if exist $(OBJS)\plot.ilk del $(OBJS)\plot.ilk
-	-if exist $(OBJS)\plot.pdb del $(OBJS)\plot.pdb
-
-$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(PLOT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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)\plot_plot.obj: .\plot.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(PLOT_CXXFLAGS) $**
-
-$(OBJS)\plot_plot.res: .\plot.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 /d NOPCH /i .\..\..\include $**
-
diff --git a/contrib/samples/plot/makefile.wat b/contrib/samples/plot/makefile.wat
deleted file mode 100644
index 0814a5372c..0000000000
--- a/contrib/samples/plot/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 = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-PLOT_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)
-PLOT_OBJECTS =  &
-	$(OBJS)\plot_plot.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\plot.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)\plot.exe del $(OBJS)\plot.exe
-
-$(OBJS)\plot.exe :  $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
-	@%create $(OBJS)\plot.lbc
-	@%append $(OBJS)\plot.lbc option quiet
-	@%append $(OBJS)\plot.lbc name $^@
-	@%append $(OBJS)\plot.lbc option caseexact
-	@%append $(OBJS)\plot.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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)\plot.lbc library %i
-	@%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res
-	@for %i in () do @%append $(OBJS)\plot.lbc option stack=%i
-	wlink @$(OBJS)\plot.lbc
-
-$(OBJS)\plot_plot.obj :  .AUTODEPEND .\plot.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(PLOT_CXXFLAGS) $<
-
-$(OBJS)\plot_plot.res :  .AUTODEPEND .\plot.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 -dNOPCH -i=.\..\..\include $<
-
diff --git a/contrib/samples/plot/plot.bkl b/contrib/samples/plot/plot.bkl
deleted file mode 100644
index cfef76512d..0000000000
--- a/contrib/samples/plot/plot.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="plot" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            plot.cpp
-        </sources>
-        <contrib-lib>plot</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>plot.rc</win32-res>
-    </exe>
-    
-</makefile>
diff --git a/contrib/samples/plot/plot.cpp b/contrib/samples/plot/plot.cpp
deleted file mode 100644
index 6ebbd6c60e..0000000000
--- a/contrib/samples/plot/plot.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        plot.cpp
-// Purpose:     wxPlotWindow sample
-// Author:      Robert Roebling
-// Modified by:
-// Created:
-// Copyright:   (C) 1999, Robert Roebling
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/plot/plot.h"
-
-#include "wx/image.h"
-#include "wx/listctrl.h"
-#include "wx/sizer.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/math.h"
-
-// derived classes
-
-class MyPlotCurve;
-class MyFrame;
-class MyApp;
-
-// MyPlotCurve
-
-class MyPlotCurve: public wxPlotCurve
-{
-public:
-    MyPlotCurve( int offsetY, double startY, double endY ) :
-        wxPlotCurve( offsetY, startY, endY ) {}
-
-    virtual wxInt32 GetStartX()
-        { return 0; }
-    virtual wxInt32 GetEndX()
-        { return 7000; }
-
-    virtual double GetY( wxInt32 x )
-        {
-            double dx = x;
-            dx /= 100;
-            return sin( dx );
-        }
-};
-
-// MyFrame
-
-class MyFrame: public wxFrame
-{
-public:
-    MyFrame();
-
-    void OnAbout( wxCommandEvent &event );
-    void OnQuit( wxCommandEvent &event );
-
-    void OnPlotClick( wxPlotEvent &event );
-    void OnPlotDClick( wxPlotEvent &event );
-
-private:
-
-    wxPlotWindow   *m_plot;
-#if wxUSE_LOG
-    wxTextCtrl     *m_log;
-#endif // wxUSE_LOG
-
-    DECLARE_DYNAMIC_CLASS(MyFrame)
-    DECLARE_EVENT_TABLE()
-};
-
-// MyApp
-
-class MyApp: public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-
-// main program
-
-IMPLEMENT_APP(MyApp)
-
-// MyFrame
-
-IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
-
-BEGIN_EVENT_TABLE(MyFrame,wxFrame)
-    EVT_MENU                 (wxID_ABOUT, MyFrame::OnAbout)
-    EVT_MENU                 (wxID_EXIT,  MyFrame::OnQuit)
-    EVT_PLOT_CLICKED         (wxID_ANY,   MyFrame::OnPlotClick)
-    EVT_PLOT_DOUBLECLICKED   (wxID_ANY,   MyFrame::OnPlotDClick)
-END_EVENT_TABLE()
-
-MyFrame::MyFrame()
-       : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxPlotWindow sample"),
-                  wxPoint(20,20), wxSize(470,500) )
-{
-    wxMenu *fileMenu = new wxMenu();
-    fileMenu->Append( wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about dialog"));
-
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(helpMenu, _T("&Help"));
-
-    SetMenuBar( menuBar );
-
-#if wxUSE_STATUSBAR
-    CreateStatusBar(2);
-    int widths[] = { -1, 100 };
-    SetStatusWidths( 2, widths );
-#endif // wxUSE_STATUSBAR
-
-    m_plot = new wxPlotWindow( this, wxID_ANY, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
-    m_plot->SetUnitsPerValue( 0.01 );
-//    m_plot->SetScrollOnThumbRelease( true );
-
-    //Add a blue, 16pt chart title
-    wxString titleText( _T("The Chart Title") );
-    wxFont titleFont( *wxNORMAL_FONT );
-    titleFont.SetPointSize( 16 );
-    wxColour titleColour( *wxBLUE );
-    m_plot->AddChartTitle( titleText, titleFont, titleColour );
-
-    m_plot->Add( new MyPlotCurve( 0,  -1.5, 1.5 ) );
-    m_plot->Add( new MyPlotCurve( 50, -1.5, 1.5 ) );
-    wxPlotOnOffCurve *oo = new wxPlotOnOffCurve( 10 );
-    oo->Add( 10, 20 );
-    oo->Add( 25, 30 );
-    oo->Add( 100, 400 );
-    oo->Add( 1000, 2000 );
-    m_plot->Add( oo );
-
-#if wxUSE_LOG
-    m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
-    wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
-    delete old_log;
-#endif // wxUSE_LOG
-
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
-    topsizer->Add( m_plot, 1, wxEXPAND );
-#if wxUSE_LOG
-    topsizer->Add( m_log, 0, wxEXPAND );
-#endif // wxUSE_LOG
-
-    SetAutoLayout( true );
-    SetSizer( topsizer );
-    topsizer->Fit(this);
-    topsizer->SetSizeHints(this);
-}
-
-void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
-{
-    Close( true );
-}
-
-void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
-{
-    (void)wxMessageBox( _T("wxPlotWindow Demo\n")
-                        _T("Robert Roebling (c) 1999,2000"),
-                        _T("About wxPlotWindow Demo"), wxICON_INFORMATION | wxOK );
-}
-
-void MyFrame::OnPlotClick( wxPlotEvent &event )
-{
-    double x = event.GetPosition() * m_plot->GetUnitsPerValue();
-    double y = event.GetCurve()->GetY( event.GetPosition() );
-    wxLogMessage( _T("Clicked on curve at x coordinate: %f, value: %f"), x, y );
-}
-
-void MyFrame::OnPlotDClick( wxPlotEvent &event )
-{
-    double x = event.GetPosition() * m_plot->GetUnitsPerValue();
-    double y = event.GetCurve()->GetY( event.GetPosition() );
-    wxLogMessage( _T("Double clicked on curve at x coordinate: %f, value: %f"), x, y );
-}
-
-//-----------------------------------------------------------------------------
-// MyApp
-//-----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
-    wxFrame *frame = new MyFrame();
-    frame->Show( true );
-
-    return true;
-}
-
diff --git a/contrib/samples/plot/plot.dsp b/contrib/samples/plot/plot.dsp
deleted file mode 100644
index c35fedf4d9..0000000000
--- a/contrib/samples/plot/plot.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="plot" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=plot - 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 "plot.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 "plot.mak" CFG="plot - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "plot - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "plot - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "plot - 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)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\plot.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\plot.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 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\plot.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\plot.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 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\plot.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\plot.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 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\plot.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\plot.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 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\plot.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\plot.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 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\plot.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\plot.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 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\plot.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\plot.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 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\plot.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\plot.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 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\plot.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\plot.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 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_plot.lib wxmswuniv29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\plot.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\plot.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 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_plot.lib wxmswuniv29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\plot.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\plot.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 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_plot.lib wxmswuniv29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\plot.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\plot.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 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_plot.lib wxmswuniv29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\plot.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\plot.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 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_plot.lib wxmsw29u_core.lib wxbase29u.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\plot.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\plot.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 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_plot.lib wxmsw29ud_core.lib wxbase29ud.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\plot.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\plot.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 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_plot.lib wxmsw29_core.lib wxbase29.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\plot.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "plot - 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\plot"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\plot"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\plot.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\plot.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 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_plot.lib wxmsw29d_core.lib wxbase29d.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\plot.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "plot - Win32 DLL Universal Unicode Release"
-# Name "plot - Win32 DLL Universal Unicode Debug"
-# Name "plot - Win32 DLL Universal Release"
-# Name "plot - Win32 DLL Universal Debug"
-# Name "plot - Win32 DLL Unicode Release"
-# Name "plot - Win32 DLL Unicode Debug"
-# Name "plot - Win32 DLL Release"
-# Name "plot - Win32 DLL Debug"
-# Name "plot - Win32 Universal Unicode Release"
-# Name "plot - Win32 Universal Unicode Debug"
-# Name "plot - Win32 Universal Release"
-# Name "plot - Win32 Universal Debug"
-# Name "plot - Win32 Unicode Release"
-# Name "plot - Win32 Unicode Debug"
-# Name "plot - Win32 Release"
-# Name "plot - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\plot.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\plot.rc
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/plot/plot.rc b/contrib/samples/plot/plot.rc
deleted file mode 100644
index 2b2f92f2da..0000000000
--- a/contrib/samples/plot/plot.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "wx/msw/wx.rc"
-#include "wx/plot/wxplot.rc"
diff --git a/contrib/src/applet/applet.cpp b/contrib/src/applet/applet.cpp
deleted file mode 100644
index 1765f9b54e..0000000000
--- a/contrib/src/applet/applet.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxApplet class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/applet.h"
-#include "wx/applet/window.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Empty event handler. We include this event handler simply so that
-// sub-classes of wxApplet can reference wxApplet in the event tables
-// that they create as necessary.
-BEGIN_EVENT_TABLE(wxApplet, wxPanel)
-     EVT_ERASE_BACKGROUND(wxApplet::OnEraseBackground)
-END_EVENT_TABLE()
-
-// Implement the abstract class functions
-IMPLEMENT_ABSTRACT_CLASS(wxApplet, wxPanel);
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the wxApplet class.
-****************************************************************************/
-bool wxApplet::Create(
-    wxHtmlAppletWindow *parent,
-    const wxHtmlTag& ,
-    const wxSize& size,
-    long style)
-{
-    bool ret = wxPanel::Create(parent, -1, wxDefaultPosition, size, style);
-    if (ret) {
-        m_parent = parent;
-        }
-    return ret;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxApplet class.
-****************************************************************************/
-wxApplet::~wxApplet()
-{
-    ((wxHtmlAppletWindow *) m_parent)->RemoveApplet(this);
-}
-
-/****************************************************************************
-REMARKS:
-Special handler for background erase messages. We do nothing in here which
-causes the background to not be erased which is exactly what we want. All
-the wxApplet classes display over an HTML window, so we want the HTML
-background to show through.
-****************************************************************************/
-void wxApplet::OnEraseBackground(wxEraseEvent&)
-{
-}
-
diff --git a/contrib/src/applet/appletwindow.cpp b/contrib/src/applet/appletwindow.cpp
deleted file mode 100644
index 07c52493f8..0000000000
--- a/contrib/src/applet/appletwindow.cpp
+++ /dev/null
@@ -1,833 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxHtmlAppletWindow class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/applet.h"
-#include "wx/applet/window.h"
-#include "wx/applet/loadpage.h"
-#include "wx/applet/plugin.h"
-
-// Preprocessor Stuff
-#include "wx/applet/prepinclude.h"
-#include "wx/applet/prepecho.h"
-#include "wx/applet/prepifelse.h"
-
-// wxWindows headers
-
-// Kind of pointless to use precompiled headers when this is the only
-// file in this lib that would need them.
-#include "wx/defs.h"
-#include "wx/spawnbrowser.h"
-#include "wx/html/forcelnk.h"
-#include "wx/log.h"
-#include "wx/msgdlg.h"
-#include "wx/tbarbase.h"
-
-// crt
-#ifdef __WXMSW__
-#include <process.h>        // spawnl()
-#endif
-
-/*---------------------------- Global variables ---------------------------*/
-
-wxHashTable wxHtmlAppletWindow::m_Cookies;		
-		
-/*------------------------- Implementation --------------------------------*/
-
-// Empty event handler. We include this event handler simply so that
-// sub-classes of wxApplet can reference wxApplet in the event tables
-// that they create as necessary.
-BEGIN_EVENT_TABLE(wxHtmlAppletWindow, wxHtmlWindow)
-	EVT_LOAD_PAGE(wxHtmlAppletWindow::OnLoadPage)
-    EVT_PAGE_LOADED(wxHtmlAppletWindow::OnPageLoaded)
-END_EVENT_TABLE()
-
-// Implement the class functions for wxHtmlAppletWindow
-IMPLEMENT_CLASS(wxHtmlAppletWindow, wxHtmlWindow)
-
-// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(VirtualData, wxObject)
-	
-// Define the wxAppletList implementation
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAppletList)
-
-/****************************************************************************
-REMARKS:
-Constructor for the applet window class.
-****************************************************************************/
-wxHtmlAppletWindow::wxHtmlAppletWindow(
-    wxWindow *parent,
-    wxWindowID id,
-    wxToolBarBase *navBar,
-    int navBackId,
-    int navForwardId,
-    const wxPoint& pos,
-    const wxSize& size,
-    long style,
-    const wxString& name)
-    : wxHtmlWindow(parent,id,pos,size,style,name), m_AppletList(wxKEY_STRING)
-{
-    // Init our locks
-    UnLock();
-
-    // setup client navbars
-    if (navBar) {
-        m_NavBarEnabled = true;
-        m_NavBar = navBar;
-        m_NavBackId = navBackId;
-        m_NavForwardId = navForwardId;
-        }
-    else {
-        m_NavBarEnabled = false;
-        m_NavBar = NULL;
-        }
-
-    m_NavBackId = navBackId;
-    m_NavForwardId = navForwardId;
-
-    // Add HTML preprocessors
-    // deleting preprocessors is done by the code within the window
-    incPreprocessor = new wxIncludePrep(); // #include preprocessor
-    incPreprocessor->ChangeDirectory(m_FS); // give it access to our filesys object
-    this->AddProcessor(incPreprocessor);
-    this->AddProcessor(new wxEchoPrep());
-    this->AddProcessor(new wxIfElsePrep());
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the applet window class.
-****************************************************************************/
-wxHtmlAppletWindow::~wxHtmlAppletWindow()
-{
-}
-
-/****************************************************************************
-PARAMETERS:
-dc  - wxDC object to draw on
-
-REMARKS:
-****************************************************************************/
-void wxHtmlAppletWindow::OnDraw(
-    wxDC& dc)
-{
-    wxHtmlWindow::OnDraw(dc);
-}
-
-/****************************************************************************
-PARAMETERS:
-className       - Name of the applet class to create an object for
-size            - Initial size of the applet to be created
-
-RETURNS:
-Pointer to the wxApplet created, or NULL if unable to create the applet.
-
-REMARKS:
-This function is used to create new wxApplet objects dynamically based on the
-class name as a string. This allows instances of wxApplet classes to be
-created dynamically based on string values embedded in the custom tags of an
-HTML page.
-****************************************************************************/
-wxApplet *wxHtmlAppletWindow::CreateApplet(
-    const wxString& classId,
-    const wxString& iName,
-    const wxHtmlTag& params,
-    const wxSize& size)
-{
-    // Dynamically create the class instance at runtime
-    wxObject *obj = wxCreateDynamicObject(classId.c_str());
-    wxApplet *applet = wxDynamicCast(obj,wxApplet);
-    if (!applet)
-        return NULL;
-    if (!applet->Create(this,params,size)) {
-        delete applet;
-        return NULL;
-        }
-    else {
-        // do some fixups on the size if its screwed up
-        wxSize nsize = applet->GetBestSize();
-        if (nsize.x < size.x) nsize.x = size.x;
-        if (nsize.y < size.y) nsize.y = size.y;
-        applet->SetSize(nsize);
-        }
-
-    m_AppletList.Append(iName,(wxObject*)applet);
-    return applet;
-}
-
-/****************************************************************************
-PARAMETERS:
-classId       - Name of the Plugin class to create an object for
-
-RETURNS:
-Pointer to the wxplugIn created, or NULL if unable to create the PlugIn.
-
-REMARKS:
-This function is used to create new wxPlugIn objects dynamically based on the
-class name as a string. This allows instances of wxPlugIn classes to be
-created dynamically based on string values embedded in the custom tags of an
-HTML page.
-****************************************************************************/
-bool wxHtmlAppletWindow::CreatePlugIn(
-    const wxString& classId,
-    const wxString& cmdLine)
-{
-    // Dynamically create the class instance at runtime, execute it
-    // and then destroy it.
-    wxObject *obj = wxCreateDynamicObject(classId.c_str());
-    wxPlugIn *plugIn = wxDynamicCast(obj,wxPlugIn);
-    if (!plugIn)
-        return false;
-    if (!plugIn->Create(this)) {
-        delete plugIn;
-        return false;
-        }
-    plugIn->Run(cmdLine);
-    delete plugIn;
-    return true;
-}
-
-/****************************************************************************
-PARAMETERS:
-appletName      - Name of the applet class to find
-
-RETURNS:
-Pointer to the wxApplet found, or NULL if not found.
-
-REMARKS:
-Find an instance of an applet based on it's name
-****************************************************************************/
-wxApplet *wxHtmlAppletWindow::FindApplet(
-    const wxString& appletName)
-{
-    wxAppletList::Node *node = m_AppletList.Find(appletName);
-    if (!node)
-        return NULL;
-    return node->GetData();
-}
-
-/****************************************************************************
-PARAMETERS:
-applet      - Pointer to the applet object to remove from the list
-
-RETURNS:
-True if the applet was found and removed, false if not. The applet itself
-is *not* destroyed!
-
-REMARKS:
-Remove an applet from the manager. Called during applet destruction
-****************************************************************************/
-bool wxHtmlAppletWindow::RemoveApplet(
-    const wxApplet *applet)
-{
-    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
-        if (node->GetData() == applet) {
-            m_AppletList.DeleteNode(node);
-            return true;
-            }
-        }
-    return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-URL - New URL for the page to load
-
-RETURNS:
-True if page loaded successfully, false if not
-
-REMARKS:
-Remove an applet from the manager. Called during applet destruction
-****************************************************************************/
-bool wxHtmlAppletWindow::LoadPage(
-    const wxString& link)
-{
-    wxString href(link);
-
-    if (link.GetChar(0) == '?'){
-        wxString cmd = link.BeforeFirst('=');
-        wxString cmdValue = link.AfterFirst('=');
-
-        // Launches the default Internet browser for the system.
-        if(!(cmd.CmpNoCase("?EXTERNAL"))) {
-            return wxSpawnBrowser(this, cmdValue.c_str());
-            }
-
-        // Launches an external program on the system.
-        if (!(cmd.CmpNoCase("?EXECUTE"))) {
-            int waitflag = P_NOWAIT;
-            bool ret;
-            wxString currentdir;
-            wxString filename, path, ext;
-
-            // Parse the params sent to the execute command. For now the only
-            // parm is "wait". wait will cause spawn wait, default is nowait.
-            // Since we only need one param for now I am not going to make this
-            // any smater then it needs to be. If we need more params later i'll
-            // fix it.
-            int i = cmdValue.Find('(');
-            if (i != -1) {
-                wxString param = cmdValue.AfterFirst('(');
-                cmdValue.Truncate(i);
-                if (!param.CmpNoCase("wait)"))
-                    waitflag = P_WAIT;
-                }
-
-            currentdir = wxGetCwd();
-            //we don't want to change the path of the virtual file system so we have to use these
-            //functions rather than the filesystem
-            wxSplitPath(cmdValue, &path, &filename, &ext);
-            if (path.CmpNoCase("") != 0) wxSetWorkingDirectory(path);
-
-            ret = !spawnl( waitflag, cmdValue , NULL );
-            //HACK should use wxExecute
-            //ret = wxExecute(filename, bool sync = FALSE, wxProcess *callback = NULL)
-            wxSetWorkingDirectory(currentdir);
-
-            return ret;
-            }
-
-        // Looks for a href in a variable stored as a cookie. The href can be
-        // changed on the fly.
-        if (!(cmd.CmpNoCase("?VIRTUAL"))){
-            wxObject *obj = FindCookie(cmdValue);
-            VirtualData *virtData = wxDynamicCast(obj,VirtualData);
-            if (virtData) {
-                // recurse and loadpage, just in case the link is like another
-                // ? link
-                return LoadPage(virtData->GetHref());
-                }
-            else {
-#ifdef CHECKED
-                wxLogError(_T("VIRTUAL LINK ERROR: '%s' does not exist."), cmdValue.c_str());
-#endif
-                return true;
-                }
-            }
-
-        // This launches a qlet - It is like an applet but is more generic in that it
-        // can be of any wxWin type so it then has the freedom to do more stuff.
-        if (!(cmd.CmpNoCase("?WXPLUGIN"))){
-            if (!cmdValue.IsNull()) {
-                // TODO: We are going to need to add code to parse the command line
-                //       parameters string in here in the future...
-                wxString cmdLine = link.AfterFirst('(');
-                cmdLine = cmdLine.BeforeLast(')');
-                if (!CreatePlugIn(cmdValue,cmdLine)) {
-#ifdef CHECKED
-                    wxLogError(_T("Launch PlugIn ERROR: '%s' does not exist."), cmdValue.c_str());
-#endif
-                    }
-                }
-             return true;
-            }
-
-        // This used in a link or href will take you back in the history.
-        if (!(cmd.CmpNoCase("?BACK"))){
-            HistoryBack();
-            return true;
-            }
-
-        // This used in a link or href will take you forward in the history
-        if (!(cmd.CmpNoCase("?FORWARD"))){
-            HistoryForward();
-            return true;
-            }
-        }
-
-    // Inform all the applets that the new page is being loaded
-    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-        (node->GetData())->OnLinkClicked(wxHtmlLinkInfo(href));
-    Show(false);
-
-    m_openedlast = href;
-    bool stat = wxHtmlWindow::LoadPage(href);
-    Show(true);
-
-    // Enable/Dis the navbar tools
-    if (m_NavBarEnabled) {
-        m_NavBar->EnableTool(m_NavForwardId,HistoryCanForward());
-        m_NavBar->EnableTool(m_NavBackId,HistoryCanBack());
-        }
-    return stat;
-}
-
-/****************************************************************************
-PARAMETERS:
-URL - String URL that we are navigating to
-
-REMARKS:
-Called when the user navigates to a new URL from the current page. We simply
-call the LoadPage function above to load the new page and display it.
-****************************************************************************/
-void wxHtmlAppletWindow::OnLinkClicked(
-    const wxHtmlLinkInfo& link)
-{
-    LoadPage(link.GetHref());
-}
-
-/****************************************************************************
-REMARKS:
-Called when the user navigates forward within the HTML history stack.
-We call all the applets in turn allowing them to handle the navigation
-command prior to being destructed when the current page is destroyed.
-****************************************************************************/
-bool wxHtmlAppletWindow::HistoryForward()
-{
-    if (!HistoryCanForward())
-        return false;
-
-    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-        (node->GetData())->OnHistoryForward();
-
-    return wxHtmlWindow::HistoryForward();
-}
-
-/****************************************************************************
-REMARKS:
-Called when the user navigates backwards within the HTML history stack.
-We call all the applets in turn allowing them to handle the navigation
-command prior to being destructed when the current page is destroyed.
-****************************************************************************/
-bool wxHtmlAppletWindow::HistoryBack()
-{
-    if (!HistoryCanBack())
-        return false;
-
-    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-        (node->GetData())->OnHistoryBack();
-
-    return wxHtmlWindow::HistoryBack();
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to disable the navigation bars. If you want to
-toggle to the navbars off you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::DisableNavBar()
-{
-    m_NavBarEnabled = false;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to enable the nav bars. If you toggle the nav bars on
-you must call this function.
-****************************************************************************/
-void wxHtmlAppletWindow::EnableNavBar()
-{
-    m_NavBarEnabled = true;
-}
-
-/****************************************************************************
-REMARKS:
-This function is used to set the nav bar to a new nav bar if you deleted the
-one that you were useing. Usally this happens when you toggle a nav bar
-on or off.
-****************************************************************************/
-void wxHtmlAppletWindow::SetNavBar(wxToolBarBase *navBar)
-{
-    m_NavBar = navBar;
-}
-
-/****************************************************************************
-PARAMETERS:
-msg - wxEvent message to be sent to all wxApplets
-
-REMARKS:
-This function is called by the wxApplet's when they need to send a message
-to all other applets on the current page. This is the primary form of
-communication between applets on the page if they need to inform each
-other of internal information.
-
-****************************************************************************/
-void wxHtmlAppletWindow::SendAppletMessage(
-    wxAppletEvent& msg)
-{
-    // TODO: make a named target for messages, only send a message to the correct
-    // named applet
-
-    // Process all applets in turn and send them the message
-    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
-        (node->GetData())->OnMessage(msg);
-        }
-}
-
-/****************************************************************************
-PARAMETERS:
-name    - Uniq wxString used as hash key
-cookie  - wxObject data returned when name is found.
-
-RETURNS:
-True if new cookie was added, false if cookie with same name already exists.
-
-REMARKS:
-This function is called by the wxApplet's when they need register a cookie
-of data in the applet window's cookie table. Cookies are arbitrary data
-objects that are references by unique name's by the wxApplet. These
-values can be used to store and retrieve data that needs to remain
-persisent across invocations of the wxApplet. Ie: The first time an
-applet is created it would use the cookie to store data to maintain
-it's present state so that if you navigated back to the same page
-is would be able to re-load the prior state as though the applet
-was never actually destructed.
-
-Note: If a cookie with the same name already exists, this function returns
-      false. Hence if you wish to replace a cookie you should first call
-      UnRegisterCookie to ensure the cookie is deleted and then call this
-      function.
-****************************************************************************/
-bool wxHtmlAppletWindow::RegisterCookie(
-    const wxString& name,
-    wxObject *cookie)
-{
-    // Fail if the named cookie already exists!
-    if (m_Cookies.Get(name))
-        return false;
-    m_Cookies.Put(name,cookie);
-    return true;
-}
-
-/****************************************************************************
-PARAMETERS:
-name - wxString uniq haskey used to remove item from hash
-
-RETURNS:
-True if found and deleted, false if not found in table.
-
-REMARKS:
-This function is called by the wxApplet's when they need de-register a
-cookie of data in the applet window's cookie table. The data in the
-cookie itself is also deleted before it is removed from the table.
-****************************************************************************/
-bool wxHtmlAppletWindow::UnRegisterCookie(
-    const wxString& name)
-{
-    wxObject *data = m_Cookies.Delete(name);
-    if (data) {
-        delete data;
-        return true;
-        }
-    return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-msg - wxEvent message to be sent to all wxApplets
-
-RETURNS:
-Pointer to the cookie data if found, NULL if not found.
-
-REMARKS:
-This function is called by the wxApplet's when they need to find a cookie
-of data given it's public name. If the cookie is not found, NULL is
-returned.
-****************************************************************************/
-wxObject *wxHtmlAppletWindow::FindCookie(
-    const wxString& name)
-{
-    return m_Cookies.Get(name);
-}
-
-/****************************************************************************
-PARAMETERS:
-event   - Event to handle
-
-REMARKS:
-This function handles delayed LoadPage events posted from applets that
-need to change the page for the current window to a new window.
-****************************************************************************/
-void wxHtmlAppletWindow::OnLoadPage(
-    wxLoadPageEvent &event)
-{
-    // Test the mutex lock.
-    if (!(IsLocked())) {
-        Lock();
-        if (event.GetHtmlWindow() == this) {
-            if (LoadPage(event.GetHRef())) {
-                // wxPageLoadedEvent evt;
-                // NOTE: This is reserved for later use as we might need to send
-                // page loaded events to applets.
-                }
-            }
-        UnLock();
-        }
-}
-
-/****************************************************************************
-PARAMETERS:
-event   - Event to handle
-
-REMARKS:
-This function handles delayed LoadPage events posted from applets that
-need to change the page for the current window to a new window.
-****************************************************************************/
-void wxHtmlAppletWindow::OnPageLoaded(
-    wxPageLoadedEvent &)
-{
-    Enable(true);
-}
-
-/****************************************************************************
-PARAMETERS:
-none
-
-REMARKS:
-This function tries to lock the mutex. If it can't, returns
-immediately with false.
-***************************************************************************/
-bool wxHtmlAppletWindow::TryLock()
-{
-    if (!m_mutexLock) {
-        m_mutexLock = true;
-        return true;
-        }
-    return false;
-}
-
-/****************************************************************************
-PARAMETERS:
-name    - name of the last applet that changed the data in this object
-group   - name of the group the allplet belongs to.
-href    - webpage to go to.
-
-REMARKS:
-VirtualData is used to store information on the virtual links.
-****************************************************************************/
-VirtualData::VirtualData(
-    wxString& name,
-    wxString& group,
-    wxString& href,
-    wxString& plugin )
-{
-    m_name = name;
-    m_group = group;
-    m_href = href;
-    m_plugIn = plugin;
-}
-
-/****************************************************************************
-PARAMETERS:
-REMARKS:
-VirtualData is used to store information on the virtual links.
-****************************************************************************/
-VirtualData::VirtualData()
-{
-    m_name.Empty();
-    m_group.Empty();
-    m_href.Empty();
-}
-
-#include "wx/html/m_templ.h"
-
-/****************************************************************************
-REMARKS:
-Implementation for the <embed> HTML tag handler. This handler takes care
-of automatically constructing the wxApplet objects of the appropriate
-class based on the <embed> tag information.
-****************************************************************************/
-TAG_HANDLER_BEGIN(wxApplet, "WXAPPLET")
-
-TAG_HANDLER_PROC(tag)
-{
-	wxWindow			*wnd;
-	wxHtmlAppletWindow	*appletWindow;
-	wxApplet			*applet;
-    wxString            classId;
-    wxString            name;
-    int 				width, height;
-
-    // Get access to our wxHtmlAppletWindow class
-	wnd = m_WParser->GetWindow();
-	if ((appletWindow = wxDynamicCast(wnd,wxHtmlAppletWindow)) == NULL)
-        return false;
-
-    // Parse the applet dimensions from the tag
-    wxSize size = wxDefaultSize;
-    int al;
-    if (tag.HasParam("WIDTH")) {
-        tag.GetParamAsInt("WIDTH", &width);
-        size.SetWidth(width);
-        }
-    if (tag.HasParam("HEIGHT")) {
-        tag.GetParamAsInt("HEIGHT", &height);
-        size.SetHeight(height);
-        }
-
-    // Parse the applet alignment from the tag
-    al = wxHTML_ALIGN_BOTTOM;
-    if (tag.HasParam(wxT("ALIGN"))) {
-        wxString alstr = tag.GetParam(wxT("ALIGN"));
-        alstr.MakeUpper();  // for the case alignment was in ".."
-        if (alstr == wxT("TEXTTOP") || alstr == wxT("TOP"))
-            al = wxHTML_ALIGN_TOP;
-        else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER")))
-            al = wxHTML_ALIGN_CENTER;
-        }
-
-    // Create the applet based on it's class
-    if (tag.HasParam("CLASSID")) {
-        classId = tag.GetParam("CLASSID");
-        if (classId.IsNull() || classId.Len() == 0) {
-            wxMessageBox("wxApplet tag error: CLASSID is NULL or empty.","Error",wxICON_ERROR);
-            return false;
-            }
-        if (tag.HasParam("NAME"))
-            name = tag.GetParam("NAME");
-
-        // If the name is NULL or len is zero then we assume that the html guy
-        // didn't include the name param which is optional.
-        if (name.IsNull() || name.Len() == 0)
-            name = classId;
-
-        // We got all the params and can now create the applet
-        if ((applet = appletWindow->CreateApplet(classId, name, tag , size)) != NULL) {
-            applet->Show(true);
-            m_WParser->OpenContainer()->InsertCell(new wxHtmlAppletCell(applet,al));
-            }
-        else
-            wxMessageBox("wxApplet error: Could not create:" + classId + "," + name);
-        }
-    else {
-        wxMessageBox("wxApplet tag error: Can not find CLASSID param.","Error",wxICON_ERROR);
-        return false;
-        }
-
-    // Add more param parsing here. If or when spec changes.
-    // For now we'll ignore any other params those HTML guys
-    // might put in our tag.
-	return true;
-}
-
-TAG_HANDLER_END(wxApplet)
-
-TAGS_MODULE_BEGIN(wxApplet)
-    TAGS_MODULE_ADD(wxApplet)
-TAGS_MODULE_END(wxApplet)
-
-/****************************************************************************
-REMARKS:
-Constructor for the HTML cell class to store our wxApplet windows in
-the HTML page to be rendered by wxHTML.
-****************************************************************************/
-wxHtmlAppletCell::wxHtmlAppletCell(
-    wxWindow *wnd,
-    int align)
-    : wxHtmlCell()
-{
-    int sx, sy;
-    m_Wnd = wnd;
-    m_Wnd->GetSize(&sx, &sy);
-    m_Width = sx, m_Height = sy;
-    switch (align) {
-        case wxHTML_ALIGN_TOP :
-            m_Descent = m_Height;
-            break;
-        case wxHTML_ALIGN_CENTER :
-            m_Descent = m_Height / 2;
-            break;
-        case wxHTML_ALIGN_BOTTOM :
-        default :
-            m_Descent = 0;
-            break;
-        }
-    SetCanLiveOnPagebreak(FALSE);
-}
-
-/****************************************************************************
-REMARKS:
-Implementation for the HTML cell class to store our wxApplet windows in
-the HTML page to be rendered by wxHTML.
-****************************************************************************/
-wxHtmlAppletCell::~wxHtmlAppletCell()
-{
-    delete m_Wnd;
-}
-
-/****************************************************************************
-REMARKS:
-Code to draw the html applet cell
-****************************************************************************/
-void wxHtmlAppletCell::Draw(
-    wxDC& WXUNUSED(dc),
-    int WXUNUSED(x),
-    int WXUNUSED(y),
-    int WXUNUSED(view_y1),
-    int WXUNUSED(view_y2))
-{
-    int         absx = 0, absy = 0, stx, sty;
-    wxHtmlCell  *c = this;
-
-    while (c) {
-        absx += c->GetPosX();
-        absy += c->GetPosY();
-        c = c->GetParent();
-        }
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
-    m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty);
-}
-
-/****************************************************************************
-REMARKS:
-Code to draw the html applet cell invisibly
-****************************************************************************/
-void wxHtmlAppletCell::DrawInvisible(
-    wxDC& WXUNUSED(dc),
-    int WXUNUSED(x),
-    int WXUNUSED(y))
-{
-    int         absx = 0, absy = 0, stx, sty;
-    wxHtmlCell  *c = this;
-
-    while (c) {
-        absx += c->GetPosX();
-        absy += c->GetPosY();
-        c = c->GetParent();
-        }
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
-    m_Wnd->Move(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty);
-}
-
-/****************************************************************************
-REMARKS:
-Code to layout the html applet cell.
-****************************************************************************/
-void wxHtmlAppletCell::Layout(
-    int w)
-{
-    int sx, sy;
-    m_Wnd->GetSize(&sx, &sy);
-    m_Width = sx, m_Height = sy;
-    wxHtmlCell::Layout(w);
-}
-
-// This is our little forcelink hack.
-FORCE_LINK(loadpage)
-
diff --git a/contrib/src/applet/echovar.cpp b/contrib/src/applet/echovar.cpp
deleted file mode 100644
index 3da0f23d45..0000000000
--- a/contrib/src/applet/echovar.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Implementation of wxEchoVariable Class, Dynamically constructed
-* objects representing variables in SSI #echo directive
-*
-****************************************************************************/
-
-// For compilers that support precompilation
-
-#include "wx/applet/echovar.h"
-#include "wx/msgdlg.h"
-#include "wx/html/forcelnk.h"
-
-// Include private headers
-
-/*---------------------------- Global variables ---------------------------*/
-
-static wxEchoVariable   *wxEchoVariable::sm_first = NULL;
-static wxHashTable      *wxEchoVariable::sm_varTable = NULL;
-
-/*----------------------------- Implementation ----------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-varName         - The String name of the class
-getValueFn      - Pointer to the function that returns the echo variable value
-
-REMARKS:
-Constructor for the wxEchoVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxEchoVariable::wxEchoVariable(
-    const char *varName,
-    wxEchoVariableGetValueFn getValueFn)
-{
-    m_varName = varName;
-    m_getValueFn = getValueFn;
-    m_next = sm_first;
-    sm_first = this;
-}
-
-/****************************************************************************
-REMARKS:
-Initializes parent pointers and hash table for fast searching for echo
-variables.
-****************************************************************************/
-void wxEchoVariable::Initialize()
-{
-    wxEchoVariable::sm_varTable = new wxHashTable(wxKEY_STRING);
-
-    // Index all class infos by their class name
-    wxEchoVariable *info = sm_first;
-    while (info) {
-        if (info->m_varName)
-            sm_varTable->Put(info->m_varName, info);
-        info = info->m_next;
-        }
-}
-
-/****************************************************************************
-REMARKS:
-Clean up echo variable hash tables on application exit.
-****************************************************************************/
-void wxEchoVariable::CleanUp()
-{
-    delete wxEchoVariable::sm_varTable;
-    wxEchoVariable::sm_varTable = NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName         - The String name of the class
-parms           - Parameter string for the echo variable
-
-REMARKS:
-Constructor for the wxEchoVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxString wxEchoVariable::GetValue(
-    const wxChar *varName,
-    const wxChar *parms)
-{
-    wxEchoVariable *info = wxEchoVariable::FindVariable(varName);
-    if (info)
-        return info->m_getValueFn(parms);
-#ifdef CHECKED		
-    wxMessageBox(wxString("wxHTML #echo error: Class is not a valid echo variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif		
-    return wxString("");
-}
-
-/****************************************************************************
-PARAMETERS:
-varName       - The String name of the class
-
-RETURNS:
-True if the echo variable exists, false if not.
-****************************************************************************/
-bool wxEchoVariable::Exists(
-    const wxChar *varName)
-{
-    return wxEchoVariable::FindVariable(varName) != NULL;
-}
-
-/*------------------------ Macro Documentation ---------------------------*/
-
-// Here we declare some fake functions to get doc-jet to properly document the macros
-
-#undef ECHO_PARM
-/****************************************************************************
-RETURNS:
-The value of the parameter string from the HTML parm= field
-
-REMARKS:
-This is a macro to retrieve the parameter string passed in the parm= field.
-Use this macro to get the correct variable within a BEGIN_ECHO_VARIABLE and
-END_ECHO_VARIABLE block.
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-****************************************************************************/
-wxString ECHO_PARM();
-
-
-#undef BEGIN_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name    - The name of the variable to create
-
-REMARKS:
-This macro is used to create variables for use by the #echo directive
-the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros.
-Use the ECHO_PARM macro to grab the optional parameter string passed from the
-'parm=' field in the html file.
-
-EXAMPLE:
-BEGIN_ECHO_VARIABLE(UserName)
-	// Get username from nucleus
-	wxString tmp = GA_GetUserName();
-END_ECHO_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, END_ECHO_VARIABLE, ECHO_PARM, STRING_ECHO_VARIABLE
-****************************************************************************/
-void BEGIN_ECHO_VARIABLE(
-    const char *name);
-
-#undef END_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name        - The name of the variable to end
-returnval   - The value which should be sent back as the value of the variable
-
-REMARKS:
-This macro is used to create variables for use by the #echo directive
-the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_ECHO_VARIABLE and END_ECHO_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_ECHO_VARIABLE(UserName)
-	// Get username from nucleus
-	wxString tmp = GA_GetUserName();
-END_ECHO_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, ECHO_PARM, STRING_ECHO_VARIABLE
-****************************************************************************/
-void END_ECHO_VARIABLE(
-    const char *name,
-    wxString returnval);
-
-#undef STRING_ECHO_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name        - The name of the variable
-returnval   - String to return as the value of the variable
-
-REMARKS:
-This macro is used to create constant string variables for use by the #echo
-directive in the HTML preprocessor.
-This MACRO creates a variable that simply returns the given string and is
-not modifiable.
-
-SEE ALSO:
-wxEchoVariable, wxEchoPrep, BEGIN_ECHO_VARIABLE, END_ECHO_VARIABLE
-****************************************************************************/
-void STRING_ECHO_VARIABLE(
-    const char *name,
-    wxString string);
-
-// hack to make this file link
-FORCE_LINK_ME(echovar)
-
diff --git a/contrib/src/applet/ifelsevar.cpp b/contrib/src/applet/ifelsevar.cpp
deleted file mode 100644
index e7280b23fe..0000000000
--- a/contrib/src/applet/ifelsevar.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  Implementation of wxIfElseVariable Class, Dynamically constructed
-* objects representing variables in SSI #if, #else, and #endif directives
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/ifelsevar.h"
-
-// wxWindows forcelink macro
-#include "wx/html/forcelnk.h"
-#include "wx/msgdlg.h"
-
-/*---------------------------- Global variables ---------------------------*/
-
-static wxIfElseVariable *wxIfElseVariable::sm_first = NULL;
-static wxHashTable      *wxIfElseVariable::sm_varTable = NULL;
-
-/*----------------------------- Implementation ----------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-varName         - The String name of the class
-getValueFn      - Pointer to the function that returns the echo variable value
-
-REMARKS:
-Constructor for the wxIfElseVariable class that self registers itself with
-the list of all echo variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-wxIfElseVariable::wxIfElseVariable(
-    const char *varName,
-    wxIfElseVariableGetValueFn getValueFn)
-{
-    m_varName = varName;
-    m_getValueFn = getValueFn;
-    m_next = sm_first;
-    sm_first = this;
-}
-
-/****************************************************************************
-REMARKS:
-Initializes parent pointers and hash table for fast searching for echo
-variables.
-****************************************************************************/
-void wxIfElseVariable::Initialize()
-{
-    wxIfElseVariable::sm_varTable = new wxHashTable(wxKEY_STRING);
-
-    // Index all class infos by their class name
-    wxIfElseVariable *info = sm_first;
-    while (info) {
-        if (info->m_varName)
-            sm_varTable->Put(info->m_varName, info);
-        info = info->m_next;
-        }
-}
-
-/****************************************************************************
-REMARKS:
-Clean up echo variable hash tables on application exit.
-****************************************************************************/
-void wxIfElseVariable::CleanUp()
-{
-    delete wxIfElseVariable::sm_varTable;
-    wxIfElseVariable::sm_varTable = NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName       - The String name of the class
-
-REMARKS:
-Constructor for the wxIfElseVariable class that self registers itself with
-the list of all ifelse variables when the static class instance is created
-at program init time (remember all the constructors get called before
-the main program function!).
-****************************************************************************/
-bool wxIfElseVariable::GetValue(
-    const wxChar *varName)
-{
-    wxIfElseVariable *info = wxIfElseVariable::FindVariable(varName);
-    if (info) {
-        // Return the forced value if the variable has been forced.
-        if (info->forced)
-            return info->forceVal;
-        return info->m_getValueFn();
-        }
-#ifdef CHECKED		
-    wxMessageBox(wxString("wxHTML #if error: Class is not a valid if else variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif		
-    return wxString("");
-}
-
-/****************************************************************************
-PARAMETERS:
-varName       - The String name of the class
-
-RETURNS:
-True if the if/else variable exists, false if not.
-****************************************************************************/
-bool wxIfElseVariable::Exists(
-    const wxChar *varName)
-{
-    return wxIfElseVariable::FindVariable(varName) != NULL;
-}
-
-/****************************************************************************
-PARAMETERS:
-varName     - The String name of the class
-val         - Value to force the if/else variable with
-
-REMARKS:
-Function to forcibly override the value of an if/else variable for
-testing purposes. Once the variable has been forced, it will always return
-the forced value until the application exists.
-
-NOTE:   This is only available when compiled in CHECKED mode.
-****************************************************************************/
-void wxIfElseVariable::Force(
-    const wxChar *varName,
-    bool val)
-{
-    wxIfElseVariable *info = wxIfElseVariable::FindVariable(varName);
-    if (info) {
-        info->forced = true;
-        info->forceVal = val;
-        }
-    else {
-#ifdef CHECKED		
-        wxMessageBox(wxString("wxHTML #if error: Class is not a valid if else variable (") + varName + wxString(")."),"Error",wxICON_ERROR);
-#endif
-        }		
-}
-
-/*------------------------ Macro Documentation ---------------------------*/
-
-// Here we declare some fake functions to get doc-jet to properly document the macros
-
-#undef BEGIN_IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name    - The name of the variable to create
-
-REMARKS:
-This macro is used to create variables for use by the #if, #else and #endif
-blocks in the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_IFELSE_VARIABLE(UserName)
-	// Get username from nucleus
-	bool tmp = GA_HasRegistered();
-END_IFELSE_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, END_IFELSE_VARIABLE, IFELSE_VARIABLE
-****************************************************************************/
-void BEGIN_IFELSE_VARIABLE(
-    const char *name);
-
-#undef END_IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name        - The name of the variable to end
-returnval   - The boolean value which is the value of the variable
-
-REMARKS:
-This macro is used to create variables for use by the #if, #else and #endif
-blocks in the HTML preprocessor.
-To create a new variable include the code necessary to get the value of the
-variable between a block of BEGIN_IFELSE_VARIABLE and END_IFELSE_VARIABLE macros.
-
-EXAMPLE:
-BEGIN_IFELSE_VARIABLE(UserName)
-	// Get username from nucleus
-	bool tmp = GA_HasRegistered();
-END_IFELSE_VARIABLE(UserName, tmp)
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, BEGIN_IFELSE_VARIABLE, IFELSE_VARIABLE
-****************************************************************************/
-void END_IFELSE_VARIABLE(
-    const char *name,
-    bool returnval);
-
-#undef IFELSE_VARIABLE
-/****************************************************************************
-PARAMETERS:
-name        - The name of the variable
-state       - value of the variable
-
-REMARKS:
-This macro is used to create constant boolean variables for use by the
-#if, #else and #endif blocks in the HTML preprocessor.
-This MACRO creates a variable that simply returns the given state and is
-not modifiable.
-
-SEE ALSO:
-wxIfElseVariable, wxIfElsePrep, BEGIN_IFELSE_VARIABLE, END_IFELSE_VARIABLE
-****************************************************************************/
-void IFELSE_VARIABLE(
-    const char *name,
-    bool state);
-
-FORCE_LINK_ME(ifelsevar)
-
diff --git a/contrib/src/applet/loadpage.cpp b/contrib/src/applet/loadpage.cpp
deleted file mode 100644
index c743228e8c..0000000000
--- a/contrib/src/applet/loadpage.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Loadpage event class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/loadpage.h"
-
-// wxWindows forcelink macro
-#include "wx/html/forcelnk.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Implement the class functions for wxLoadPageEvent
-IMPLEMENT_DYNAMIC_CLASS(wxLoadPageEvent, wxEvent)
-
-// Implement the class functions for wxPageLoadedEvent
-IMPLEMENT_DYNAMIC_CLASS(wxPageLoadedEvent, wxEvent)
-
-// Define our custom event ID for load page
-DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE)
-
-// Define our custom event ID for page loaded
-DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED)
-
-/****************************************************************************
-REMARKS:
-Constructor for the wxLoadPageEvent class
-****************************************************************************/
-wxLoadPageEvent::wxLoadPageEvent(
-    const wxString &hRef,
-    wxHtmlAppletWindow *htmlWindow)
-    : m_hRef(hRef), m_htmlWindow(htmlWindow)
-{
-    m_eventType = wxEVT_LOAD_PAGE;
-}
-
-/****************************************************************************
-REMARKS:
-Constructor for the wxPageLoadedEvent class
-****************************************************************************/
-wxPageLoadedEvent::wxPageLoadedEvent()
-{
-    m_eventType = wxEVT_LOAD_PAGE;
-}
-
-// This is out little force link hack
-FORCE_LINK_ME(loadpage)
-
diff --git a/contrib/src/applet/makefile b/contrib/src/applet/makefile
deleted file mode 100644
index f67ebbd821..0000000000
--- a/contrib/src/applet/makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#############################################################################
-#
-#                   Copyright (C) 1999 SciTech Software
-#                           All rights reserved.
-#
-# Description:   Generic makefile for the SciTech wxApplet library
-# License:       wxWindows license
-#
-#############################################################################
-
-# We are building with the Win32 version
-
-USE_RTTI		:= 1
-USE_CPPEXCEPT	:= 1
-PRECOMP_HDR		:= wx/wxprec.h
-CFLAGS          += -D__WIN95__ -D__WXMSW__ -D__WINDOWS__
-
-# Link with wxWindows static link libraries or with the DLL. DLL is default.
-
-.IF $(STATIC_LINK)
-.ELSE
-CFLAGS          += -DWXUSINGDLL
-.ENDIF
-
-# Define the library name and objects
-
-LIBFILE         = wxapplet$L
-LIBCLEAN        = *.il? *.dll *.lib
-OBJECTS			:= applet$O appletwindow$O
-
-DEPEND_OBJ      = $(OBJECTS)
-.INCLUDE: "$(SCITECH)\makedefs\common.mk"
-
diff --git a/contrib/src/applet/plugin.cpp b/contrib/src/applet/plugin.cpp
deleted file mode 100644
index 2e67780b98..0000000000
--- a/contrib/src/applet/plugin.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:     ANSI C++
-* Environment:  Any
-*
-* Description:  Main wxPlugIn class implementation
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/plugin.h"
-#include "wx/applet/window.h"
-
-/*------------------------- Implementation --------------------------------*/
-
-// Implement the abstract class functions
-IMPLEMENT_ABSTRACT_CLASS(wxPlugIn, wxEvtHandler);
-
-/****************************************************************************
-REMARKS:
-Psuedo virtual constructor for the wxPlugIn class.
-****************************************************************************/
-bool wxPlugIn::Create(
-    wxHtmlAppletWindow *parent)
-{
-    m_parent = parent;
-    return true;
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxPlugIn class.
-****************************************************************************/
-wxPlugIn::~wxPlugIn()
-{
-}
-
-/****************************************************************************
-REMARKS:
-Destructor for the wxPlugIn class.
-****************************************************************************/
-void wxPlugIn::Run(
-    const wxString& WXUNUSED(cmdLine))
-{
-}
-
diff --git a/contrib/src/applet/prepecho.cpp b/contrib/src/applet/prepecho.cpp
deleted file mode 100644
index 8181077116..0000000000
--- a/contrib/src/applet/prepecho.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  This file is the implementation of the Preprocessor object
-*               for parsing the <!--#echo directive
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/prepecho.h"
-#include "wx/applet/echovar.h"
-
-// Force Link macro
-#include "wx/html/forcelnk.h"
-
-// wxWindows headers
-#include "wx/msgdlg.h"
-
-/*----------------------------- Implementation ----------------------------*/
-
-/****************************************************************************
-PARAMETERS:
-text        - HTML to process for echo directives
-
-RETURNS:
-The string containing the processed HTML
-
-REMARKS:
-This function replaces #echo directives with a variable retrieved from the
-class given in the HTML directive. These classes are created by making a sub
-class of wxEchoVariable. Dynamic class construction is used at run time
-internally to create an instance of this class and access the value of the
-variable.
-
-SEE ALSO:
-wxEchoVariable
-****************************************************************************/
-wxString wxEchoPrep::Process(
-    const wxString& text) const
-{
-	int i;
-	char ft[] = "<!--#echo ";
-	
-	// make a copy so we can replace text as we go without affecting the original
-	wxString output = text;
-	
-	while ((i = (output.Lower()).Find(ft)) != -1) {
-		// Loop until every #echo directive is found
-		int n, c, end;
-        wxString cname, parms;
-        wxString tag;
-
-        // grab the tag and remove it from the file
-        end = (output.Mid(i)).Find("-->");
-        if (end == -1) {
-#ifdef CHECKED		
-            wxMessageBox("wxHTML #echo error: Premature end of file while parsing #echo.","Error",wxICON_ERROR);
-#endif
-            break;
-			}
-
-        end += 3;
-        tag = output.Mid(i, end);
-        output.Remove(i, end);
-
-        n = (tag.Lower()).Find(" parm=");
-        c = tag.Find("-->");
-        if (n == -1) {
-            n = c;
-            // find the classname
-            c = (tag.Mid(10, n-10)).Find(" ");
-	    	if (c == -1) n -= 10;
-            else n = c;
-            cname = tag.Mid(10, n);
-
-            // grab the value from the class, put it in tag since the data is no longer needed
-            tag = wxEchoVariable::GetValue(cname, NULL);
-            }
-        else {
-            // Find the parms
-            parms = tag.Mid(n+6, c-n-6);
-      		// Clip off any quotation marks if they exist. (don't die if there arn't any)
-           	c = parms.Find("\"");
-            if (c != -1) parms = parms.Mid(c+1);
-    		c = parms.Find("\"");
-	    	if (c != -1) parms = parms.Mid(0, c);
-            // find the classname
-            c = (tag.Mid(10, n-10)).Find(" ");
-	    	if (c == -1) n -= 10;
-            else n = c;
-            cname = tag.Mid(10, n);
-
-            // grab the value from the class, put it in tag since the data is no longer needed
-            tag = wxEchoVariable::GetValue(cname, parms.c_str());
-            }
-        // remove ampersands and <> chars
-        tag.Replace("&", "&amp;");
-        tag.Replace("<", "&lt;");
-        tag.Replace(">", "&gt;");
-
-        output = (output.Mid(0,i) + tag + output.Mid(i));
-		}
-    return output;
-}
-
-FORCE_LINK(echovar)
-			
diff --git a/contrib/src/applet/prepifelse.cpp b/contrib/src/applet/prepifelse.cpp
deleted file mode 100644
index 0724dae644..0000000000
--- a/contrib/src/applet/prepifelse.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  This file is the implementation of the Preprocessor object
-*               for parsing the <!--#if directive
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/prepifelse.h"
-#include "wx/applet/ifelsevar.h"
-#include "wx/applet/echovar.h"
-#include "wx/string.h"
-
-// Force link macro
-#include "wx/html/forcelnk.h"
-// wxWindows
-#include "wx/msgdlg.h"
-
-/*----------------------------- Implementation ----------------------------*/
-
-/* {SECRET} */
-/****************************************************************************
-REMARKS:
-None of the Reverse Find functions in wxWindows appear to work in a way that
-can be used by our code. This includes the libstr rfind implementations which
-do not correctly pass the given return value.
-****************************************************************************/
-int ReverseFind(
-    const wxString &tstr,
-    const wxString &str,
-    int start = -1)
-{
-    wxASSERT( str.GetStringData()->IsValid() );
-
-    // TODO could be made much quicker than that
-    int p = tstr.Len()-str.Len()-1;
-    int p2 = start-str.Len();
-
-    // if the user supplied a valid start point, use it
-    if (start != -1 && p > p2) p = p2;
-    while ( p >= 0 ) {
-        if ( wxStrncmp(tstr.c_str() + p, str.c_str(), str.Len()) == 0 )
-            return p;
-        p--;
-        }
-    return -1;
-}
-
-/* {SECRET} */
-/****************************************************************************
-REMARKS:
-tells if a character is a letter.
-replace this when wxWindows gets regex library. (without strange licensing
-restrictions)
-****************************************************************************/
-bool IsLetter(
-    char c, bool acceptspace = false)
-{
-    if (acceptspace && (c == ' ')) return true;
-    if (c >= '0' && c <= '9') return true;
-    return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || c == '\"' || c == '\'' );
-}
-
-#define IsQuote(c) (c == '\'' || c == '\"')
-
-/* {SECRET} */
-/****************************************************************************
-REMARKS:
-tells if a character is a letter.
-replace this when wxWindows gets regex library. (without strange licensing
-restrictions)
-****************************************************************************/
-wxString GetEquals(
-    wxString var,
-    wxString value)
-{
-    if (!wxEchoVariable::Exists(var)) {
-        // TODO: when we implement the set variable, check for a set variable as well
-        #ifdef CHECKED		
-            wxMessageBox(wxString("wxHTML #if\\else error: Variable ") + var + wxString(" not found."),"Error",wxICON_ERROR);
-        #endif
-        return wxString("0"); // false
-        }
-
-    wxString tmp = wxEchoVariable::GetValue(var);
-
-    if (IsQuote( value.GetChar(0) ))
-        value = value.Mid(1);
-    if (IsQuote(value.GetChar(value.Length()-1)))
-        value = value.Mid(0,value.Length()-1);
-
-    if (tmp.CmpNoCase(value) == 0) return wxString("1");
-    return wxString("0");
-}
-
-/****************************************************************************
-PARAMETERS:
-str        - text of #if statement
-
-RETURNS:
-true or false depending on how it evaluated
-
-REMARKS:
-TODO: rewrite this whole thing using regular expressions when they are done.
-
-SEE ALSO:
-wxIfElseVariable
-****************************************************************************/
-bool ParseIfStatementValue(
-    wxString &str)
-{
-    // Find out if the tag has parenthesis
-    // recursive to parse the text within the parenthesis,
-    // replacing the text with 1 or 0, (hardcoded true or false)
-    int b;
-    while ((b = str.Find('(')) != -1) {
-        int e;
-        // Find the matching parenthesis
-        int nextbeg, nextend;
-        int parencount = 1, min = b+1;
-        do {
-            nextbeg = str.find('(', min);
-            nextend = str.find(')', min);
-            if (nextbeg < nextend && nextbeg != wxString::npos) {
-                parencount++;
-                min = nextbeg+1;
-                }
-            else {
-                parencount--;
-                min = nextend+1;
-                }
-
-            if (nextend == wxString::npos) {
-#ifdef CHECKED		
-                wxMessageBox("wxHTML #if\\else error: Unmatched parenthesis in #if expression.","Error",wxICON_ERROR);
-#endif
-                return true;
-                }
-            // once parencount reaches 0 again we have found our matchin )
-            } while (parencount > 0);
-
-        e = nextend;
-
-        // Extract the expression from the parenthesis block and recurse
-        // to solve it.
-        wxString tag;
-        tag = str.Mid(b+1, e-b-1);
-        bool val = ParseIfStatementValue(tag);
-        // Add extra spaces just in case of NOT(VAL)
-        if (val) str = str.Mid(0, b) + " 1" + str.Mid(e+1);
-        else str = str.Mid(0, b) + " 0" + str.Mid(e+1);
-        }
-
-    // Remove spaces from left and right
-    str.Trim(false);
-    str.Trim(true);
-
-    // Convert text method of operators "AND" and "OR" to c style
-    // this makes only one special case necessary for each later on
-    str.Replace(" AND ", "&&");
-    str.Replace(" OR ", "||");
-    str.Replace(" EQUALS ", "==");
-
-    // Check for equals statements
-    // == statements are special because they are evaluated as a single block
-    int equ;
-    equ = str.find("==");
-    while (equ != wxString::npos) {
-        int begin, end;
-        int begin2, end2; // ends of words
-        begin = equ-1;
-        end = equ+2;
-
-        // remove spaces, find extents
-        while (end < str.Length() && str.GetChar(end) == ' ')
-            end++;
-        while (begin >= 0 && str.GetChar(begin) == ' ')
-            begin--;
-        end2 = end;
-        begin2 = begin;
-        if (str.GetChar(end2) == '\'' || str.GetChar(end2) == '\"') {
-            end2++;
-            while (end2 < str.Length() && str.GetChar(end2) != '\'' && str.GetChar(end2) != '\"' )
-                end2++;
-            end2++;
-            }
-        else {
-            while (end2 < str.Length() && IsLetter(str.GetChar(end2)))
-                end2++;
-            }
-        while (begin >= 0 && IsLetter(str.GetChar(begin)))
-            begin--;
-
-        if (begin < 0) begin = 0;
-        else begin++;
-        if (end2 >= str.Length()) end2 = str.Length();
-
-        wxString tmpeq = GetEquals(str.Mid(begin, begin2-begin+1), str.Mid(end, end2-end));
-        str = str.Mid(0, begin) + wxString(" ") + tmpeq + wxString(" ") +
-            str.Mid(end2);
-        equ = str.find("==");
-
-        // Remove spaces from left and right
-        str.Trim(false);
-        str.Trim(true);
-        }
-
-    // We use ReverseFind so that the whole left expression gets evaluated agains
-    // the right single item, creating a left -> right evaluation
-    // Search for || operators, recurse to solve (so we don't have to handle special cases here)
-    int and, or;
-    and = ReverseFind(str, "&&");
-    or = ReverseFind(str, "||");
-    if ( (and != -1) || (or != -1) ) {
-        wxString tag1, tag2;
-        // handle the rightmost first to force left->right evaluation
-        if ( (and > or) ) {
-            return (
-                ParseIfStatementValue(tag2 = str.Mid(and+2)) &&
-                ParseIfStatementValue(tag1 = str.Mid(0, and)) );
-            }
-        else {
-            return (
-                ParseIfStatementValue(tag2 = str.Mid(or+2)) ||
-                ParseIfStatementValue(tag1 = str.Mid(0, or)) );
-            }
-        }
-
-    // By the time we get to this place in the function we are guarenteed to have a single
-    // variable operation, perhaps with a NOT or ! operator
-    bool notval = false;
-
-    // search for a NOT or ! operator
-    if (str.Mid(0, 1) == "!") {
-        str.Remove(0, 1);
-        str.Trim(false); // trim spaces from left
-        notval = true;
-        }
-    else if (str.Mid(0,4).CmpNoCase("NOT ") == 0) {
-        str.Remove(0, 4);
-        str.Trim(false); // trim any extra spaces from left
-        notval = true;
-        }
-
-    // now all we have left is the name of the class or a hardcoded 0 or 1
-    if (str == "") {
-#ifdef CHECKED		
-        wxMessageBox("wxHTML #if\\else error: Empty expression in #if\\#elif statement.","Error",wxICON_ERROR);
-#endif
-        return true;
-        }
-
-    // check for hardcoded 0 and 1 cases, (these are used by parenthesis catcher)
-    // this just decomplicates the recursion algorithm
-    if (str == "0") return notval;
-    if (str == "1") return !notval;
-
-    // Grab the value from the variable class identified by cname
-    bool value = wxIfElseVariable::GetValue(str);
-    if (notval) value = !value;
-    return value;
-
-}
-/****************************************************************************
-PARAMETERS:
-text        - HTML to process for if/else blocks
-
-RETURNS:
-The string containing the processed HTML
-
-REMARKS:
-This function replaces #if, #else, #elif, and #endif directives with the text
-contained within the blocks, dependant on the value of the given boolean
-variable. The variable is created by making a sub class of wxIfElseVariable.
-Dynamic class construction is used at run time internally to create an instance
-of this class and access the value of the variable.
-
-SEE ALSO:
-wxIfElseVariable
-****************************************************************************/
-wxString wxIfElsePrep::Process(
-    const wxString& text) const
-{
-	int b;
-	char ft[] = "<!--#if ";
-	char ftend[] = "<!--#endif-->";
-    char ftelse[] = "<!--#else-->";
-    char ftnot[] = "<!--#if not ";
-    char ftnot2[] = "<!--#if !";
-    char ftelif[] = "<!--#elif ";
-	
-    // make a copy so we can replace text as we go without affecting the original
-	wxString output = text;
-
-    // Avoid duplication of our parsing code by turning any #elif blocks into appropriate
-    // else/if blocks
-    while ((b = ReverseFind(output.Lower(), ftelif)) != -1) {
-        int e;
-        // Replace beginning of block
-        e = output.find("-->", b + strlen(ftelif));
-
-        if (e == wxString::npos) {
-#ifdef CHECKED		
-            wxMessageBox("wxHTML #elif error: Premature end of file while parsing #elif.","Error",wxICON_ERROR);
-#endif
-            break;
-            }
-
-        // Convert to lower case so find is easy, grab everything after #elif tag
-        wxString remains = (output.Mid(e+strlen("-->"))).Lower();
-
-        // find matching else or endif
-        int nextif, nextendif;
-        int ifcount = 1, min = 0;
-        do {
-            nextif = remains.find(ft, min);
-            nextendif = remains.find(ftend, min);
-            if (nextif < nextendif && nextif != wxString::npos) {
-                ifcount++;
-                min = nextif+1;
-                }
-            else {
-                ifcount--;
-                min = nextendif+1;
-                }
-
-            if (nextendif == wxString::npos) {
-#ifdef CHECKED		
-                wxMessageBox("wxHTML #elif error: Premature end of file before finding #endif.","Error",wxICON_ERROR);
-#endif
-                break;
-                }
-            // once ifcount reaches 0 again we have found our matchin #endif
-            } while (ifcount > 0);
-
-        // If it couldn't be found die gracefully
-        if (nextendif == wxString::npos) {
-            // We already displayed a message, just break all the way out
-            break;
-            }
-
-        int elifsize = e - (b + strlen(ftelif)) + strlen("-->");
-        // Create the #if/else block, removing the #elif code
-        output = output.Mid(0, b) +
-            wxString(wxString(ftelse)+wxString(ft)) +
-            output.Mid(b+strlen(ftelif), elifsize+nextendif) +
-            wxString(ftend) +
-            output.Mid(b+strlen(ftelif)+elifsize+nextendif);
-        }
-	
-    // Parse out the if else blocks themselves
-    while ((b = ReverseFind(output.Lower(), ft)) != -1) {
-		// Loop until every #if directive is found
-		// We search from the end of the string so that #if statements will properly recurse
-		// and we avoid the hassle of matching statements with the correct <!--#endif-->
-        bool notval = false;
-        int off = 0;
-        int end;
-        wxString usecode, code;
-        wxString cname;
-        wxString tag;
-        bool value;
-
-        code = wxString("");
-
-        // grab the tag and get the name of the variable
-        end = (output.Mid(b)).Find("-->");
-        if (end == -1) {
-#ifdef CHECKED		
-            wxMessageBox("wxHTML #if error: Premature end of file while parsing #if.","Error",wxICON_ERROR);
-#endif
-            break;
-			}
-
-        end += 3;
-        // remove the <!--#if and --> sections from the tag before passing it on to be parsed
-        tag = output.Mid(b+strlen(ft), end-strlen(ft)-3);
-        output.Remove(b, end);
-
-        value = ParseIfStatementValue(tag);
-
-        // Find the end of the tag (<!--#endif-->) and copy it all into the variable code
-        end = ((output.Mid(b)).Lower()).Find(ftend);
-        if (end == -1) {
-#ifdef CHECKED		
-            wxMessageBox("wxHTML #if error: Premature end of file while searching for matching #endif.","Error",wxICON_ERROR);
-#endif
-            break;
-			}
-
-        code = output.Mid(b, end);
-        output.Remove(b, end+strlen(ftend)); // remove the entire #if block from original document
-
-        // Find out if there is an else statement
-        end = (code.Lower()).Find(ftelse);
-        if (end != -1) {
-            if (!value) {
-                // Use the else statement
-                usecode = code.Mid(end+strlen(ftelse));
-                }
-            else {
-                // Use statement before #else
-                usecode = code.Mid(0, end);
-                }
-            }
-        else if (value) {
-            // There is no #else statement
-            usecode = code;
-            }
-
-        if (usecode != wxString(""))
-            output = (output.Mid(0,b) + usecode + output.Mid(b));
-		}
-
-    return output;
-}
-
-FORCE_LINK(ifelsevar)
-				
diff --git a/contrib/src/applet/prepinclude.cpp b/contrib/src/applet/prepinclude.cpp
deleted file mode 100644
index bf03a84ef8..0000000000
--- a/contrib/src/applet/prepinclude.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-*
-*                       wxWindows HTML Applet Package
-*
-*               Copyright (C) 1991-2001 SciTech Software, Inc.
-*                            All rights reserved.
-*
-*  ========================================================================
-*
-*    The contents of this file are subject to the wxWindows License
-*    Version 3.0 (the "License"); you may not use this file except in
-*    compliance with the License. You may obtain a copy of the License at
-*    http://www.wxwindows.org/licence3.txt
-*
-*    Software distributed under the License is distributed on an
-*    "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*    implied. See the License for the specific language governing
-*    rights and limitations under the License.
-*
-*  ========================================================================
-*
-* Language:		ANSI C++
-* Environment:	Any
-*
-* Description:  This file is the implementation of the Preprocessor object
-* for parsing the <!--#include
-*
-****************************************************************************/
-
-// Include private headers
-#include "wx/applet/prepinclude.h"
-#include "wx/applet/echovar.h"
-
-// wxWindows
-#include "wx/filesys.h"
-#include "wx/msgdlg.h"
-
-/*----------------------------- Implementation ----------------------------*/
-
-#define RECURSE_LIMIT 50
-
-/****************************************************************************
-PARAMETERS:
-text        - text to process for echo variables
-
-RETURNS:
-The string containing the processed filename
-
-REMARKS:
-This routine searches through the text of the filename for variables contained
-in % percent signs
-****************************************************************************/
-wxString ParseFilename(
-    wxString &text)
-{
-    int f = 0;
-    int e;
-    while ((f = text.find('%', f)) != wxString::npos) {
-        f++;
-        e = text.find('%', f);
-#ifdef CHECKED	
-        if (e == wxString::npos) {
-            wxMessageBox(wxString("wxHTML #include error: % signs should bracket variable names in file attribute. To use a percent sign in a filename write double percents (%%)."), "Error" ,wxICON_ERROR);
-            return text;
-            }
-#endif			
-        if (e == f)
-            text.replace(f-1, 2, "%");
-        else {
-            wxString varname = text.Mid(f, (e-f));
-            text.replace(f-1, (e-f)+2, wxEchoVariable::GetValue(varname));
-            }
-        }
-    return text;
-}
-
-/****************************************************************************
-PARAMETERS:
-text        - HTML to process for include directives
-
-RETURNS:
-The string containing the processed HTML
-
-REMARKS:
-This is the only implemented method of the Preprocessor class. It is a constant
-function that parses a string. Basically we load the string search for include
-statements then replace them with the correct file. Wash rinse and repeat until
-all recursive cases are handled.
-****************************************************************************/
-wxString wxIncludePrep::Process(
-    const wxString& text) const
-{
-    int i;
-	char ft[] = "<!--#include virtual=";
-    int openedcount = 0;
-
-    // make a copy so we can replace text as we go without affecting the original
-	wxString output = text;
-	while ((i = (output.Lower()).Find(ft)) != -1) {
-		// This loop makes more recursion unnecessary since each iteration adds
-		// the new include files to output.
-		int n, c;
-		wxString fname;
-
-        n = (output.Mid(i+21)).Find("-->");
-		
-		if (n == -1) {
-#ifdef CHECKED			
-            wxMessageBox("wxHTML #include error: Could not read filename. Premature end of file.","Error",wxICON_ERROR);
-#endif			
-            break;
-            }
-
-		fname = output.Mid(i+21, n);
-		
-		// Clip off any quotation marks if they exist. (don't die if there arn't any)
-		c = fname.Find("\"");
-        if (c != -1) fname = fname.Mid(c+1);
-		c = fname.Find("\"");
-		if (c != -1) fname = fname.Mid(0, c);
-		
-		// remove the #include tag
-        output.Remove(i, n+21+3);
-
-        wxFSFile * file;
-        file = m_FS->OpenFile(ParseFilename(fname));
-	
-        if (!file) {
-#ifdef CHECKED		
-			wxMessageBox(wxString("wxHTML #include error: File not Found ") + fname + wxString("."),"Error",wxICON_ERROR);
-#endif
-            delete file;
-            continue;
-			}			
-							
-		wxString tmp;
-    	
-        do {
-			char tmp2[257];
-			(file->GetStream())->Read(tmp2, 256);
-			c = (file->GetStream())->LastRead();
-            tmp2[c] = 0;
-			tmp += wxString(tmp2);
-			} while (c == 256);
-
-		output = (output.Mid(0,i) + tmp + output.Mid(i));
-#ifdef CHECKED	
-        if (openedcount > RECURSE_LIMIT) {
-            wxMessageBox(wxString("wxHTML #include error: More than RECURSE_LIMIT files have been #included you may have a file that is directly or indirectly including itself, causing an endless loop"), "Error" ,wxICON_ERROR);
-            break;
-            }
-#endif			
-        openedcount++;
-        delete file;
-        }
-	
-	return output;
-}
-
-/****************************************************************************
-PARAMETERS:
-dir     - Default directory to get included HTML files from
-
-REMARKS:
-This function sets the directory to get included HTML files from. The default
-value is the current directory. Directorys may be given as a relative path.
-****************************************************************************/
-void wxIncludePrep::ChangeDirectory(
-    wxFileSystem *fs)
-{
-     m_FS = fs;
-}
-
diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in
deleted file mode 100644
index f423f5fd27..0000000000
--- a/contrib/src/deprecated/Makefile.in
+++ /dev/null
@@ -1,365 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CC = @CC@
-CXX = @CXX@
-CFLAGS = @CFLAGS@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-DEPRECATEDDLL_OBJECTS =  \
-	$(__deprecateddll___win32rc) \
-	deprecateddll_prop.o \
-	deprecateddll_propform.o \
-	deprecateddll_proplist.o \
-	deprecateddll_resource.o \
-	deprecateddll_tbarsmpl.o \
-	deprecateddll_treelay.o \
-	deprecateddll_wxexpr.o \
-	deprecateddll_dosyacc.o
-DEPRECATEDDLL_ODEP = \
-	$(___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname)
-DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \
-	$(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \
-	$(CXXFLAGS)
-DEPRECATEDLIB_OBJECTS =  \
-	deprecatedlib_prop.o \
-	deprecatedlib_propform.o \
-	deprecatedlib_proplist.o \
-	deprecatedlib_resource.o \
-	deprecatedlib_tbarsmpl.o \
-	deprecatedlib_treelay.o \
-	deprecatedlib_wxexpr.o \
-	deprecatedlib_dosyacc.o
-DEPRECATEDLIB_ODEP = \
-	$(___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC)
-@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_VERSION_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___deprecateddll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___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_deprecateddll___depname = install_deprecateddll
-@COND_SHARED_1@__uninstall_deprecateddll___depname = \
-@COND_SHARED_1@	uninstall_deprecateddll
-COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__deprecateddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd)
-COND_PLATFORM_OS2_1___deprecateddll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__deprecateddll___importlib = $(COND_PLATFORM_OS2_1___deprecateddll___importlib)
-COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__deprecateddll___importlib = $(COND_WINDOWS_IMPLIB_1___deprecateddll___importlib)
-@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll
-@COND_ICC_PCH_1@__deprecateddll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_deprecateddll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_deprecateddll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___deprecateddll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__deprecateddll___soname_flags = $(COND_USE_SOVERLINUX_1___deprecateddll___soname_flags)
-COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__deprecateddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
-	rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
-@COND_PLATFORM_WIN32_1@	deprecateddll_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___deprecatedlib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname)
-@COND_SHARED_0@__install_deprecatedlib___depname = install_deprecatedlib
-@COND_SHARED_0@__uninstall_deprecatedlib___depname = \
-@COND_SHARED_0@	uninstall_deprecatedlib
-@COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib
-@COND_ICC_PCH_1@__deprecatedlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_deprecatedlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_deprecatedlib/wx/wxprec.h.gch
-@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: $(__deprecateddll___depname) $(__deprecatedlib___depname)
-
-install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.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_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
-	for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___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@	$(__deprecateddll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_deprecateddll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_deprecateddll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DEPRECATEDLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(DEPRECATEDLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_deprecatedlib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_deprecatedlib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS)
-
-deprecateddll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(DEPRECATEDDLL_ODEP)
-	$(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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/prop.cpp
-
-deprecateddll_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/propform.cpp
-
-deprecateddll_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/proplist.cpp
-
-deprecateddll_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/resource.cpp
-
-deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/tbarsmpl.cpp
-
-deprecateddll_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/treelay.cpp
-
-deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDDLL_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/wxexpr.cpp
-
-deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDDLL_ODEP)
-	$(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(srcdir)/dosyacc.c
-
-deprecatedlib_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/prop.cpp
-
-deprecatedlib_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/propform.cpp
-
-deprecatedlib_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/proplist.cpp
-
-deprecatedlib_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/resource.cpp
-
-deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/tbarsmpl.cpp
-
-deprecatedlib_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/treelay.cpp
-
-deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDLIB_ODEP)
-	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/wxexpr.cpp
-
-deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDLIB_ODEP)
-	$(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $(srcdir)/dosyacc.c
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_deprecateddll uninstall_deprecateddll install_deprecatedlib uninstall_deprecatedlib
diff --git a/contrib/src/deprecated/cwlex_yy.c b/contrib/src/deprecated/cwlex_yy.c
deleted file mode 100644
index 18464795f7..0000000000
--- a/contrib/src/deprecated/cwlex_yy.c
+++ /dev/null
@@ -1,1216 +0,0 @@
-/* A lexical scanner generated by flex */
-/* Copyright: (c) Julian Smart */
-/* Licence:   wxWindows Licence */
-
-/* scanner skeleton version:
- * $Header$
-	Last change:  JS   13 Jul 97    6:17 pm
- */
-
-#define FLEX_SCANNER
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <osfcn.h>
-
-/* use prototypes in function declarations */
-#define YY_USE_PROTOS
-
-/* the "const" storage-class-modifier is valid */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#ifdef __STDC__
-
-#ifdef __GNUC__
-#include <stddef.h>
-#else
-#include <stdlib.h>
-#endif	/* __GNUC__ */
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-
-#ifdef __TURBOC__
-#define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
-#define const
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-/* we can't get here if it's an ANSI C compiler, or a C++ compiler,
- * so it's got to be a K&R compiler, and therefore there's no standard
- * place from which to include these definitions
- */
-/*
-char *malloc();
-int free();
-*/
-
-//int read();
-#endif
-
-
-/* amount of stuff to slurp up with each read */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* returned upon end-of-file */
-#define YY_END_TOK 0
-
-/* copy whatever the last rule matched to the standard output */
-
-/* cast to (char *) is because for 8-bit chars, yytext is (unsigned char *) */
-/* this used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite()
- */
-#define ECHO (void) fwrite( (char *) yytext, yyleng, 1, yyout )
-
-/* gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#define YY_INPUT(buf,result,max_size) \
-	if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
-	    YY_FATAL_ERROR( "read() in flex scanner failed" );
-#define YY_NULL 0
-
-/* no semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#define yyterminate() return ( YY_NULL )
-
-/* report a fatal error */
-
-/* The funky do-while is used to turn this macro definition into
- * a single C statement (which needs a semi-colon terminator).
- * This avoids problems with code like:
- *
- * 	if ( something_happens )
- *		YY_FATAL_ERROR( "oops, the something happened" );
- *	else
- *		everything_okay();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the YY_FATAL_ERROR() call.
- */
-
-#define YY_FATAL_ERROR(msg) \
-	do \
-		{ \
-		(void) fputs( msg, stderr ); \
-		(void) putc( '\n', stderr ); \
-		exit( 1 ); \
-		} \
-	while ( 0 )
-
-/* default yywrap function - always treat EOF as an EOF */
-int yywrap(void) { return 1; }
-
-
-/* enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* action number for EOF rule of a given start state */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* special action meaning "start processing a new file" */
-#define YY_NEW_FILE \
-	do \
-		{ \
-		yy_init_buffer( yy_current_buffer, yyin ); \
-		yy_load_buffer_state(); \
-		} \
-	while ( 0 )
-
-/* default declaration of generated scanner - a define so the user can
- * easily add parameters
- */
-#define YY_DECL int yylex YY_PROTO(( void )) 
-
-/* code executed at the end of each rule */
-#define YY_BREAK break;
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE (YY_READ_BUF_SIZE * 2) /* size of default input buffer */
-#endif
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-#define YY_CHAR unsigned char
-# line 1 "lexer.l"
-#define INITIAL 0
-# line 9 "lexer.l"
-/*
- * File:         lexer.l
- * Description:  Lexical analyser for PROLOGIO; can be used with
- *               either lex and flex.
- */
-#include <string.h>
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
-             please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
-#define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/expr.h"
-#ifdef wx_x
-extern char *malloc();
-#endif
-#define Return(x) return x;
-
-#if defined(VMS) && ( __VMS_VER < 70000000 )
-#define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-static int my_unput(char);
-
-#ifdef FLEX_SCANNER
-#undef YY_INPUT
-# define YY_INPUT(buf,result,max_size) \
-   if (lex_read_from_string) \
-   {  int c = my_input(); result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1); } \
-   else \
-	if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
-	    YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
-# undef unput
-# define unput(_c) my_unput(_c)
-#endif
-
-# line 58 "lexer.l"
-
-/* done after the current pattern has been matched and before the
- * corresponding action - sets up yytext
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext = yy_bp; \
-	yyleng = yy_cp - yy_bp; \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* return all but the first 'n' matched characters back to the input stream */
-#define yyless(n) \
-	do \
-		{ \
-		/* undo effects of setting up yytext */ \
-		*yy_cp = yy_hold_char; \
-		yy_c_buf_p = yy_cp = yy_bp + n; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#undef unput
-#define unput(c) yyunput( c, yytext )
-
-
-struct yy_buffer_state
-    {
-    FILE *yy_input_file;
-
-    YY_CHAR *yy_ch_buf;		/* input buffer */
-    YY_CHAR *yy_buf_pos;	/* current position in input buffer */
-
-    /* size of input buffer in bytes, not including room for EOB characters*/
-    int yy_buf_size;	
-
-    /* number of characters read into yy_ch_buf, not including EOB characters */
-    int yy_n_chars;
-
-    int yy_eof_status;		/* whether we've seen an EOF on this buffer */
-#define EOF_NOT_SEEN 0
-    /* "pending" happens when the EOF has been seen but there's still
-     * some text process
-     */
-#define EOF_PENDING 1
-#define EOF_DONE 2
-    };
-
-static YY_BUFFER_STATE yy_current_buffer;
-
-/* we provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state"
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed */
-static YY_CHAR yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-#ifndef YY_USER_INIT
-#define YY_USER_INIT
-#endif
-
-extern YY_CHAR *yytext;
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-YY_CHAR *yytext;
-int yyleng;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-#define YY_END_OF_BUFFER 18
-typedef int yy_state_type;
-static const short int yy_accept[34] =
-    {   0,
-        0,    0,   18,   16,   13,   14,   16,   16,    6,    7,
-       16,    8,   12,   16,    1,   11,    3,    9,   10,    2,
-        0,    5,    0,    0,    0,    4,    1,   15,    3,    5,
-        0,    0,    0
-    } ;
-
-static const YY_CHAR yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    4,    1,    1,    1,    1,    5,    6,
-        7,    8,    9,   10,    9,   11,   12,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
-       14,    1,    1,    1,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       16,   17,   18,    1,   15,    1,   15,   15,   15,   15,
-
-       19,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,    1,   20,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static const YY_CHAR yy_meta[21] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    2,    1,    2,    1,    3,    1,    2,    1
-    } ;
-
-static const short int yy_base[37] =
-    {   0,
-        0,    0,   48,   55,   55,   55,   17,   42,   55,   55,
-       19,   55,   55,   23,   17,   55,    0,   55,   55,    0,
-       18,   55,   19,   23,   21,   55,   12,   55,    0,   24,
-       25,   29,   55,   49,   52,   22
-    } ;
-
-static const short int yy_def[37] =
-    {   0,
-       33,    1,   33,   33,   33,   33,   34,   35,   33,   33,
-       33,   33,   33,   33,   33,   33,   36,   33,   33,   36,
-       34,   33,   34,   34,   35,   33,   33,   33,   36,   34,
-       34,   34,    0,   33,   33,   33
-    } ;
-
-static const short int yy_nxt[76] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,    4,   11,   12,
-       13,   14,   15,   16,   17,   18,    4,   19,   20,    4,
-       22,   22,   30,   29,   27,   26,   22,   22,   30,   27,
-       28,   27,   30,   23,   23,   23,   24,   24,   24,   31,
-       23,   32,   24,   24,   24,   23,   26,   33,   24,   21,
-       21,   21,   25,   25,    3,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33
-    } ;
-
-static const short int yy_chk[76] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        7,   21,   23,   36,   27,   25,   24,   30,   31,   15,
-       14,   11,   32,    7,   21,   23,    7,   21,   23,   24,
-       30,   31,   24,   30,   31,   32,    8,    3,   32,   34,
-       34,   34,   35,   35,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static YY_CHAR *yy_last_accepting_cpos;
-
-/* the intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-
-/* these variables are all declared out here so that section 3 code can
- * manipulate them
- */
-/* points to current character in buffer */
-static YY_CHAR *yy_c_buf_p = (YY_CHAR *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yyunput YY_PROTO(( YY_CHAR c, YY_CHAR *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-#define yy_new_buffer yy_create_buffer
-
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-
-YY_DECL
-    {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp, *yy_bp;
-    register int yy_act;
-
-
-
-
-    if ( yy_init )
-	{
-	YY_USER_INIT;
-
-	if ( ! yy_start )
-	    yy_start = 1;	/* first start state */
-
-	if ( ! yyin )
-	    yyin = stdin;
-
-	if ( ! yyout )
-	    yyout = stdout;
-
-	if ( yy_current_buffer )
-	    yy_init_buffer( yy_current_buffer, yyin );
-	else
-	    yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_load_buffer_state();
-
-	yy_init = 0;
-	}
-
-    while ( 1 )		/* loops until end-of-file is reached */
-	{
-	yy_cp = yy_c_buf_p;
-
-	/* support of yytext */
-	*yy_cp = yy_hold_char;
-
-	/* yy_bp points to the position in yy_ch_buf of the start of the
-	 * current run.
-	 */
-	yy_bp = yy_cp;
-
-	yy_current_state = yy_start;
-yy_match:
-	do
-	    {
-	    register YY_CHAR yy_c = yy_ec[*yy_cp];
-	    if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = yy_def[yy_current_state];
-		if ( yy_current_state >= 34 )
-		    yy_c = yy_meta[yy_c];
-		}
-	    yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	    ++yy_cp;
-	    }
-	while ( yy_current_state != 33 );
-	yy_cp = yy_last_accepting_cpos;
-	yy_current_state = yy_last_accepting_state;
-
-yy_find_action:
-	yy_act = yy_accept[yy_current_state];
-
-	YY_DO_BEFORE_ACTION;
-	YY_USER_ACTION;
-
-do_action:	/* this label is used only to access EOF actions */
-
-
-	switch ( yy_act )
-	    {
-	    case 0: /* must backtrack */
-	    /* undo the effects of YY_DO_BEFORE_ACTION */
-	    *yy_cp = yy_hold_char;
-	    yy_cp = yy_last_accepting_cpos;
-	    yy_current_state = yy_last_accepting_state;
-	    goto yy_find_action;
-
-case 1:
-# line 60 "lexer.l"
-{yylval.s = strdup(yytext); Return(INTEGER);}
-	YY_BREAK
-case 2:
-# line 62 "lexer.l"
-Return(EXP);
-	YY_BREAK
-case 3:
-# line 64 "lexer.l"
-{yylval.s = strdup(yytext); Return(WORD);}
-	YY_BREAK
-case 4:
-# line 66 "lexer.l"
-{int len = strlen(yytext);
-                                   yytext[len-1] = 0;
-                                   yylval.s = strdup(yytext+1); 
-                                   Return(WORD);}
-	YY_BREAK
-case 5:
-# line 71 "lexer.l"
-{yylval.s = strdup(yytext); Return(STRING);}
-	YY_BREAK
-case 6:
-# line 73 "lexer.l"
-Return(OPEN);
-	YY_BREAK
-case 7:
-# line 75 "lexer.l"
-Return(CLOSE);
-	YY_BREAK
-case 8:
-# line 77 "lexer.l"
-Return(COMMA);
-	YY_BREAK
-case 9:
-# line 79 "lexer.l"
-Return(OPEN_SQUARE);
-	YY_BREAK
-case 10:
-# line 81 "lexer.l"
-Return(CLOSE_SQUARE);
-	YY_BREAK
-case 11:
-# line 83 "lexer.l"
-Return(EQUALS);
-	YY_BREAK
-case 12:
-# line 85 "lexer.l"
-Return(PERIOD);
-	YY_BREAK
-case 13:
-# line 87 "lexer.l"
-;
-	YY_BREAK
-case 14:
-# line 89 "lexer.l"
-;
-	YY_BREAK
-case 15:
-# line 91 "lexer.l"
-{       loop:
-#ifdef __cplusplus
-                          while (yyinput() != '*');
-                          switch (yyinput())
-#else
-                          while (input() != '*');
-                          switch (input())
-#endif
-                                  {
-                                  case '/': break;
-                                  case '*': unput('*');
-                                  default: goto loop;
-                                  }
-                          }
-	YY_BREAK
-case 16:
-# line 106 "lexer.l"
-Return(ERROR);
-	YY_BREAK
-case 17:
-# line 108 "lexer.l"
-ECHO;
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-    yyterminate();
-
-	    case YY_END_OF_BUFFER:
-		{
-		/* amount of text matched not including the EOB char */
-		int yy_amount_of_matched_text = yy_cp - yytext - 1;
-
-		/* undo the effects of YY_DO_BEFORE_ACTION */
-		*yy_cp = yy_hold_char;
-
-		/* note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the end-
-		 * of-buffer state).  Contrast this with the test in yyinput().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-		    /* this was really a NUL */
-		    {
-		    yy_state_type yy_next_state;
-
-		    yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
-		    yy_current_state = yy_get_previous_state();
-
-		    /* okay, we're now positioned to make the
-		     * NUL transition.  We couldn't have
-		     * yy_get_previous_state() go ahead and do it
-		     * for us because it doesn't know how to deal
-		     * with the possibility of jamming (and we
-		     * don't want to build jamming into it because
-		     * then it will run more slowly)
-		     */
-
-		    yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-		    yy_bp = yytext + YY_MORE_ADJ;
-
-		    if ( yy_next_state )
-			{
-			/* consume the NUL */
-			yy_cp = ++yy_c_buf_p;
-			yy_current_state = yy_next_state;
-			goto yy_match;
-			}
-
-		    else
-			{
-			    yy_cp = yy_last_accepting_cpos;
-			    yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-			}
-		    }
-
-		else switch ( yy_get_next_buffer() )
-		    {
-		    case EOB_ACT_END_OF_FILE:
-			{
-			yy_did_buffer_switch_on_eof = 0;
-
-			if ( yywrap() )
-			    {
-			    /* note: because we've taken care in
-			     * yy_get_next_buffer() to have set up yytext,
-			     * we can now set up yy_c_buf_p so that if some
-			     * total hoser (like flex itself) wants
-			     * to call the scanner after we return the
-			     * YY_NULL, it'll still work - another YY_NULL
-			     * will get returned.
-			     */
-			    yy_c_buf_p = yytext + YY_MORE_ADJ;
-
-			    yy_act = YY_STATE_EOF((yy_start - 1) / 2);
-			    goto do_action;
-			    }
-
-			else
-			    {
-			    if ( ! yy_did_buffer_switch_on_eof )
-				YY_NEW_FILE;
-			    }
-			}
-			break;
-
-		    case EOB_ACT_CONTINUE_SCAN:
-			yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			yy_cp = yy_c_buf_p;
-			yy_bp = yytext + YY_MORE_ADJ;
-			goto yy_match;
-
-		    case EOB_ACT_LAST_MATCH:
-			yy_c_buf_p =
-			    &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-			yy_current_state = yy_get_previous_state();
-
-			yy_cp = yy_c_buf_p;
-			yy_bp = yytext + YY_MORE_ADJ;
-			goto yy_find_action;
-		    }
-		break;
-		}
-
-	    default:
-#ifdef FLEX_DEBUG
-		printf( "action # %d\n", yy_act );
-#endif
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	    }
-	}
-    }
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * synopsis
- *     int yy_get_next_buffer();
- *     
- * returns a code representing an action
- *     EOB_ACT_LAST_MATCH - 
- *     EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *     EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-
-    {
-    register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
-    register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
-    int ret_val;
-
-    if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-	YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-    /* try to read more data */
-
-    /* first move last chars to start of buffer */
-    number_to_move = yy_c_buf_p - yytext;
-
-    for ( i = 0; i < number_to_move; ++i )
-	*(dest++) = *(source++);
-
-    if ( yy_current_buffer->yy_eof_status != EOF_NOT_SEEN )
-	/* don't do the read, it's not guaranteed to return an EOF,
-	 * just force an EOF
-	 */
-	yy_n_chars = 0;
-
-    else
-	{
-	int num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-	if ( num_to_read > YY_READ_BUF_SIZE )
-	    num_to_read = YY_READ_BUF_SIZE;
-
-	else if ( num_to_read <= 0 )
-	    YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" );
-
-	/* read in more data */
-	YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-		  yy_n_chars, num_to_read );
-	}
-
-    if ( yy_n_chars == 0 )
-	{
-	if ( number_to_move == 1 )
-	    {
-	    ret_val = EOB_ACT_END_OF_FILE;
-	    yy_current_buffer->yy_eof_status = EOF_DONE;
-	    }
-
-	else
-	    {
-	    ret_val = EOB_ACT_LAST_MATCH;
-	    yy_current_buffer->yy_eof_status = EOF_PENDING;
-	    }
-	}
-
-    else
-	ret_val = EOB_ACT_CONTINUE_SCAN;
-
-    yy_n_chars += number_to_move;
-    yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-    yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-    /* yytext begins at the second character in yy_ch_buf; the first
-     * character is the one which preceded it before reading in the latest
-     * buffer; it needs to be kept around in case it's a newline, so
-     * yy_get_previous_state() will have with '^' rules active
-     */
-
-    yytext = &yy_current_buffer->yy_ch_buf[1];
-
-    return ( ret_val );
-    }
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
- *
- * synopsis
- *     yy_state_type yy_get_previous_state();
- */
-
-static yy_state_type yy_get_previous_state()
-
-    {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp;
-
-    yy_current_state = yy_start;
-
-    for ( yy_cp = yytext + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-	{
-	register YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
-	if ( yy_accept[yy_current_state] )
-	    {
-	    yy_last_accepting_state = yy_current_state;
-	    yy_last_accepting_cpos = yy_cp;
-	    }
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-	    {
-	    yy_current_state = yy_def[yy_current_state];
-	    if ( yy_current_state >= 34 )
-		yy_c = yy_meta[yy_c];
-	    }
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	}
-
-    return ( yy_current_state );
-    }
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *     next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
-#endif
-
-    {
-    register int yy_is_jam;
-    register YY_CHAR *yy_cp = yy_c_buf_p;
-
-    register YY_CHAR yy_c = 1;
-    if ( yy_accept[yy_current_state] )
-	{
-	yy_last_accepting_state = yy_current_state;
-	yy_last_accepting_cpos = yy_cp;
-	}
-    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-	{
-	yy_current_state = yy_def[yy_current_state];
-	if ( yy_current_state >= 34 )
-	    yy_c = yy_meta[yy_c];
-	}
-    yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-    yy_is_jam = (yy_current_state == 33);
-
-    return ( yy_is_jam ? 0 : yy_current_state );
-    }
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-YY_CHAR c;
-register YY_CHAR *yy_bp;
-#endif
-
-    {
-    register YY_CHAR *yy_cp = yy_c_buf_p;
-
-    /* undo effects of setting up yytext */
-    *yy_cp = yy_hold_char;
-
-    if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-	{ /* need to shift things up to make room */
-	register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
-	register YY_CHAR *dest =
-	    &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
-	register YY_CHAR *source =
-	    &yy_current_buffer->yy_ch_buf[number_to_move];
-
-	while ( source > yy_current_buffer->yy_ch_buf )
-	    *--dest = *--source;
-
-	yy_cp += dest - source;
-	yy_bp += dest - source;
-	yy_n_chars = yy_current_buffer->yy_buf_size;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-	    YY_FATAL_ERROR( "flex scanner push-back overflow" );
-	}
-
-    if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
-	yy_cp[-2] = '\n';
-
-    *--yy_cp = c;
-
-    /* note: the formal parameter *must* be called "yy_bp" for this
-     *       macro to now work correctly
-     */
-    YY_DO_BEFORE_ACTION; /* set up yytext again */
-    }
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-
-    {
-    int c;
-    YY_CHAR *yy_cp = yy_c_buf_p;
-
-    *yy_cp = yy_hold_char;
-
-    if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-	{
-	/* yy_c_buf_p now points to the character we want to return.
-	 * If this occurs *before* the EOB characters, then it's a
-	 * valid NUL; if not, then we've hit the end of the buffer.
-	 */
-	if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-	    /* this was really a NUL */
-	    *yy_c_buf_p = '\0';
-
-	else
-	    { /* need more input */
-	    yytext = yy_c_buf_p;
-	    ++yy_c_buf_p;
-
-	    switch ( yy_get_next_buffer() )
-		{
-		case EOB_ACT_END_OF_FILE:
-		    {
-		    if ( yywrap() )
-			{
-			yy_c_buf_p = yytext + YY_MORE_ADJ;
-			return ( EOF );
-			}
-
-		    YY_NEW_FILE;
-
-#ifdef __cplusplus
-		    return ( yyinput() );
-#else
-		    return ( input() );
-#endif
-		    }
-		    break;
-
-		case EOB_ACT_CONTINUE_SCAN:
-		    yy_c_buf_p = yytext + YY_MORE_ADJ;
-		    break;
-
-		case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
-		    YY_FATAL_ERROR( "unexpected last match in yyinput()" );
-#else
-		    YY_FATAL_ERROR( "unexpected last match in input()" );
-#endif
-		}
-	    }
-	}
-
-    c = *yy_c_buf_p;
-    yy_hold_char = *++yy_c_buf_p;
-
-    return ( c );
-    }
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-
-    {
-    yy_init_buffer( yy_current_buffer, input_file );
-    yy_load_buffer_state();
-    }
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-
-    {
-    if ( yy_current_buffer == new_buffer )
-	return;
-
-    if ( yy_current_buffer )
-	{
-	/* flush out information for old buffer */
-	*yy_c_buf_p = yy_hold_char;
-	yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-	yy_current_buffer->yy_n_chars = yy_n_chars;
-	}
-
-    yy_current_buffer = new_buffer;
-    yy_load_buffer_state();
-
-    /* we don't actually know whether we did this switch during
-     * EOF (yywrap()) processing, but the only time this flag
-     * is looked at is after yywrap() is called, so it's safe
-     * to go ahead and always set it.
-     */
-    yy_did_buffer_switch_on_eof = 1;
-    }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-
-    {
-    yy_n_chars = yy_current_buffer->yy_n_chars;
-    yytext = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-    yyin = yy_current_buffer->yy_input_file;
-    yy_hold_char = *yy_c_buf_p;
-    }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-
-    {
-    YY_BUFFER_STATE b;
-
-    b = (YY_BUFFER_STATE) malloc( sizeof( struct yy_buffer_state ) );
-
-    if ( ! b )
-	YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-    b->yy_buf_size = size;
-
-    /* yy_ch_buf has to be 2 characters longer than the size given because
-     * we need to put in 2 end-of-buffer characters.
-     */
-    b->yy_ch_buf = (YY_CHAR *) malloc( (unsigned) (b->yy_buf_size + 2) );
-
-    if ( ! b->yy_ch_buf )
-	YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-    yy_init_buffer( b, file );
-
-    return ( b );
-    }
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-    {
-    if ( b == yy_current_buffer )
-	yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-    free( (char *) b->yy_ch_buf );
-    free( (char *) b );
-    }
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-    {
-    b->yy_input_file = file;
-
-    /* we put in the '\n' and start reading from [1] so that an
-     * initial match-at-newline will be true.
-     */
-
-    b->yy_ch_buf[0] = '\n';
-    b->yy_n_chars = 1;
-
-    /* we always need two end-of-buffer characters.  The first causes
-     * a transition to the end-of-buffer state.  The second causes
-     * a jam in that state.
-     */
-    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-    b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
-    b->yy_buf_pos = &b->yy_ch_buf[1];
-
-    b->yy_eof_status = EOF_NOT_SEEN;
-    }
-# line 108 "lexer.l"
-
-
-
-#ifdef FLEX_SCANNER
-static int lex_input() {
-  return input();
-}
-#else	/* BSD/AT&T lex */
-#ifndef input
-# error "Sorry, but need either flex or AT&T lex"
-#endif
-static int lex_input() {
-  return input();
-}
-/* # undef unput
-# define unput(_c) my_unput(_c)
-*/
-
-# undef input
-# define input() my_input()
-static int my_unput(char c)
-{
-  if (lex_read_from_string) {
-    /* Make sure we have something */
-    if (lex_string_ptr) {
-      if (c == '\n') yylineno--;
-      lex_string_ptr--;
-    }
-  } else {
-    yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
-/*    unput(c); Causes infinite recursion! */
-  }
-  return c;
-}
-
-#endif
-
-/* Public */ 
-void LexFromFile(FILE *fd)
-{
-  lex_read_from_string = 0;
-  yyin = fd;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
-  lex_read_from_string = 1;
-  lex_buffer = buffer;
-  lex_buffer_length = strlen(buffer);
-  lex_string_ptr = 0;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
-  if (lex_read_from_string) {
-    if (lex_string_ptr == lex_buffer_length)
-      return 0;
-    else {
-      char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
-      if (c == '\n') yylineno++;
-#endif
-      return c;
-    }
-  } else {
-    return lex_input();
-  }
-}
-
-void wxExprCleanUp()
-{
-	if (yy_current_buffer)
-		yy_delete_buffer(yy_current_buffer);
-}
diff --git a/contrib/src/deprecated/cwy_tab.c b/contrib/src/deprecated/cwy_tab.c
deleted file mode 100644
index c3ce961313..0000000000
--- a/contrib/src/deprecated/cwy_tab.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* Copyright: (c) Julian Smart */
-/* Licence:   wxWindows Licence */
-
-#ifndef lint
-static char yysccsid[] = "@(#)yaccpar     1.7 (Berkeley) 09/09/90";
-#endif
-#define YYBYACC 1
-#line 2 "parser.y"
-#include "string.h"
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-#include "wx/expr.h"
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yyparse(void);
-int PROIO_yyparse(void) {
-	return yyparse() ;
-}
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-#if __MSL__ < 0x6000
-int read( int , char * , int ) ;
-#else
-int _read( int , void * , size_t ) ;
-#define read _read
-#endif
-#ifdef __WXMSW__
-//int fileno( FILE* ) ; This is defined in watcom
-#else
-#if __MSL__ < 0x6000
-int fileno( void* ) ;
-#endif
-#endif
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
-	Last change:  JS   13 Jul 97    6:12 pm
- */
-#ifdef LEX_SCANNER
-/* int yyoutput(int); */
-void yyoutput(int);
-#else
-void yyoutput(int);
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-#line 36 "parser.y"
-typedef union {
-    char *s;
-/*    struct pexpr *expr; */
-} YYSTYPE;
-#line 44 "y_tab.c"
-#define INTEGER 1
-#define WORD 2
-#define STRING 3
-#define PERIOD 13
-#define OPEN 4
-#define CLOSE 5
-#define COMMA 6
-#define NEWLINE 7
-#define ERROR 8
-#define OPEN_SQUARE 9
-#define CLOSE_SQUARE 10
-#define EQUALS 11
-#define EXP 14
-#define YYERRCODE 256
-short yylhs[] = {                                        -1,
-    0,    0,    1,    1,    1,    2,    2,    2,    3,    3,
-    3,    4,    4,    5,    5,    5,    5,    5,    5,    5,
-};
-short yylen[] = {                                         2,
-    0,    2,    2,    2,    2,    4,    2,    3,    0,    1,
-    3,    3,    1,    1,    1,    1,    3,    3,    5,    1,
-};
-short yydefred[] = {                                      1,
-    0,    0,    0,    0,    2,    0,    5,    3,    0,    0,
-    0,   15,    7,   20,    0,    0,   13,    4,    0,    0,
-    0,    0,    8,    0,    6,    0,   18,    0,   12,   11,
-    0,   19,
-};
-short yydgoto[] = {                                       1,
-    5,   14,   15,   16,   17,
-};
-short yysindex[] = {                                      0,
-   -2,    9,    2,    1,    0,   10,    0,    0,   11,   -5,
-   17,    0,    0,    0,   14,   -1,    0,    0,   33,   38,
-   41,   16,    0,   11,    0,   29,    0,   40,    0,    0,
-   44,    0,
-};
-short yyrindex[] = {                                      0,
-    0,    0,    0,    0,    0,    0,    0,    0,   42,   21,
-   24,    0,    0,    0,    0,   30,    0,    0,    0,    0,
-    0,    0,    0,   31,    0,   27,    0,   24,    0,    0,
-    0,    0,
-};
-short yygindex[] = {                                      0,
-    0,   45,   -8,    0,   26,
-};
-#define YYTABLESIZE 254
-short yytable[] = {                                       3,
-   19,   10,   11,   12,   24,    9,    4,   20,   21,    4,
-   13,   10,   11,   12,    8,   30,   10,   28,   12,    4,
-    9,    7,   18,   23,    4,   16,   16,   22,   14,   14,
-   16,   17,   17,   14,   10,    9,   17,   25,   26,   10,
-    9,   27,   31,    9,   32,    6,    9,   29,    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,    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,    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,    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,
-    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,    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,    0,    0,    0,    0,
-    0,    0,    0,    2,
-};
-short yycheck[] = {                                       2,
-    9,    1,    2,    3,    6,    4,    9,   13,   14,    9,
-   10,    1,    2,    3,   13,   24,    1,    2,    3,    9,
-    4,   13,   13,   10,    9,    5,    6,   11,    5,    6,
-   10,    5,    6,   10,    5,    5,   10,    5,    1,   10,
-   10,    1,   14,    4,    1,    1,    5,   22,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  256,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 14
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file","INTEGER","WORD","STRING","OPEN","CLOSE","COMMA","NEWLINE",
-"ERROR","OPEN_SQUARE","CLOSE_SQUARE","EQUALS",0,"PERIOD","EXP",
-};
-char *yyrule[] = {
-"$accept : commands",
-"commands :",
-"commands : commands command",
-"command : WORD PERIOD",
-"command : expr PERIOD",
-"command : error PERIOD",
-"expr : WORD OPEN arglist CLOSE",
-"expr : OPEN_SQUARE CLOSE_SQUARE",
-"expr : OPEN_SQUARE arglist CLOSE_SQUARE",
-"arglist :",
-"arglist : arg",
-"arglist : arg COMMA arglist",
-"arg : WORD EQUALS arg1",
-"arg : arg1",
-"arg1 : WORD",
-"arg1 : STRING",
-"arg1 : INTEGER",
-"arg1 : INTEGER PERIOD INTEGER",
-"arg1 : INTEGER EXP INTEGER",
-"arg1 : INTEGER PERIOD INTEGER EXP INTEGER",
-"arg1 : expr",
-};
-#endif
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#ifdef YYSTACKSIZE
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#endif
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 600
-#define YYMAXDEPTH 600
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-#line 118 "parser.y"
-
-#ifdef IDE_INVOKED
-#include "doslex.c"
-#else
-#if (defined(__MWERKS__))
-#include "cwlex_yy.c"
-#else
-#include "lex_yy.c"
-#endif
-#endif
-
-/*
-void yyerror(s)
-char *s;
-{
-  syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
-   the above instead.
- */
-
-void yyerror(char *s)
-{
-  syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* Not sure if __SC__ is the appropriate thing
- * to test
- */
-
-#ifndef __SC__
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-int yywrap() { return 1; }
-#endif
-#endif
-#line 247 "y_tab.c"
-#define YYABORT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-yyparse()
-{
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register char *yys;
-    extern char *getenv();
-
-    if (yys = getenv("YYDEBUG"))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    if (yyn = yydefred[yystate]) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, reading %d (%s)\n", yystate,
-                    yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("yydebug: state %d, shifting to state %d\n",
-                    yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yyss + yystacksize - 1)
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#ifdef lint
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("yydebug: state %d, error recovery shifting\
- to state %d\n", *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yyss + yystacksize - 1)
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("yydebug: error recovery discarding state %d\n",
-                            *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, error recovery discards token %d (%s)\n",
-                    yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("yydebug: state %d, reducing by rule %d (%s)\n",
-                yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
-case 3:
-#line 68 "parser.y"
-{process_command(proio_cons(wxmake_word(yyvsp[-1].s), NULL)); free(yyvsp[-1].s);}
-break;
-case 4:
-#line 70 "parser.y"
-{process_command(yyvsp[-1].s);}
-break;
-case 5:
-#line 72 "parser.y"
-{syntax_error("Unrecognized command.");}
-break;
-case 6:
-#line 76 "parser.y"
-{yyval.s = proio_cons(wxmake_word(yyvsp[-3].s), yyvsp[-1].s); free(yyvsp[-3].s);}
-break;
-case 7:
-#line 78 "parser.y"
-{yyval.s = proio_cons(NULL, NULL);}
-break;
-case 8:
-#line 80 "parser.y"
-{yyval.s = yyvsp[-1].s; }
-break;
-case 9:
-#line 84 "parser.y"
-{yyval.s = NULL;}
-break;
-case 10:
-#line 86 "parser.y"
-{yyval.s = proio_cons(yyvsp[0].s, NULL);}
-break;
-case 11:
-#line 89 "parser.y"
-{yyval.s = proio_cons(yyvsp[-2].s, yyvsp[0].s);}
-break;
-case 12:
-#line 93 "parser.y"
-{yyval.s = proio_cons(wxmake_word("="), proio_cons(wxmake_word(yyvsp[-2].s), proio_cons(yyvsp[0].s, NULL)));
-                         free(yyvsp[-2].s); }
-break;
-case 13:
-#line 96 "parser.y"
-{yyval.s = yyvsp[0].s; }
-break;
-case 14:
-#line 99 "parser.y"
-{yyval.s = wxmake_word(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 15:
-#line 101 "parser.y"
-{yyval.s = wxmake_string(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 16:
-#line 103 "parser.y"
-{yyval.s = wxmake_integer(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 17:
-#line 105 "parser.y"
-{yyval.s = wxmake_real(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 18:
-#line 107 "parser.y"
-{yyval.s = wxmake_exp(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 19:
-#line 110 "parser.y"
-{yyval.s = wxmake_exp2(yyvsp[-4].s, yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-4].s); free(yyvsp[-2].s);
-                                                                  free(yyvsp[0].s); }
-break;
-case 20:
-#line 114 "parser.y"
-{yyval.s = yyvsp[0].s;}
-break;
-#line 461 "y_tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("yydebug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("yydebug: state %d, reading %d (%s)\n",
-                        YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("yydebug: after reduction, shifting from state %d \
-to state %d\n", *yyssp, yystate);
-#endif
-    if (yyssp >= yyss + yystacksize - 1)
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
diff --git a/contrib/src/deprecated/descrip.mms b/contrib/src/deprecated/descrip.mms
deleted file mode 100644
index 7e92facaac..0000000000
--- a/contrib/src/deprecated/descrip.mms
+++ /dev/null
@@ -1,102 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 February 2006                                                    *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [---.include.wx]
-	set command $disk2:[joukj.com]bison.cld
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm
-.else
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.endif
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-
-YACC=bison/yacc
-
-SED=gsed
-
-LEX=flex
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=prop.obj,propform.obj,proplist.obj,wxexpr.obj,parser.obj,resource.obj,\
-	treelay.obj
-
-SOURCES=prop.cpp,propform.cpp,proplist.cpp,wxexpr.cpp,parser.y,resource.cpp,\
-	treelay.cpp
-
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library/crea [---.lib]libwx_motif_deprecated.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library/crea [---.lib]libwx_gtk2_deprecated.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-	library/crea [---.lib]libwx_gtk_univ_deprecated.olb $(OBJECTS)
-.else
-	library/crea [---.lib]libwx_gtk_deprecated.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
-wxexpr.obj : wxexpr.cpp
-parser.obj : parser.c lexer.c
-parser.c : parser.y lexer.c
-	$(YACC) parser.y
-	pipe $(SED) -e "s;y_tab.c;parser.y;g" < y_tab.c | \
-	$(SED) -e "s/BUFSIZ/5000/g"            | \
-	$(SED) -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-	$(SED) -e "s/yy/PROIO_yy/g"            | \
-	$(SED) -e "s/input/PROIO_input/g"      | \
-	$(SED) -e "s/unput/PROIO_unput/g"      > parser.c
-	delete y_tab.c;*
-
-lexer.c : lexer.l
-	$(LEX) lexer.l
-	pipe $(SED) -e "s;lexyy.c;lexer.l;g" < lexyy.c | \
-	$(SED) -e "s/yy/PROIO_yy/g"            | \
-	$(SED) -e "s/input/PROIO_input/g"      | \
-	$(SED) -e "s/unput/PROIO_unput/g"      > lexer.c
-	delete lexyy.c;*
-
-resource.obj : resource.cpp
-treelay.obj : treelay.cpp
diff --git a/contrib/src/deprecated/doslex.c b/contrib/src/deprecated/doslex.c
deleted file mode 100644
index 1198926aab..0000000000
--- a/contrib/src/deprecated/doslex.c
+++ /dev/null
@@ -1,1336 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* scanner skeleton version:
- * $Header$
-  Last change:  JS   13 Jul 97    6:17 pm
- */
-/* Copyright: (c) Julian Smart */
-/* Licence:   wxWindows Licence */
-
-#ifdef __VISUALC__
-    #pragma warning(push)
-    #pragma warning(disable:4127) /* warning C4127: conditional expression is constant [about while ( 0 | 1 )] */
-    #pragma warning(disable:4244) /* warning C4244: '=' : conversion from 'A' to 'B', possible loss of data    */
-#endif
-
-#define FLEX_SCANNER
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-  #ifndef __cplusplus
-    #define __cplusplus
-  #endif
-#endif
-
-
-#ifdef __cplusplus
-
-  #include <stdlib.h>
-
-  #ifdef __SALFORDC__
-    #include <io.h>
-    #include <clib.h>
-  #else
-    #include <osfcn.h>
-  #endif
-
-  #ifdef __VISAGECPP__
-    #include <io.h>
-  #endif
-
-  #ifdef __cplusplus
-    static int yyinput()
-  #else
-    static int input()
-  #endif
-
-  /* use prototypes in function declarations */
-  #define YY_USE_PROTOS
-
-  /* the "const" storage-class-modifier is valid */
-  #define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-  #ifdef __STDC__
-
-    #ifdef __GNUC__
-      #include <stddef.h>
-    #else
-      #include <stdlib.h>
-    #endif  /* __GNUC__ */
-
-    #define YY_USE_PROTOS
-    #define YY_USE_CONST
-
-  #endif  /* __STDC__ */
-
-  #ifdef __VISUALC__
-    #define YY_USE_PROTOS
-  #endif
-
-  #ifdef __BORLANDC__
-    #include <io.h>
-    #define YY_USE_PROTOS
-    #define YY_USE_CONST
-  #endif
-
-  #if defined(__MINGW32__) || defined(__WATCOMC__)
-    #include <io.h>
-  #endif
-
-#endif /* ! __cplusplus */
-
-
-#ifdef __TURBOC__
-  #define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
-  #define const
-#endif
-
-
-#ifdef YY_USE_PROTOS
-  #define YY_PROTO(proto) proto
-#else
-  #define YY_PROTO(proto) ()
-  /* we can't get here if it's an ANSI C compiler, or a C++ compiler,
- * so it's got to be a K&R compiler, and therefore there's no standard
- * place from which to include these definitions
- */
-  /*
-   char *malloc();
-   int free();
-  */
-#endif
-
-
-/* amount of stuff to slurp up with each read */
-#ifndef YY_READ_BUF_SIZE
-  #define YY_READ_BUF_SIZE 8192
-#endif
-
-
-/* returned upon end-of-file */
-#define YY_END_TOK 0
-
-
-/* copy whatever the last rule matched to the standard output */
-
-/* cast to (char *) is because for 8-bit chars, yytext is (unsigned char *) */
-/* this used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite()
- */
-#define ECHO (void) fwrite( (char *) yytext, yyleng, 1, yyout )
-
-
-/* gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#define YY_INPUT(buf,result,max_size) \
-    if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
-        YY_FATAL_ERROR( "read() in flex scanner failed" );
-#define YY_NULL 0
-
-
-/* no semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#define yyterminate() return ( YY_NULL )
-
-
-/* report a fatal error */
-
-/* The funky do-while is used to turn this macro definition into
- * a single C statement (which needs a semi-colon terminator).
- * This avoids problems with code like:
- *
- *   if ( something_happens )
- *       YY_FATAL_ERROR( "oops, the something happened" );
- *   else
- *       everything_okay();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the YY_FATAL_ERROR() call.
- */
-
-#if !defined(__VISAGECPP__)
-    #define YY_FATAL_ERROR(msg)             \
-        do                                  \
-        {                                   \
-            (void) fputs( msg, stderr );    \
-            (void) putc( '\n', stderr );    \
-            exit( 1 );                      \
-        }                                   \
-        while ( 0 )
-#else
-    /* suppress expression always false warning */
-    int os2var = 0;
-    #define YY_FATAL_ERROR(msg)             \
-        do                                  \
-        {                                   \
-            (void) fputs( msg, stderr );    \
-            (void) putc( '\n', stderr );    \
-            exit( 1 );                      \
-        }                                   \
-        while ( os2var == 0 )
-#endif
-
-
-/* default yywrap function - always treat EOF as an EOF */
-int yywrap(void) { return 1; }
-
-
-/* enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* action number for EOF rule of a given start state */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* special action meaning "start processing a new file" */
-#if !defined(__VISAGECPP__)
-    #define YY_NEW_FILE                                \
-        do                                             \
-        {                                              \
-            yy_init_buffer( yy_current_buffer, yyin ); \
-            yy_load_buffer_state();                    \
-        }                                              \
-        while ( 0 )
-#else
-    #define YY_NEW_FILE                                \
-        do                                             \
-        {                                              \
-            yy_init_buffer( yy_current_buffer, yyin ); \
-            yy_load_buffer_state();                    \
-        }                                              \
-        while ( os2var == 0 )
-#endif
-
-
-/* default declaration of generated scanner - a define so the user can
- * easily add parameters
- */
-#define YY_DECL int yylex YY_PROTO(( void ))
-
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-#ifndef YY_BUF_SIZE
-  #define YY_BUF_SIZE (YY_READ_BUF_SIZE * 2) /* size of default input buffer */
-#endif
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-#define YY_CHAR unsigned char
-/* # line 1 "lexer.l" */
-#define INITIAL 0
-/* # line 9 "lexer.l" */
-/*
- * File:         lexer.l
- * Description:  Lexical analyser for PROLOGIO; can be used with
- *               either lex and flex.
- */
-#include <string.h>
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
-             please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
-  #define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/deprecated/expr.h"
-#ifdef wx_x
-  extern char *malloc();
-#endif
-
-#if defined(VMS) && ( __VMS_VER < 70000000 )
-  #define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-#ifndef FLEX_SCANNER
-  static int my_unput(char);
-#endif
-
-#ifdef FLEX_SCANNER
-    #undef YY_INPUT
-    #define YY_INPUT(buf,result,max_size)                                  \
-    if (lex_read_from_string)                                              \
-    {                                                                      \
-        int c = my_input();                                                \
-        result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1);                   \
-    }                                                                      \
-    else                                                                   \
-        if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
-            YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
-    #ifndef unput
-        #undef unput
-    #endif
-    #define unput(_c) my_unput(_c)
-#endif
-
-/* # line 58 "lexer.l" */
-
-/* done after the current pattern has been matched and before the
- * corresponding action - sets up yytext
- */
-
-#define YY_DO_BEFORE_ACTION \
-    yytext = yy_bp;         \
-    yyleng = yy_cp - yy_bp; \
-    yy_hold_char = *yy_cp;  \
-    *yy_cp = '\0';          \
-    yy_c_buf_p = yy_cp;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* return all but the first 'n' matched characters back to the input stream */
-#if !defined(__VISAGECPP__)
-    #define yyless(n)                                      \
-        do                                                 \
-        {                                                  \
-            /* undo effects of setting up yytext */        \
-            *yy_cp = yy_hold_char;                         \
-            yy_c_buf_p = yy_cp = yy_bp + n;                \
-            YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-        }                                                  \
-        while ( 0 )
-#else
-    #define yyless(n)                                      \
-        do                                                 \
-        {                                                  \
-            /* undo effects of setting up yytext */        \
-            *yy_cp = yy_hold_char;                         \
-            yy_c_buf_p = yy_cp = yy_bp + n;                \
-            YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-        }                                                  \
-        while ( os2var == 0 )
-#endif
-
-#undef unput
-#define unput(c) yyunput( c, yytext )
-
-struct yy_buffer_state
-{
-    FILE *yy_input_file;
-
-    YY_CHAR *yy_ch_buf;     /* input buffer */
-    YY_CHAR *yy_buf_pos;    /* current position in input buffer */
-
-    /* size of input buffer in bytes, not including room for EOB characters*/
-    int yy_buf_size;
-
-    /* number of characters read into yy_ch_buf, not including EOB characters */
-    int yy_n_chars;
-
-    int yy_eof_status;      /* whether we've seen an EOF on this buffer */
-
-#define EOF_NOT_SEEN 0
-
-    /* "pending" happens when the EOF has been seen but there's still
-     * some text process
-     */
-
-#define EOF_PENDING 1
-#define EOF_DONE 2
-};
-
-static YY_BUFFER_STATE yy_current_buffer;
-
-/* we provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state"
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed */
-static YY_CHAR yy_hold_char;
-
-static int yy_n_chars;      /* number of characters read into yy_ch_buf */
-
-
-
-#ifndef YY_USER_ACTION
-    #define YY_USER_ACTION
-#endif
-
-#ifndef YY_USER_INIT
-    #define YY_USER_INIT
-#endif
-
-extern YY_CHAR *yytext;
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-YY_CHAR *yytext;
-int yyleng;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-#define YY_END_OF_BUFFER 18
-typedef int yy_state_type;
-static const short int yy_accept[34] =
-    {   0,
-        0,    0,   18,   16,   13,   14,   16,   16,    6,    7,
-       16,    8,   12,   16,    1,   11,    3,    9,   10,    2,
-        0,    5,    0,    0,    0,    4,    1,   15,    3,    5,
-        0,    0,    0
-    } ;
-
-static const YY_CHAR yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    4,    1,    1,    1,    1,    5,    6,
-        7,    8,    9,   10,    9,   11,   12,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
-       14,    1,    1,    1,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       16,   17,   18,    1,   15,    1,   15,   15,   15,   15,
-
-       19,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-       15,   15,    1,   20,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static const YY_CHAR yy_meta[21] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    2,    1,    2,    1,    3,    1,    2,    1
-    } ;
-
-static const short int yy_base[37] =
-    {   0,
-        0,    0,   48,   55,   55,   55,   17,   42,   55,   55,
-       19,   55,   55,   23,   17,   55,    0,   55,   55,    0,
-       18,   55,   19,   23,   21,   55,   12,   55,    0,   24,
-       25,   29,   55,   49,   52,   22
-    } ;
-
-static const short int yy_def[37] =
-    {   0,
-       33,    1,   33,   33,   33,   33,   34,   35,   33,   33,
-       33,   33,   33,   33,   33,   33,   36,   33,   33,   36,
-       34,   33,   34,   34,   35,   33,   33,   33,   36,   34,
-       34,   34,    0,   33,   33,   33
-    } ;
-
-static const short int yy_nxt[76] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,    4,   11,   12,
-       13,   14,   15,   16,   17,   18,    4,   19,   20,    4,
-       22,   22,   30,   29,   27,   26,   22,   22,   30,   27,
-       28,   27,   30,   23,   23,   23,   24,   24,   24,   31,
-       23,   32,   24,   24,   24,   23,   26,   33,   24,   21,
-       21,   21,   25,   25,    3,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33
-    } ;
-
-static const short int yy_chk[76] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        7,   21,   23,   36,   27,   25,   24,   30,   31,   15,
-       14,   11,   32,    7,   21,   23,    7,   21,   23,   24,
-       30,   31,   24,   30,   31,   32,    8,    3,   32,   34,
-       34,   34,   35,   35,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-       33,   33,   33,   33,   33
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static YY_CHAR *yy_last_accepting_cpos;
-
-/* the intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-
-/* these variables are all declared out here so that section 3 code can
- * manipulate them
- */
-/* points to current character in buffer */
-static YY_CHAR *yy_c_buf_p = (YY_CHAR *) 0;
-static int yy_init = 1;     /* whether we need to initialize */
-static int yy_start = 0;    /* start state number */
-
-/* flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yyunput YY_PROTO(( YY_CHAR c, YY_CHAR *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-#define yy_new_buffer yy_create_buffer
-
-#ifdef __cplusplus
-  static int yyinput YY_PROTO(( void ));
-#else
-  static int input YY_PROTO(( void ));
-#endif
-
-YY_DECL
-    {
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp, *yy_bp;
-    register int yy_act;
-
-
-
-
-    if ( yy_init )
-    {
-        YY_USER_INIT;
-
-        if ( ! yy_start )
-            yy_start = 1; /* first start state */
-
-        if ( ! yyin )
-            yyin = stdin;
-
-        if ( ! yyout )
-            yyout = stdout;
-
-        if ( yy_current_buffer )
-            yy_init_buffer( yy_current_buffer, yyin );
-        else
-            yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-        yy_load_buffer_state();
-
-        yy_init = 0;
-    }
-
-#if !defined(__VISAGECPP__)
-    while ( 1 ) /* loops until end-of-file is reached */
-#else
-    os2var = 1;
-    if (os2var == 0) return 0;
-    while ( os2var == 1 )   /* loops until end-of-file is reached */
-#endif
-    {
-        yy_cp = yy_c_buf_p;
-
-        /* support of yytext */
-        *yy_cp = yy_hold_char;
-
-        /* yy_bp points to the position in yy_ch_buf of the start of the
-         * current run.
-         */
-        yy_bp = yy_cp;
-
-        yy_current_state = yy_start;
-yy_match:
-        do
-        {
-            register YY_CHAR yy_c = yy_ec[*yy_cp];
-            if ( yy_accept[yy_current_state] )
-            {
-                yy_last_accepting_state = yy_current_state;
-                yy_last_accepting_cpos = yy_cp;
-            }
-            while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-            {
-                yy_current_state = yy_def[yy_current_state];
-                if ( yy_current_state >= 34 )
-                    yy_c = yy_meta[yy_c];
-            }
-            yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-            ++yy_cp;
-        }
-        while ( yy_current_state != 33 );
-        yy_cp = yy_last_accepting_cpos;
-        yy_current_state = yy_last_accepting_state;
-
-yy_find_action:
-        yy_act = yy_accept[yy_current_state];
-
-        YY_DO_BEFORE_ACTION;
-        YY_USER_ACTION;
-
-do_action: /* this label is used only to access EOF actions */
-
-
-        switch ( yy_act )
-        {
-            case 0: /* must backtrack */
-            {
-                /* undo the effects of YY_DO_BEFORE_ACTION */
-                *yy_cp = yy_hold_char;
-                yy_cp = yy_last_accepting_cpos;
-                yy_current_state = yy_last_accepting_state;
-                goto yy_find_action;
-            }
-
-            case 1:
-            {
-                yylval.s = strdup((const char*) yytext);
-                return INTEGER;
-            }
-
-            case 2:
-            {
-                return EXP;
-            }
-
-            case 3:
-            {
-                yylval.s = strdup((const char*) yytext);
-                return WORD;
-            }
-
-            case 4:
-            {
-                int len = strlen((const char*) yytext);
-                yytext[len-1] = 0;
-                yylval.s = strdup((const char*) (yytext+1));
-                return WORD;
-            }
-
-            case 5:
-            {
-                yylval.s = strdup((const char*) yytext);
-                return STRING;
-            }
-
-            case 6:
-            {
-                return OPEN;
-            }
-
-            case 7:
-            {
-                return CLOSE;
-            }
-
-            case 8:
-            {
-                return COMMA;
-            }
-
-            case 9:
-            {
-                return OPEN_SQUARE;
-            }
-
-            case 10:
-            {
-                return CLOSE_SQUARE;
-            }
-
-            case 11:
-            {
-                return EQUALS;
-            }
-
-            case 12:
-            {
-                return PERIOD;
-            }
-
-            case 13:
-            {
-                break;
-            }
-
-            case 14:
-            {
-                break;
-            }
-
-            case 15:
-            {
-            loop:
-#ifdef __cplusplus
-                while (yyinput() != '*') ;
-                switch (yyinput())
-#else
-                while (input() != '*') ;
-                switch (input())
-#endif
-                {
-                    case '/':
-                        break;
-                    case '*':
-                        unput('*');
-                    default:
-                        goto loop;
-                }
-                break;
-            }
-
-            case 16:
-            {
-                return ERROR;
-            }
-
-            case 17:
-            {
-                ECHO;
-                break;
-            }
-
-            case YY_STATE_EOF(INITIAL):
-            {
-                yyterminate();
-            }
-
-            case YY_END_OF_BUFFER:
-            {
-                /* amount of text matched not including the EOB char */
-                int yy_amount_of_matched_text = yy_cp - yytext - 1;
-
-                /* undo the effects of YY_DO_BEFORE_ACTION */
-                *yy_cp = yy_hold_char;
-
-                /* note that here we test for yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the end-
-                 * of-buffer state).  Contrast this with the test in yyinput().
-                 */
-                if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-                /* this was really a NUL */
-                {
-                    yy_state_type yy_next_state;
-
-                    yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
-                    yy_current_state = yy_get_previous_state();
-
-                    /* okay, we're now positioned to make the
-                     * NUL transition.  We couldn't have
-                     * yy_get_previous_state() go ahead and do it
-                     * for us because it doesn't know how to deal
-                     * with the possibility of jamming (and we
-                     * don't want to build jamming into it because
-                     * then it will run more slowly)
-                     */
-
-                    yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-                    yy_bp = yytext + YY_MORE_ADJ;
-
-                    if ( yy_next_state )
-                    {
-                        /* consume the NUL */
-                        yy_cp = ++yy_c_buf_p;
-                        yy_current_state = yy_next_state;
-                        goto yy_match;
-                    }
-                    else
-                    {
-                        yy_cp = yy_last_accepting_cpos;
-                        yy_current_state = yy_last_accepting_state;
-                        goto yy_find_action;
-                    }
-                }
-                else switch ( yy_get_next_buffer() )
-                {
-                    case EOB_ACT_END_OF_FILE:
-                    {
-                        yy_did_buffer_switch_on_eof = 0;
-
-                        if ( yywrap() )
-                        {
-                            /* note: because we've taken care in
-                             * yy_get_next_buffer() to have set up yytext,
-                             * we can now set up yy_c_buf_p so that if some
-                             * total hoser (like flex itself) wants
-                             * to call the scanner after we return the
-                             * YY_NULL, it'll still work - another YY_NULL
-                             * will get returned.
-                             */
-                            yy_c_buf_p = yytext + YY_MORE_ADJ;
-
-                            yy_act = YY_STATE_EOF((yy_start - 1) / 2);
-                            goto do_action;
-                        }
-                        else
-                        {
-                            if ( ! yy_did_buffer_switch_on_eof )
-                                YY_NEW_FILE;
-                        }
-                    }
-                    break;
-
-                    case EOB_ACT_CONTINUE_SCAN:
-                        yy_c_buf_p = yytext + yy_amount_of_matched_text;
-
-                        yy_current_state = yy_get_previous_state();
-
-                        yy_cp = yy_c_buf_p;
-                        yy_bp = yytext + YY_MORE_ADJ;
-                        goto yy_match;
-
-                    case EOB_ACT_LAST_MATCH:
-                        yy_c_buf_p = &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-                        yy_current_state = yy_get_previous_state();
-
-                        yy_cp = yy_c_buf_p;
-                        yy_bp = yytext + YY_MORE_ADJ;
-                        goto yy_find_action;
-                }
-            }
-            break;
-
-            default:
-#ifdef FLEX_DEBUG
-                printf( "action # %d\n", yy_act );
-#endif
-                YY_FATAL_ERROR("fatal flex scanner internal error--no action found" );
-        }
-    }
-
-#if defined(__VISAGECPP__)
-    /* VA complains about proc maybe not returning a value so return one */
-    return 0;
-#endif
-}
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * synopsis
- *     int yy_get_next_buffer();
- *
- * returns a code representing an action
- *     EOB_ACT_LAST_MATCH -
- *     EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *     EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-{
-    register YY_CHAR *dest = yy_current_buffer->yy_ch_buf;
-    register YY_CHAR *source = yytext - 1; /* copy prev. char, too */
-    register int number_to_move, i;
-    int ret_val;
-
-    if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-        YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" );
-
-    /* try to read more data */
-
-    /* first move last chars to start of buffer */
-    number_to_move = yy_c_buf_p - yytext;
-
-    for ( i = 0; i < number_to_move; ++i )
-        *(dest++) = *(source++);
-
-    if ( yy_current_buffer->yy_eof_status != EOF_NOT_SEEN )
-        /* don't do the read, it's not guaranteed to return an EOF,
-         * just force an EOF
-         */
-        yy_n_chars = 0;
-
-    else
-    {
-        int num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-        if ( num_to_read > YY_READ_BUF_SIZE )
-            num_to_read = YY_READ_BUF_SIZE;
-
-        else if ( num_to_read <= 0 )
-            YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" );
-
-        /* read in more data */
-        YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-            yy_n_chars, num_to_read );
-    }
-
-    if ( yy_n_chars == 0 )
-    {
-        if ( number_to_move == 1 )
-        {
-            ret_val = EOB_ACT_END_OF_FILE;
-            yy_current_buffer->yy_eof_status = EOF_DONE;
-        }
-
-        else
-        {
-            ret_val = EOB_ACT_LAST_MATCH;
-            yy_current_buffer->yy_eof_status = EOF_PENDING;
-        }
-    }
-
-    else
-        ret_val = EOB_ACT_CONTINUE_SCAN;
-
-    yy_n_chars += number_to_move;
-    yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-    yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-    /* yytext begins at the second character in yy_ch_buf; the first
-     * character is the one which preceded it before reading in the latest
-     * buffer; it needs to be kept around in case it's a newline, so
-     * yy_get_previous_state() will have with '^' rules active
-     */
-
-    yytext = &yy_current_buffer->yy_ch_buf[1];
-
-    return ( ret_val );
-}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
- *
- * synopsis
- *     yy_state_type yy_get_previous_state();
- */
-
-static yy_state_type yy_get_previous_state()
-{
-    register yy_state_type yy_current_state;
-    register YY_CHAR *yy_cp;
-
-    yy_current_state = yy_start;
-
-    for ( yy_cp = yytext + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-    {
-        register YY_CHAR yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1);
-        if ( yy_accept[yy_current_state] )
-        {
-            yy_last_accepting_state = yy_current_state;
-            yy_last_accepting_cpos = yy_cp;
-        }
-        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-        {
-            yy_current_state = yy_def[yy_current_state];
-            if ( yy_current_state >= 34 )
-                yy_c = yy_meta[yy_c];
-        }
-        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-    }
-
-    return ( yy_current_state );
-}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *     next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( register yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-register yy_state_type yy_current_state;
-#endif
-{
-    register int yy_is_jam;
-    register YY_CHAR *yy_cp = yy_c_buf_p;
-
-    register YY_CHAR yy_c = 1;
-    if ( yy_accept[yy_current_state] )
-    {
-        yy_last_accepting_state = yy_current_state;
-        yy_last_accepting_cpos = yy_cp;
-    }
-    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-    {
-        yy_current_state = yy_def[yy_current_state];
-        if ( yy_current_state >= 34 )
-            yy_c = yy_meta[yy_c];
-    }
-    yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-    yy_is_jam = (yy_current_state == 33);
-
-    return ( yy_is_jam ? 0 : yy_current_state );
-}
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( YY_CHAR c, register YY_CHAR *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-YY_CHAR c;
-register YY_CHAR *yy_bp;
-#endif
-{
-    register YY_CHAR *yy_cp = yy_c_buf_p;
-
-    /* undo effects of setting up yytext */
-    *yy_cp = yy_hold_char;
-
-    if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-    { /* need to shift things up to make room */
-        register int number_to_move = yy_n_chars + 2; /* +2 for EOB chars */
-        register YY_CHAR *dest =
-            &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2];
-        register YY_CHAR *source =
-            &yy_current_buffer->yy_ch_buf[number_to_move];
-
-        while ( source > yy_current_buffer->yy_ch_buf )
-            *--dest = *--source;
-
-        yy_cp += dest - source;
-        yy_bp += dest - source;
-        yy_n_chars = yy_current_buffer->yy_buf_size;
-
-        if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-            YY_FATAL_ERROR( "flex scanner push-back overflow" );
-    }
-
-    if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
-        yy_cp[-2] = '\n';
-
-    *--yy_cp = c;
-
-    /* note: the formal parameter *must* be called "yy_bp" for this
-     *       macro to now work correctly
-     */
-    YY_DO_BEFORE_ACTION; /* set up yytext again */
-}
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-{
-    int c;
-    YY_CHAR *yy_cp = yy_c_buf_p;
-
-    *yy_cp = yy_hold_char;
-
-    if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-    {
-        /* yy_c_buf_p now points to the character we want to return.
-         * If this occurs *before* the EOB characters, then it's a
-         * valid NUL; if not, then we've hit the end of the buffer.
-         */
-        if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-        { /* this was really a NUL */
-           *yy_c_buf_p = '\0';
-        }
-        else
-        { /* need more input */
-            yytext = yy_c_buf_p;
-            ++yy_c_buf_p;
-
-            switch ( yy_get_next_buffer() )
-            {
-                case EOB_ACT_END_OF_FILE:
-                {
-                    if ( yywrap() )
-                    {
-                        yy_c_buf_p = yytext + YY_MORE_ADJ;
-                        return ( EOF );
-                    }
-                    YY_NEW_FILE;
-
-#ifdef __cplusplus
-                    return ( yyinput() );
-#else
-                    return ( input() );
-#endif
-                }
-
-                case EOB_ACT_CONTINUE_SCAN:
-                    yy_c_buf_p = yytext + YY_MORE_ADJ;
-                    break;
-
-                case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
-                    YY_FATAL_ERROR( "unexpected last match in yyinput()" );
-#else
-                    YY_FATAL_ERROR( "unexpected last match in input()" );
-#endif
-            }
-        }
-    }
-
-    c = *yy_c_buf_p;
-    yy_hold_char = *++yy_c_buf_p;
-
-    return ( c );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-{
-    yy_init_buffer( yy_current_buffer, input_file );
-    yy_load_buffer_state();
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-{
-    if ( yy_current_buffer == new_buffer )
-        return;
-
-    if ( yy_current_buffer )
-    {
-        /* flush out information for old buffer */
-        *yy_c_buf_p = yy_hold_char;
-        yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-        yy_current_buffer->yy_n_chars = yy_n_chars;
-    }
-
-    yy_current_buffer = new_buffer;
-    yy_load_buffer_state();
-
-    /* we don't actually know whether we did this switch during
-     * EOF (yywrap()) processing, but the only time this flag
-     * is looked at is after yywrap() is called, so it's safe
-     * to go ahead and always set it.
-     */
-    yy_did_buffer_switch_on_eof = 1;
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-{
-    yy_n_chars = yy_current_buffer->yy_n_chars;
-    yytext = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-    yyin = yy_current_buffer->yy_input_file;
-    yy_hold_char = *yy_c_buf_p;
-}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-{
-    YY_BUFFER_STATE b;
-
-    b = (YY_BUFFER_STATE) malloc( sizeof( struct yy_buffer_state ) );
-
-    if ( ! b )
-        YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-    b->yy_buf_size = size;
-
-    /* yy_ch_buf has to be 2 characters longer than the size given because
-     * we need to put in 2 end-of-buffer characters.
-     */
-    b->yy_ch_buf = (YY_CHAR *) malloc( (unsigned) (b->yy_buf_size + 2) );
-
-    if ( ! b->yy_ch_buf )
-        YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-    yy_init_buffer( b, file );
-
-    return ( b );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-{
-    if ( b == yy_current_buffer )
-        yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-    free( (char *) b->yy_ch_buf );
-    free( (char *) b );
-}
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-{
-    b->yy_input_file = file;
-
-    /* we put in the '\n' and start reading from [1] so that an
-     * initial match-at-newline will be true.
-     */
-
-    b->yy_ch_buf[0] = '\n';
-    b->yy_n_chars = 1;
-
-    /* we always need two end-of-buffer characters.  The first causes
-     * a transition to the end-of-buffer state.  The second causes
-     * a jam in that state.
-     */
-    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-    b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
-    b->yy_buf_pos = &b->yy_ch_buf[1];
-
-    b->yy_eof_status = EOF_NOT_SEEN;
-}
-/* # line 108 "lexer.l" */
-
-
-
-#ifdef FLEX_SCANNER
-    static int lex_input()
-    {
-  return input();
-    }
-#else /* BSD/AT&T lex */
-    #ifndef input
-        #error "Sorry, but need either flex or AT&T lex"
-    #endif
-    static int lex_input() {
-  return input();
-    }
-
-    /*
-    # undef unput
-    # define unput(_c) my_unput(_c)
-    */
-
-    # undef input
-    # define input() my_input()
-    static int my_unput(char c)
-    {
-        if (lex_read_from_string)
-        {
-    /* Make sure we have something */
-            if (lex_string_ptr)
-            {
-      if (c == '\n') yylineno--;
-      lex_string_ptr--;
-    }
-        }
-        else
-        {
-    yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
-            /* unput(c); Causes infinite recursion! */
-  }
-  return c;
-    }
-#endif
-
-/* Public */
-void LexFromFile(FILE *fd)
-{
-  lex_read_from_string = 0;
-  yyin = fd;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
-  lex_read_from_string = 1;
-  lex_buffer = buffer;
-  lex_buffer_length = strlen((const char*) buffer);
-  lex_string_ptr = 0;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
-    if (lex_read_from_string)
-    {
-        if (lex_string_ptr == lex_buffer_length)
-        {
-            return 0;
-        }
-        else
-        {
-            char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
-            if (c == '\n') yylineno++;
-#endif
-                return c;
-        }
-    }
-    else
-    {
-        return lex_input();
-    }
-}
-
-void wxExprCleanUp()
-{
-    if (yy_current_buffer)
-        yy_delete_buffer(yy_current_buffer);
-}
-
-#ifdef __VISUALC__
-    #pragma warning(pop)
-#endif
diff --git a/contrib/src/deprecated/dosyacc.c b/contrib/src/deprecated/dosyacc.c
deleted file mode 100644
index 6b03b4159d..0000000000
--- a/contrib/src/deprecated/dosyacc.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/* Copyright: (c) Julian Smart */
-/* Licence:   wxWindows Licence */
-/* include platform.h first to get __WIN32__ definition */
-
-#include "wx/platform.h"
-#include "wx/setup.h"
-#include "wx/deprecated/setup.h"
-
-#if !defined(wxUSE_PROLOGIO) || wxUSE_PROLOGIO
-
-#ifdef __VISUALC__
-    #pragma warning(push)
-    #pragma warning(disable:4244) /* warning C4244: '=' : conversion from 'A' to 'B', possible loss of data */
-#endif
-
-#if !defined(lint) && 0
-static char yysccsid[] = "@(#)yaccpar     1.7 (Berkeley) 09/09/90";
-#endif
-#define YYBYACC 1
-// #line 2 "parser.y"
-#include "string.h"
-#if defined(_MSC_VER) || defined(__VISAGECPP__)
-#include <io.h>
-#endif
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
- */
-#ifdef LEX_SCANNER
-/* int yyoutput(int); */
-void yyoutput(int);
-#else
-void yyoutput(int);
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-// #line 36 "parser.y"
-typedef union {
-    char *s;
-/*    struct pexpr *expr; */
-} YYSTYPE;
-// #line 44 "y_tab.c"
-#define INTEGER 1
-#define WORD 2
-#define STRING 3
-#define PERIOD 13
-#define OPEN 4
-#define CLOSE 5
-#define COMMA 6
-#define NEWLINE 7
-#define ERROR 8
-#define OPEN_SQUARE 9
-#define CLOSE_SQUARE 10
-#define EQUALS 11
-#define EXP 14
-#define YYERRCODE 256
-short yylhs[] = {                                        -1,
-    0,    0,    1,    1,    1,    2,    2,    2,    3,    3,
-    3,    4,    4,    5,    5,    5,    5,    5,    5,    5,
-};
-short yylen[] = {                                         2,
-    0,    2,    2,    2,    2,    4,    2,    3,    0,    1,
-    3,    3,    1,    1,    1,    1,    3,    3,    5,    1,
-};
-short yydefred[] = {                                      1,
-    0,    0,    0,    0,    2,    0,    5,    3,    0,    0,
-    0,   15,    7,   20,    0,    0,   13,    4,    0,    0,
-    0,    0,    8,    0,    6,    0,   18,    0,   12,   11,
-    0,   19,
-};
-short yydgoto[] = {                                       1,
-    5,   14,   15,   16,   17,
-};
-short yysindex[] = {                                      0,
-   -2,    9,    2,    1,    0,   10,    0,    0,   11,   -5,
-   17,    0,    0,    0,   14,   -1,    0,    0,   33,   38,
-   41,   16,    0,   11,    0,   29,    0,   40,    0,    0,
-   44,    0,
-};
-short yyrindex[] = {                                      0,
-    0,    0,    0,    0,    0,    0,    0,    0,   42,   21,
-   24,    0,    0,    0,    0,   30,    0,    0,    0,    0,
-    0,    0,    0,   31,    0,   27,    0,   24,    0,    0,
-    0,    0,
-};
-short yygindex[] = {                                      0,
-    0,   45,   -8,    0,   26,
-};
-#define YYTABLESIZE 254
-short yytable[] = {                                       3,
-   19,   10,   11,   12,   24,    9,    4,   20,   21,    4,
-   13,   10,   11,   12,    8,   30,   10,   28,   12,    4,
-    9,    7,   18,   23,    4,   16,   16,   22,   14,   14,
-   16,   17,   17,   14,   10,    9,   17,   25,   26,   10,
-    9,   27,   31,    9,   32,    6,    9,   29,    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,    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,    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,    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,
-    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,    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,    0,    0,    0,    0,
-    0,    0,    0,    2,
-};
-short yycheck[] = {                                       2,
-    9,    1,    2,    3,    6,    4,    9,   13,   14,    9,
-   10,    1,    2,    3,   13,   24,    1,    2,    3,    9,
-    4,   13,   13,   10,    9,    5,    6,   11,    5,    6,
-   10,    5,    6,   10,    5,    5,   10,    5,    1,   10,
-   10,    1,   14,    4,    1,    1,    5,   22,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  256,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 14
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file","INTEGER","WORD","STRING","OPEN","CLOSE","COMMA","NEWLINE",
-"ERROR","OPEN_SQUARE","CLOSE_SQUARE","EQUALS",0,"PERIOD","EXP",
-};
-char *yyrule[] = {
-"$accept : commands",
-"commands :",
-"commands : commands command",
-"command : WORD PERIOD",
-"command : expr PERIOD",
-"command : error PERIOD",
-"expr : WORD OPEN arglist CLOSE",
-"expr : OPEN_SQUARE CLOSE_SQUARE",
-"expr : OPEN_SQUARE arglist CLOSE_SQUARE",
-"arglist :",
-"arglist : arg",
-"arglist : arg COMMA arglist",
-"arg : WORD EQUALS arg1",
-"arg : arg1",
-"arg1 : WORD",
-"arg1 : STRING",
-"arg1 : INTEGER",
-"arg1 : INTEGER PERIOD INTEGER",
-"arg1 : INTEGER EXP INTEGER",
-"arg1 : INTEGER PERIOD INTEGER EXP INTEGER",
-"arg1 : expr",
-};
-#endif
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#ifdef YYSTACKSIZE
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#endif
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 600
-#define YYMAXDEPTH 600
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-// #line 118 "parser.y"
-
-#include "doslex.c"
-
-/*
-void yyerror(s)
-char *s;
-{
-  syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
-   the above instead.
- */
-
-void yyerror(char *s)
-{
-  syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* Not sure if __SC__ is the appropriate thing
- * to test
- */
-
-#if 0 /* VS: doesn't work... */
-#ifndef __SC__
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-#  if !(defined(__VISAGECPP__) && __IBMC__ >= 400)
-/* VA 4.0 thinks this is multiply defined (in lex_yy.c) */
-   int yywrap() { return 1; }
-#  endif
-#endif
-#endif
-#endif
-
-// #line 247 "y_tab.c"
-#define YYABORT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-PROIO_yyparse()
-{
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register char *yys;
-    extern char *getenv();
-
-    yys = getenv("YYDEBUG");
-    if (yys)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    yyn = yydefred[yystate];
-    if (yyn != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, reading %d (%s)\n", yystate,
-                    yychar, yys);
-        }
-#endif
-    }
-    yyn = yysindex[yystate];
-    if ((yyn) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("yydebug: state %d, shifting to state %d\n",
-                    yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yyss + yystacksize - 1)
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    yyn = yyrindex[yystate];
-    if ((yyn) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-yynewerror:
-#endif
-    yyerror("syntax error");
-#ifdef lint
-    goto yyerrlab;
-yyerrlab:
-#endif
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            yyn = yysindex[*yyssp];
-            if ((yyn) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("yydebug: state %d, error recovery shifting\
- to state %d\n", *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yyss + yystacksize - 1)
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("yydebug: error recovery discarding state %d\n",
-                            *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, error recovery discards token %d (%s)\n",
-                    yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("yydebug: state %d, reducing by rule %d (%s)\n",
-                yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
-case 3:
-// #line 68 "parser.y"
-{process_command(proio_cons(wxmake_word(yyvsp[-1].s), NULL)); free(yyvsp[-1].s);}
-break;
-case 4:
-// #line 70 "parser.y"
-{process_command(yyvsp[-1].s);}
-break;
-case 5:
-// #line 72 "parser.y"
-{syntax_error("Unrecognized command.");}
-break;
-case 6:
-// #line 76 "parser.y"
-{yyval.s = proio_cons(wxmake_word(yyvsp[-3].s), yyvsp[-1].s); free(yyvsp[-3].s);}
-break;
-case 7:
-// #line 78 "parser.y"
-{yyval.s = proio_cons(NULL, NULL);}
-break;
-case 8:
-// #line 80 "parser.y"
-{yyval.s = yyvsp[-1].s; }
-break;
-case 9:
-// #line 84 "parser.y"
-{yyval.s = NULL;}
-break;
-case 10:
-// #line 86 "parser.y"
-{yyval.s = proio_cons(yyvsp[0].s, NULL);}
-break;
-case 11:
-// #line 89 "parser.y"
-{yyval.s = proio_cons(yyvsp[-2].s, yyvsp[0].s);}
-break;
-case 12:
-// #line 93 "parser.y"
-{yyval.s = proio_cons(wxmake_word("="), proio_cons(wxmake_word(yyvsp[-2].s), proio_cons(yyvsp[0].s, NULL)));
-                         free(yyvsp[-2].s); }
-break;
-case 13:
-// #line 96 "parser.y"
-{yyval.s = yyvsp[0].s; }
-break;
-case 14:
-// #line 99 "parser.y"
-{yyval.s = wxmake_word(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 15:
-// #line 101 "parser.y"
-{yyval.s = wxmake_string(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 16:
-// #line 103 "parser.y"
-{yyval.s = wxmake_integer(yyvsp[0].s); free(yyvsp[0].s);}
-break;
-case 17:
-// #line 105 "parser.y"
-{yyval.s = wxmake_real(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 18:
-// #line 107 "parser.y"
-{yyval.s = wxmake_exp(yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-2].s); free(yyvsp[0].s); }
-break;
-case 19:
-// #line 110 "parser.y"
-{yyval.s = wxmake_exp2(yyvsp[-4].s, yyvsp[-2].s, yyvsp[0].s); free(yyvsp[-4].s); free(yyvsp[-2].s);
-                                                                  free(yyvsp[0].s); }
-break;
-case 20:
-// #line 114 "parser.y"
-{yyval.s = yyvsp[0].s;}
-break;
-// #line 461 "y_tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("yydebug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("yydebug: state %d, reading %d (%s)\n",
-                        YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    yyn = yygindex[yym];
-    if ((yyn) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("yydebug: after reduction, shifting from state %d \
-to state %d\n", *yyssp, yystate);
-#endif
-    if (yyssp >= yyss + yystacksize - 1)
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
-
-#ifdef __VISUALC__
-    #pragma warning(pop)
-#endif
-
-#endif /* wxUSE_PROLOGIO */
diff --git a/contrib/src/deprecated/lexer.l b/contrib/src/deprecated/lexer.l
deleted file mode 100644
index 3b0c75f0b4..0000000000
--- a/contrib/src/deprecated/lexer.l
+++ /dev/null
@@ -1,194 +0,0 @@
-SIGN		[+-]
-DIGIT		[0-9]
-ALPHA		[a-zA-Z_]
-ALPHADIGIT	[a-zA-Z_0-9]
-STRINGCHAR	[^"\\]
-WORDCHAR	[^'\\]
-
-%{
-/*
- * File:         lexer.l
- * Description:  Lexical analyser for PROLOGIO; can be used with
- *               either lex and flex.
- * Copyright:    (c) Julian Smart
- * Licence:      wxWindows Licence
- */
-#include <string.h>
-#include <unistd.h>
-
-/* +++steve162e: added, otherwise, PROIO_input will be undefined (at least under LINUX)
-             please check, if this is also TRUE under other UNIXes.
- */
-
-#if defined(FLEX_SCANNER) && defined(_LINUX)
-#define PROIO_input my_input
-#endif
-/* ---steve162e */
-
-#include "wx/deprecated/expr.h"
-
-#define Return(x) return x;
-
-#if defined(VMS) && !defined(strdup)
-#define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
-#endif
-
-static size_t lex_buffer_length = 0;
-static const char *lex_buffer = NULL;
-static size_t lex_string_ptr = 0;
-static int lex_read_from_string = 0;
-
-static int my_input(void);
-
-#ifdef FLEX_SCANNER
-# undef YY_INPUT
-# define YY_INPUT(buf,result,max_size) \
-   if (lex_read_from_string) \
-   {  int c = my_input(); result = (c == 0) ? YY_NULL : ((buf)[0]=(c), 1); } \
-   else \
-	if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
-	    YY_FATAL_ERROR( "read() in flex scanner failed" );
-#else
-# undef unput
-# define unput(_c) my_unput(_c)
-  static int my_unput(char);
-#endif
-
-%}
-
-%%
-
-{SIGN}?{DIGIT}+			  {yylval.s = strdup(yytext); Return(INTEGER);}
-
-"e"                               Return(EXP);
-
-{ALPHA}{ALPHADIGIT}*		  {yylval.s = strdup(yytext); Return(WORD);}
-
-"'"{WORDCHAR}*"'"	          {int len = strlen(yytext);
-                                   yytext[len-1] = 0;
-                                   yylval.s = strdup(yytext+1);
-                                   Return(WORD);}
-
-\"({STRINGCHAR}|\\\"|\|\\\\|\\)*\"  {yylval.s = strdup(yytext); Return(STRING);}
-
-"("				  Return(OPEN);
-
-")"				  Return(CLOSE);
-
-","				  Return(COMMA);
-
-"["                               Return(OPEN_SQUARE);
-
-"]"                               Return(CLOSE_SQUARE);
-
-"="                               Return(EQUALS);
-
-"."				  Return(PERIOD);
-
-[ \t]				  ;
-
-\n				  ;
-
-"/*"    {       loop:
-#ifdef __cplusplus
-                          while (yyinput() != '*');
-                          switch (yyinput())
-#else
-                          while (input() != '*');
-                          switch (input())
-#endif
-                                  {
-                                  case '/': break;
-                                  case '*': unput('*');
-                                  default: goto loop;
-                                  }
-                          }
-
-.				  Return(ERROR);
-
-%%
-
-
-#ifdef FLEX_SCANNER
-static int lex_input() {
-  return input();
-}
-#else	/* BSD/AT&T lex */
-#ifndef input
-# error "Sorry, but need either flex or AT&T lex"
-#endif
-static int lex_input() {
-  return input();
-}
-
-# undef input
-# define input() my_input()
-static int my_unput(char c)
-{
-  if (lex_read_from_string != 0) {
-    /* Make sure we have something */
-    if (lex_string_ptr) {
-      if (c == '\n') yylineno--;
-      lex_string_ptr--;
-    }
-  } else {
-    yytchar= (c);if(yytchar=='\n')yylineno--;*yysptr++=yytchar;
-/*    unput(c); Causes infinite recursion! */
-  }
-  return c;
-}
-
-#endif
-
-/* Public */
-void LexFromFile(FILE *fd)
-{
-  lex_read_from_string = 0;
-  yyin = fd;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yyrestart(fd);
-  yy_init = 1;
-#endif
-}
-
-void LexFromString(char *buffer)
-{
-  lex_read_from_string = 1;
-  lex_buffer = buffer;
-  lex_buffer_length = strlen(buffer);
-  lex_string_ptr = 0;
-  /* Don't know why this is necessary, but otherwise
-   * lex only works _once_!
-   */
-#ifdef FLEX_SCANNER
-  yy_init = 1;
-#endif
-}
-
-static int my_input( void )
-{
-  if (lex_read_from_string) {
-    if (lex_string_ptr == lex_buffer_length)
-      return 0;
-    else {
-      char c = lex_buffer[lex_string_ptr++];
-#ifndef FLEX_SCANNER
-      if (c == '\n') yylineno++;
-#endif
-      return c;
-    }
-  } else {
-    return lex_input();
-  }
-}
-
-void wxExprCleanUp()
-{
-#ifdef FLEX_SCANNER
-	if (yy_current_buffer)
-		yy_delete_buffer(yy_current_buffer);
-#endif
-}
diff --git a/contrib/src/deprecated/parser.y b/contrib/src/deprecated/parser.y
deleted file mode 100644
index 91e3b95320..0000000000
--- a/contrib/src/deprecated/parser.y
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Version: $Id$ */
-/* Copyright:    (c) Julian Smart */
-/* Licence:      wxWindows Licence */
- %{
-#include "wx/setup.h"
-#include <string.h>
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-#if defined(__GNUWIN32__) && !defined(__TWIN32__)
-#include <sys/unistd.h>
-#endif
-
-#include "wx/deprecated/expr.h"
-
-#ifndef __EXTERN_C__
-#define __EXTERN_C__ 1
-#endif
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-extern "C" {
-#endif
-#endif
-int yylex(void);
-int yylook(void);
-int yywrap(void);
-int yyback(int *, int);
-void yyerror(char *);
-
-/* You may need to put /DLEX_SCANNER in your makefile
- * if you're using LEX!
- */
-void yyoutput(int);
-
-#if defined(__cplusplus) || defined(__STDC__)
-#if defined(__cplusplus) && defined(__EXTERN_C__)
-}
-#endif
-#endif
-%}
-
-%union {
-    char *s;
-/*    struct pexpr *expr; */
-}
-
-
-%start commands
-
-%token <s> INTEGER 1
-%token <s> WORD 2
-%token <s> STRING 3
-%token <s> PERIOD 13
-%token OPEN 4
-%token CLOSE 5
-%token COMMA 6
-%token NEWLINE 7
-%token ERROR 8
-%token OPEN_SQUARE 9
-%token CLOSE_SQUARE 10
-%token EQUALS 11
-%token EXP 14
-
-/* %type <expr> command expr arglist arg arg1 */
-%type <s> command expr arglist arg arg1
-
-%%
-
-commands :	/* empty */
-	|	commands command
-	;
-
-command	:       WORD PERIOD
-			{process_command(proio_cons(wxmake_word($1), NULL)); free($1);}
-        |       expr PERIOD
-			{process_command($1);}
-	|	error PERIOD
-			{syntax_error("Unrecognized command.");}
-	;
-
-expr	:	WORD OPEN arglist CLOSE 
-			{$$ = proio_cons(wxmake_word($1), $3); free($1);}
-	|	OPEN_SQUARE arglist CLOSE_SQUARE
-			{$$ = $2; }
-	;
-
-arglist	:
-			{$$ = proio_cons(NULL, NULL);}
-	|	arg
-			{$$ = proio_cons($1, NULL);}
-	|
-		arg COMMA arglist
-			{$$ = proio_cons($1, $3);}
-	;
-
-arg	:	WORD EQUALS arg1
-			{$$ = proio_cons(wxmake_word("="), proio_cons(wxmake_word($1), proio_cons($3, NULL)));
-                         free($1); }
-	|	arg1
-			{$$ = $1; }
-	;
-
-arg1	:	WORD
-			{$$ = wxmake_word($1); free($1);}
-	|	STRING
-			{$$ = wxmake_string($1); free($1);}
-	|	INTEGER
-			{$$ = wxmake_integer($1); free($1);}
-	|	INTEGER PERIOD INTEGER
-			{$$ = wxmake_real($1, $3); free($1); free($3); }
-        |       INTEGER EXP INTEGER
-                         {$$ = wxmake_exp($1, $3); free($1); free($3); }
-        |
-              INTEGER PERIOD INTEGER EXP INTEGER
-                         {$$ = wxmake_exp2($1, $3, $5); free($1); free($3);
-                                                                  free($5); }
-
-	|	expr
-			{$$ = $1;}
-	;
-
-%%
-
-/* We include lexer.c if we are building for gtk, wine or motif
- * and also whenever we are using configure (marked by __WX_SETUP_H__) for,
- * for example, cross compilation. */
-#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
-#include "lexer.c"
-#elif defined(__WXMAC__) && defined(__APPLE__)
-#include "lexer.c"
-#elif defined(__MWERKS__)
-#include "cwlex_yy.c"
-#else
-#include "lex_yy.c"
-#endif
-
-/*
-void yyerror(s)
-char *s;
-{
-  syntax_error(s);
-}
-*/
-
-/* Ansi prototype. If this doesn't work for you... uncomment
-   the above instead.
- */
-
-void yyerror(char *s)
-{
-  syntax_error(s);
-}
-
-/*
- * Unfortunately, my DOS version of FLEX
- * requires yywrap to be #def'ed, whereas
- * the UNIX flex expects a proper function.
- */
-
-/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd.
- * RL: ... but on Debian/Alpha(linux) it must not, so hopefully
- *     testing for __OSF__ here is what we really want.
- */
-#ifdef __OSF__
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#else
-/* HH: Added test for __WX_SETUP_H__ for gnuwin builds
- * using configure */ 
-#if !defined(__SC__) && !defined(__GNUWIN32__) 
-#ifdef USE_DEFINE
-#ifndef yywrap
-#define yywrap() 1
-#endif
-#elif !defined(__ultrix)
-int yywrap() { return 1; }
-#elif defined(__VMS__)
-int yywrap() { return 1; }
-#endif
-#elif defined(__WX_SETUP_H__)
-int yywrap() { return 1; }
-#endif
-#endif
-
diff --git a/contrib/src/deprecated/prop.cpp b/contrib/src/deprecated/prop.cpp
deleted file mode 100644
index 7f7d122551..0000000000
--- a/contrib/src/deprecated/prop.cpp
+++ /dev/null
@@ -1,1169 +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 licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/debug.h"
-#include "wx/deprecated/prop.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
-    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-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)
-    : wxObject()
-{
-  m_value.string = (wxChar*) NULL;
-  m_modifiedFlag = false;
-  Copy((wxPropertyValue& )copyFrom);
-}
-
-wxPropertyValue::wxPropertyValue(const wxChar *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(val.c_str());
-  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(wxChar **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;
-
-  wxObjectList::compatibility_iterator node = the_list->GetFirst();
-  while (node)
-  {
-    wxPropertyValue *expr = (wxPropertyValue *)node->GetData();
-    Append(expr);
-    node = node->GetNext();
-  }
-
-  delete the_list;
-}
-
-wxPropertyValue::wxPropertyValue(wxStringList *the_list)
-{
-  m_modifiedFlag = false;
-  m_type = wxPropertyValueList;
-  m_clientData = NULL;
-  m_last = NULL;
-  m_value.first = NULL;
-
-  wxStringList::compatibility_iterator node = the_list->GetFirst();
-  while (node)
-  {
-    wxString s = node->GetData();
-    Append(new wxPropertyValue(s));
-    node = node->GetNext();
-  }
-  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:
-    wxFAIL_MSG( wxT("Should never get here!\n" ) );
-    break;
-  }
-  return NULL;
-}
-
-void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
-{
-  if (m_type == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-  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:
-    {
-      wxChar** s = copyFrom.StringValuePtr();
-
-#if 0
-      // what is this? are you trying to assign a bool or a string?  VA can't figure it out..
-#if defined(__VISAGECPP__) || defined( __VISUALC__ )
-      (*this) = s;
-#else
-      (*this) = s != 0;
-#endif
-#endif // if 0
-
-      (*this) = (bool)(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:
-    wxFAIL_MSG( wxT("Should never get here!\n" ) );
-    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(wxString& 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.Append( wxT("(") );
-    node = node->m_next;
-    bool first = true;
-    while (node)
-    {
-      if (!first)
-        stream.Append( wxT("  ") );
-      node->WritePropertyType(stream);
-      node = node->m_next;
-      if (node)
-        stream.Append( wxT(",\n" ) );
-      first = false;
-    }
-    stream.Append( wxT(").\n\n") );
-  }
-}
-
-void wxPropertyValue::WritePropertyType(wxString& stream)    // Write as any other subexpression
-{
-  wxString tmp;
-  switch (m_type)
-  {
-    case wxPropertyValueInteger:
-    {
-      tmp.Printf( wxT("%ld"), m_value.integer );
-      stream.Append( tmp );
-      break;
-    }
-    case wxPropertyValueIntegerPtr:
-    {
-      tmp.Printf( wxT("%ld"), *m_value.integerPtr );
-      stream.Append( tmp );
-      break;
-    }
-    case wxPropertyValuebool:
-    {
-      if (m_value.integer)
-        stream.Append( wxT("True") );
-      else
-        stream.Append( wxT("False") );
-      break;
-    }
-    case wxPropertyValueboolPtr:
-    {
-      if (*m_value.integerPtr)
-        stream.Append( wxT("True") );
-      else
-        stream.Append( wxT("False") );
-      break;
-    }
-    case wxPropertyValueReal:
-    {
-      double d = m_value.real;
-      tmp.Printf( wxT("%.6g"), d );
-      stream.Append( tmp );
-      break;
-    }
-    case wxPropertyValueRealPtr:
-    {
-      double d = *m_value.realPtr;
-      tmp.Printf( wxT("%.6g"), d );
-      stream.Append( tmp );
-      break;
-    }
-    case wxPropertyValueString:
-    {
-      stream.Append( m_value.string );
-      break;
-    }
-    case wxPropertyValueStringPtr:
-    {
-      wxFAIL_MSG( wxT("wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented") );
-      /*
-      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.Append( wxT("[]") );
-      else
-      {
-        wxPropertyValue *expr = m_value.first;
-
-        stream.Append( wxT("[") );
-        while (expr)
-        {
-          expr->WritePropertyType(stream);
-          expr = expr->m_next;
-          if (expr)
-        stream.Append( wxT(", ") );
-        }
-        stream.Append( wxT("]") );
-      }
-      break;
-    }
-   case wxPropertyValueNull: break;
-  }
-}
-
-wxString wxPropertyValue::GetStringRepresentation(void)
-{
-  wxString str;
-  WritePropertyType(str);
-  return str;
-}
-
-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 wxChar *val = (const wxChar *)val1;
-
-  m_modifiedFlag = true;
-
-  wxPropertyValueType oldType = m_type;
-  if (oldType == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-
-  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)
-  {
-    wxFAIL_MSG( wxT("Shouldn't try to assign a wxString reference to a char* pointer.") );
-    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)
-{
-  wxPropertyValueType oldType = m_type;
-  if (oldType == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-
-  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)
-{
-  wxPropertyValueType oldType = m_type;
-  if (oldType == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-
-  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)
-{
-  wxPropertyValueType oldType = m_type;
-  if (oldType == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-
-  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 wxChar **val)
-{
-  wxPropertyValueType oldType = m_type;
-  if (oldType == wxPropertyValueString)
-  {
-    delete[] m_value.string ;
-    m_value.string = NULL;
-  }
-
-  m_modifiedFlag = true;
-  m_type = wxPropertyValueStringPtr;
-
-  if (val)
-    m_value.stringPtr = (wxChar **)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;
-}
-
-wxChar *wxPropertyValue::StringValue(void) const {
-    if (m_type == wxPropertyValueString)
-      return m_value.string;
-    else if (m_type == wxPropertyValueStringPtr)
-      return *(m_value.stringPtr);
-    else return NULL;
-  }
-
-wxChar **wxPropertyValue::StringValuePtr(void) const
-{
-  return m_value.stringPtr;
-}
-
-/*
- * A property (name plus value)
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
-
-wxProperty::wxProperty(void)
-{
-  m_propertyRole = wxEmptyString;
-  m_propertyValidator = NULL;
-  m_propertyWindow = NULL;
-  m_enabled = true;
-}
-
-wxProperty::wxProperty(wxProperty& copyFrom)
-    : wxObject()
-{
-  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_value(val), m_name(nm), 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();
-
-  wxObjectList::compatibility_iterator node = m_validatorRegistryList.GetFirst();
-  while (node)
-  {
-    wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->GetData();
-    wxPropertyValidator *validator = registry->GetValidator(property->GetRole());
-    if (validator)
-      return validator;
-    node = node->GetNext();
-  }
-  return NULL;
-/*
-  if (!wxDefaultPropertyValidator)
-    wxDefaultPropertyValidator = new wxPropertyListValidator;
-  return wxDefaultPropertyValidator;
-*/
-}
-
-/*
- * Property sheet
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject)
-
-wxPropertySheet::wxPropertySheet(const wxString& name)
-:m_properties(wxKEY_STRING),m_name(name)
-{
-}
-
-wxPropertySheet::~wxPropertySheet(void)
-{
-  Clear();
-}
-
-void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
-{
-}
-
-// Add a property
-void wxPropertySheet::AddProperty(wxProperty *property)
-{
-  m_properties.Append((const wxChar*) property->GetName(), property);
-}
-
-// Get property by name
-wxProperty *wxPropertySheet::GetProperty(const wxString& name) const
-{
-  wxObjectList::compatibility_iterator node = m_properties.Find((const wxChar*) name);
-  if (!node)
-    return NULL;
-  else
-    return (wxProperty *)node->GetData();
-}
-
-bool wxPropertySheet::SetProperty(const wxString& name, const wxPropertyValue& value)
-{
-  wxProperty* prop = GetProperty(name);
-  if(prop){
-    prop->SetValue(value);
-    return true;
-  }else{
-    return false;
-  }
-}
-
-void wxPropertySheet::RemoveProperty(const wxString& name)
-{
-  wxObjectList::compatibility_iterator node = m_properties.Find(name);
-  if(node)
-  {
-    wxProperty *prop = (wxProperty *)node->GetData();
-     delete prop;
-    m_properties.Erase(node);
-  }
-}
-
-bool wxPropertySheet::HasProperty(const wxString& name) const
-{
-    return (GetProperty(name)?true:false);
-}
-
-// Clear all properties
-void wxPropertySheet::Clear(void)
-{
-    wxObjectList::compatibility_iterator node = m_properties.GetFirst();
-    while (node)
-    {
-        wxProperty *prop = (wxProperty *)node->GetData();
-        delete prop;
-        node = node->GetNext();
-    }
-    m_properties.Clear();
-}
-
-// Sets/clears the modified flag for each property value
-void wxPropertySheet::SetAllModified(bool flag)
-{
-  wxObjectList::compatibility_iterator node = m_properties.GetFirst();
-  while (node)
-  {
-    wxProperty *prop = (wxProperty *)node->GetData();
-    prop->GetValue().SetModified(flag);
-    node = node->GetNext();
-  }
-}
-
-/*
- * 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 wxChar*) typeName, validator);
-}
-
-wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
-{
-  return (wxPropertyValidator *)Get((const wxChar*) typeName);
-}
-
-void wxPropertyValidatorRegistry::ClearRegistry(void)
-{
-  BeginFind();
-  wxHashTable::Node *node;
-  while ((node = Next()) != NULL)
-  {
-    delete (wxPropertyValidator *)node->GetData();
-  }
-}
-
- /*
-  * Property validator
-  */
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler)
-
-wxPropertyValidator::wxPropertyValidator(long flags)
-{
-  m_validatorFlags = flags;
-  m_validatorProperty = NULL;
-}
-
-wxPropertyValidator::~wxPropertyValidator(void)
-{}
-
-bool wxPropertyValidator::StringToFloat (wxChar *s, float *number) {
-    double num;
-    bool ok = StringToDouble (s, &num);
-    *number = (float) num;
-    return ok;
-}
-
-bool wxPropertyValidator::StringToDouble (wxChar *s, double *number) {
-    bool ok = true;
-    wxChar *value_ptr;
-    *number = wxStrtod (s, &value_ptr);
-    if (value_ptr) {
-        int len = wxStrlen (value_ptr);
-        for (int i = 0; i < len; i++) {
-            ok = (wxIsspace (value_ptr[i]) != 0);
-            if (!ok) return false;
-        }
-    }
-    return ok;
-}
-
-bool wxPropertyValidator::StringToInt (wxChar *s, int *number) {
-    long num;
-    bool ok = StringToLong (s, &num);
-    *number = (int) num;
-    return ok;
-}
-
-bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
-    bool ok = true;
-    wxChar *value_ptr;
-    *number = wxStrtol (s, &value_ptr, 10);
-    if (value_ptr) {
-        int len = wxStrlen (value_ptr);
-        for (int i = 0; i < len; i++) {
-            ok = (wxIsspace (value_ptr[i]) != 0);
-            if (!ok) return false;
-        }
-    }
-    return ok;
-}
-
-wxChar *wxPropertyValidator::FloatToString (float number) {
-    static wxChar buf[20];
-    wxSnprintf (buf, 20, wxT("%.6g"), number);
-    return buf;
-}
-
-wxChar *wxPropertyValidator::DoubleToString (double number) {
-    static wxChar buf[20];
-    wxSnprintf (buf, 20, wxT("%.6g"), number);
-    return buf;
-}
-
-wxChar *wxPropertyValidator::IntToString (int number) {
-    static wxChar buf[20];
-
-    wxSprintf (buf, wxT("%d"), number);
-    return buf;
-}
-
-wxChar *wxPropertyValidator::LongToString (long number) {
-    static wxChar buf[20];
-
-    wxSprintf (buf, wxT("%ld"), number);
-    return buf;
-}
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/propform.cpp b/contrib/src/deprecated/propform.cpp
deleted file mode 100644
index df77fe214d..0000000000
--- a/contrib/src/deprecated/propform.cpp
+++ /dev/null
@@ -1,759 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        propform.cpp
-// Purpose:     Property form classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
-    #include "wx/choice.h"
-    #include "wx/checkbox.h"
-    #include "wx/slider.h"
-    #include "wx/msgdlg.h"
-#endif
-
-#include "wx/deprecated/propform.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-
-/*
-* Property view
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormView, wxPropertyView)
-
-BEGIN_EVENT_TABLE(wxPropertyFormView, wxPropertyView)
-EVT_BUTTON(wxID_OK,          wxPropertyFormView::OnOk)
-EVT_BUTTON(wxID_CANCEL,      wxPropertyFormView::OnCancel)
-EVT_BUTTON(wxID_HELP,        wxPropertyFormView::OnHelp)
-EVT_BUTTON(wxID_PROP_REVERT, wxPropertyFormView::OnRevert)
-EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate)
-END_EVENT_TABLE()
-
-bool wxPropertyFormView::sm_dialogCancelled = false;
-
-wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxPropertyView(flags)
-{
-    m_propertyWindow = propPanel;
-    m_managedWindow = NULL;
-
-    m_windowCloseButton = NULL;
-    m_windowCancelButton = NULL;
-    m_windowHelpButton = NULL;
-
-    m_detailedEditing = false;
-}
-
-wxPropertyFormView::~wxPropertyFormView(void)
-{
-}
-
-void wxPropertyFormView::ShowView(wxPropertySheet *ps, wxWindow *panel)
-{
-    m_propertySheet = ps;
-
-    AssociatePanel(panel);
-    //  CreateControls();
-    //  UpdatePropertyList();
-}
-
-// Update this view of the viewed object, called e.g. by
-// the object itself.
-bool wxPropertyFormView::OnUpdateView(void)
-{
-    return true;
-}
-
-bool wxPropertyFormView::Check(void)
-{
-    if (!m_propertySheet)
-        return false;
-
-    wxNode *node = m_propertySheet->GetProperties().GetFirst();
-    while (node)
-    {
-        wxProperty *prop = (wxProperty *)node->GetData();
-        wxPropertyValidator *validator = FindPropertyValidator(prop);
-        if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
-        {
-            wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
-            if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
-                return false;
-        }
-        node = node->GetNext();
-    }
-    return true;
-}
-
-bool wxPropertyFormView::TransferToPropertySheet(void)
-{
-    if (!m_propertySheet)
-        return false;
-
-    wxNode *node = m_propertySheet->GetProperties().GetFirst();
-    while (node)
-    {
-        wxProperty *prop = (wxProperty *)node->GetData();
-        wxPropertyValidator *validator = FindPropertyValidator(prop);
-        if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
-        {
-            wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
-            formValidator->OnRetrieveValue(prop, this, m_propertyWindow);
-        }
-        node = node->GetNext();
-    }
-    return true;
-}
-
-bool wxPropertyFormView::TransferToDialog(void)
-{
-    if (!m_propertySheet)
-        return false;
-
-    wxNode *node = m_propertySheet->GetProperties().GetFirst();
-    while (node)
-    {
-        wxProperty *prop = (wxProperty *)node->GetData();
-        wxPropertyValidator *validator = FindPropertyValidator(prop);
-        if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
-        {
-            wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
-            formValidator->OnDisplayValue(prop, this, m_propertyWindow);
-        }
-        node = node->GetNext();
-    }
-    return true;
-}
-
-bool wxPropertyFormView::AssociateNames(void)
-{
-    if (!m_propertySheet || !m_propertyWindow)
-        return false;
-
-    wxWindowList::Node  *node = m_propertyWindow->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow *win = node->GetData();
-        if ( win->GetName() != wxEmptyString )
-        {
-            wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
-            if (prop)
-                prop->SetWindow(win);
-        }
-        node = node->GetNext();
-    }
-    return true;
-}
-
-
-bool wxPropertyFormView::OnClose(void)
-{
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxPropertyFormPanel)))
-    {
-        ((wxPropertyFormPanel*)m_propertyWindow)->SetView(NULL);
-    }
-    delete this;
-    return true;
-}
-
-void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))
-{
-    // Retrieve the value if any
-    if (!Check())
-        return;
-
-    sm_dialogCancelled = false;
-    TransferToPropertySheet();
-
-    m_managedWindow->Close(true);
-}
-
-void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    sm_dialogCancelled = true;
-
-    m_managedWindow->Close(true);
-}
-
-void wxPropertyFormView::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxPropertyFormView::OnUpdate(wxCommandEvent& WXUNUSED(event))
-{
-    if (Check())
-        TransferToPropertySheet();
-}
-
-void wxPropertyFormView::OnRevert(wxCommandEvent& WXUNUSED(event))
-{
-    TransferToDialog();
-}
-
-void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    if (!m_propertySheet)
-        return;
-
-    if (win.GetName().empty())
-        return;
-
-    if (wxStrcmp(win.GetName(), wxT("ok")) == 0)
-        OnOk(event);
-    else if (wxStrcmp(win.GetName(), wxT("cancel")) == 0)
-        OnCancel(event);
-    else if (wxStrcmp(win.GetName(), wxT("help")) == 0)
-        OnHelp(event);
-    else if (wxStrcmp(win.GetName(), wxT("update")) == 0)
-        OnUpdate(event);
-    else if (wxStrcmp(win.GetName(), wxT("revert")) == 0)
-        OnRevert(event);
-    else
-    {
-        // Find a validator to route the command to.
-        wxNode *node = m_propertySheet->GetProperties().GetFirst();
-        while (node)
-        {
-            wxProperty *prop = (wxProperty *)node->GetData();
-            if (prop->GetWindow() && (prop->GetWindow() == &win))
-            {
-                wxPropertyValidator *validator = FindPropertyValidator(prop);
-                if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
-                {
-                    wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
-                    formValidator->OnCommand(prop, this, m_propertyWindow, event);
-                    return;
-                }
-            }
-            node = node->GetNext();
-        }
-    }
-}
-
-// Extend event processing to call OnCommand
-bool wxPropertyFormView::ProcessEvent(wxEvent& event)
-{
-    if (wxEvtHandler::ProcessEvent(event))
-        return true;
-    else if (event.IsCommandEvent() && !event.IsKindOf(CLASSINFO(wxUpdateUIEvent)) && event.GetEventObject())
-    {
-        OnCommand(* ((wxWindow*) event.GetEventObject()), (wxCommandEvent&) event);
-        return true;
-    }
-    else
-        return false;
-}
-
-void wxPropertyFormView::OnDoubleClick(wxControl *item)
-{
-    if (!m_propertySheet)
-        return;
-
-    // Find a validator to route the command to.
-    wxNode *node = m_propertySheet->GetProperties().GetFirst();
-    while (node)
-    {
-        wxProperty *prop = (wxProperty *)node->GetData();
-        if (prop->GetWindow() && ((wxControl *)prop->GetWindow() == item))
-        {
-            wxPropertyValidator *validator = FindPropertyValidator(prop);
-            if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
-            {
-                wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
-                formValidator->OnDoubleClick(prop, this, m_propertyWindow);
-                return;
-            }
-        }
-        node = node->GetNext();
-    }
-}
-
-/*
-* Property form dialog box
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxPropertyFormDialog, wxDialog)
-EVT_CLOSE(wxPropertyFormDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxPropertyFormDialog::wxPropertyFormDialog(wxPropertyFormView *v, wxWindow *parent, const wxString& title,
-                                           const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxDialog(parent, wxID_ANY, title, pos, size, style, name)
-{
-    m_view = v;
-    m_view->AssociatePanel(this);
-    m_view->SetManagedWindow(this);
-    //  SetAutoLayout(true);
-}
-
-void wxPropertyFormDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    if (m_view)
-    {
-        m_view->OnClose();
-        m_view = NULL;
-        this->Destroy();
-    }
-    else
-        event.Veto();
-}
-
-void wxPropertyFormDialog::OnDefaultAction(wxControl *item)
-{
-    m_view->OnDoubleClick(item);
-}
-
-void wxPropertyFormDialog::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    if ( m_view )
-        m_view->OnCommand(win, event);
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyFormDialog::ProcessEvent(wxEvent& event)
-{
-    if ( !m_view || ! m_view->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return true;
-}
-
-
-/*
-* Property form panel
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormPanel, wxPanel)
-
-void wxPropertyFormPanel::OnDefaultAction(wxControl *item)
-{
-    m_view->OnDoubleClick(item);
-}
-
-void wxPropertyFormPanel::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    m_view->OnCommand(win, event);
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyFormPanel::ProcessEvent(wxEvent& event)
-{
-    if ( !m_view || ! m_view->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return true;
-}
-
-/*
-* Property frame
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyFormFrame, wxFrame)
-
-BEGIN_EVENT_TABLE(wxPropertyFormFrame, wxFrame)
-EVT_CLOSE(wxPropertyFormFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void wxPropertyFormFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    if (m_view && m_view->OnClose())
-        this->Destroy();
-    else
-        event.Veto();
-}
-
-wxPanel *wxPropertyFormFrame::OnCreatePanel(wxFrame *parent, wxPropertyFormView *v)
-{
-    return new wxPropertyFormPanel(v, parent);
-}
-
-bool wxPropertyFormFrame::Initialize(void)
-{
-    m_propertyPanel = OnCreatePanel(this, m_view);
-    if (m_propertyPanel)
-    {
-        m_view->AssociatePanel(m_propertyPanel);
-        m_view->SetManagedWindow(this);
-        return true;
-    }
-    else
-        return false;
-}
-
-/*
-* Property form specific validator
-*/
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyFormValidator, wxPropertyValidator)
-
-
-/*
-* Default validators
-*/
-
-IMPLEMENT_DYNAMIC_CLASS(wxRealFormValidator, wxPropertyFormValidator)
-
-///
-/// Real number form validator
-///
-bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                       wxWindow *parentWindow)
-{
-    if (m_realMin == 0.0 && m_realMax == 0.0)
-        return true;
-
-    // The item used for viewing the real number: should be a text item.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
-
-    wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
-    float val = 0.0;
-    if (!StringToFloat(WXSTRINGCAST value, &val))
-    {
-        wxChar buf[200];
-        wxSprintf(buf, wxT("Value %s is not a valid real number!"), (const wxChar *)value);
-        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
-    }
-
-    if (val < m_realMin || val > m_realMax)
-    {
-        wxChar buf[200];
-        wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
-        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
-    }
-    return true;
-}
-
-bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                          wxWindow *WXUNUSED(parentWindow) )
-{
-    // The item used for viewing the real number: should be a text item.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
-
-    wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
-    if (value.Length() == 0)
-        return false;
-
-    float f = (float)wxAtof((const wxChar *)value);
-    property->GetValue() = f;
-    return true;
-}
-
-bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                         wxWindow *WXUNUSED(parentWindow) )
-{
-    // The item used for viewing the real number: should be a text item.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-        return false;
-
-    wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
-    textItem->SetValue(FloatToString(property->GetValue().RealValue()));
-    return true;
-}
-
-///
-/// Integer validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxIntegerFormValidator, wxPropertyFormValidator)
-
-bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                          wxWindow *parentWindow)
-{
-    if (m_integerMin == 0.0 && m_integerMax == 0.0)
-        return true;
-
-    // The item used for viewing the real number: should be a text item or a slider
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-
-    long val = 0;
-
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
-        if (!StringToLong(WXSTRINGCAST value, &val))
-        {
-            wxChar buf[200];
-            wxSprintf(buf, wxT("Value %s is not a valid integer!"), (const wxChar *)value);
-            wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-            return false;
-        }
-    }
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
-    {
-        val = (long)((wxSlider *)m_propertyWindow)->GetValue();
-    }
-    else
-        return false;
-
-    if (val < m_integerMin || val > m_integerMax)
-    {
-        wxChar buf[200];
-        wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
-        wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-        return false;
-    }
-    return true;
-}
-
-bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                             wxWindow *WXUNUSED(parentWindow))
-{
-    // The item used for viewing the real number: should be a text item or a slider
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
-
-        if (value.Length() == 0)
-            return false;
-
-        long i = wxAtol((const wxChar *)value);
-        property->GetValue() = i;
-    }
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
-    {
-        property->GetValue() = (long)((wxSlider *)m_propertyWindow)->GetValue();
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                            wxWindow *WXUNUSED(parentWindow))
-{
-    // The item used for viewing the real number: should be a text item or a slider
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
-        textItem->SetValue(LongToString(property->GetValue().IntegerValue()));
-    }
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
-    {
-        ((wxSlider *)m_propertyWindow)->SetValue((int)property->GetValue().IntegerValue());
-    }
-    else
-        return false;
-    return true;
-}
-
-///
-/// Boolean validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxBoolFormValidator, wxPropertyFormValidator)
-
-bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                       wxWindow *WXUNUSED(parentWindow))
-{
-    // The item used for viewing the boolean: should be a checkbox
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
-
-    return true;
-}
-
-bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                          wxWindow *WXUNUSED(parentWindow) )
-{
-    // The item used for viewing the boolean: should be a checkbox.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
-
-    wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
-
-    property->GetValue() = (bool)checkBox->GetValue();
-    return true;
-}
-
-bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                         wxWindow *WXUNUSED(parentWindow))
-{
-    // The item used for viewing the boolean: should be a checkbox.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
-        return false;
-
-    wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
-    checkBox->SetValue((bool)property->GetValue().BoolValue());
-    return true;
-}
-
-///
-/// String validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxStringFormValidator, wxPropertyFormValidator)
-
-wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags):
-wxPropertyFormValidator(flags)
-{
-    m_strings = list;
-}
-
-bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                         wxWindow *parentWindow )
-{
-    if (!m_strings)
-        return true;
-
-    // The item used for viewing the string: should be a text item, choice item or listbox.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
-        if (!m_strings->Member(text->GetValue()))
-        {
-            wxString str( wxT("Value ") );
-            str += text->GetValue();
-            str += wxT(" is not valid.");
-            wxMessageBox(str, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-            return false;
-        }
-    }
-    else
-    {
-        // Any other item constrains the string value,
-        // so we don't have to check it.
-    }
-    return true;
-}
-
-bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                            wxWindow *WXUNUSED(parentWindow) )
-{
-    // The item used for viewing the string: should be a text item, choice item or listbox.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
-        property->GetValue() = text->GetValue();
-    }
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
-    {
-        wxListBox *lbox = (wxListBox *)m_propertyWindow;
-        if (lbox->GetSelection() != wxNOT_FOUND)
-            property->GetValue() = lbox->GetStringSelection();
-    }
-    /*
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
-    {
-    wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
-    int n = 0;
-    if ((n = rbox->GetSelection()) != wxNOT_FOUND)
-    property->GetValue() = rbox->GetString(n);
-    }
-    */
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
-    {
-        wxChoice *choice = (wxChoice *)m_propertyWindow;
-        if (choice->GetSelection() != wxNOT_FOUND)
-            property->GetValue() = choice->GetStringSelection();
-    }
-    else
-        return false;
-    return true;
-}
-
-bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
-                                           wxWindow *WXUNUSED(parentWindow) )
-{
-    // The item used for viewing the string: should be a text item, choice item or listbox.
-    wxWindow *m_propertyWindow = property->GetWindow();
-    if (!m_propertyWindow)
-        return false;
-    if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
-    {
-        wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
-        text->SetValue(property->GetValue().StringValue());
-    }
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
-    {
-        wxListBox *lbox = (wxListBox *)m_propertyWindow;
-        if (lbox->GetCount() == 0 && m_strings)
-        {
-            // Try to initialize the listbox from 'strings'
-            wxStringList::Node  *node = m_strings->GetFirst();
-            while (node)
-            {
-                wxChar *s = node->GetData();
-                lbox->Append(s);
-                node = node->GetNext();
-            }
-        }
-        lbox->SetStringSelection(property->GetValue().StringValue());
-    }
-    /*
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
-    {
-    wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
-    rbox->SetStringSelection(property->GetValue().StringValue());
-    }
-    */
-    else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
-    {
-        wxChoice *choice = (wxChoice *)m_propertyWindow;
-        if (choice->GetCount() == 0 && m_strings)
-        {
-            // Try to initialize the choice item from 'strings'
-            // XView doesn't allow this kind of thing.
-            wxStringList::Node  *node = m_strings->GetFirst();
-            while (node)
-            {
-                wxChar *s = node->GetData();
-                choice->Append(s);
-                node = node->GetNext();
-            }
-        }
-        choice->SetStringSelection(property->GetValue().StringValue());
-    }
-    else
-        return false;
-    return true;
-}
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
deleted file mode 100644
index 29c17d30f2..0000000000
--- a/contrib/src/deprecated/proplist.cpp
+++ /dev/null
@@ -1,1819 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/src/deprecated/proplist.cpp
-// Purpose:     Property list classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROPSHEET
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-    #include "wx/font.h"
-    #include "wx/button.h"
-    #include "wx/bmpbuttn.h"
-    #include "wx/textctrl.h"
-    #include "wx/listbox.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
-#endif
-
-#include "wx/sizer.h"
-#include "wx/module.h"
-#include "wx/intl.h"
-#include "wx/artprov.h"
-
-#include "wx/colordlg.h"
-#include "wx/deprecated/proplist.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
-    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-// ----------------------------------------------------------------------------
-// Property text edit control
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)
-
-wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
-    const wxWindowID id, const wxString& value,
-    const wxPoint& pos, const wxSize& size,
-    long style, const wxString& name):
- wxTextCtrl(parent, id, value, pos, size, style, wxDefaultValidator, name)
-{
-  m_view = v;
-}
-
-void wxPropertyTextEdit::OnSetFocus()
-{
-}
-
-void wxPropertyTextEdit::OnKillFocus()
-{
-}
-
-// ----------------------------------------------------------------------------
-// Property list view
-// ----------------------------------------------------------------------------
-
-bool wxPropertyListView::sm_dialogCancelled = false;
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListView, wxPropertyView)
-
-BEGIN_EVENT_TABLE(wxPropertyListView, wxPropertyView)
-    EVT_BUTTON(wxID_OK,                 wxPropertyListView::OnOk)
-    EVT_BUTTON(wxID_CANCEL,             wxPropertyListView::OnCancel)
-    EVT_BUTTON(wxID_HELP,               wxPropertyListView::OnHelp)
-    EVT_BUTTON(wxID_PROP_CROSS,         wxPropertyListView::OnCross)
-    EVT_BUTTON(wxID_PROP_CHECK,         wxPropertyListView::OnCheck)
-    EVT_BUTTON(wxID_PROP_EDIT,          wxPropertyListView::OnEdit)
-    EVT_TEXT_ENTER(wxID_PROP_TEXT,      wxPropertyListView::OnText)
-    EVT_LISTBOX(wxID_PROP_SELECT,       wxPropertyListView::OnPropertySelect)
-    EVT_COMMAND(wxID_PROP_SELECT, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
-                                        wxPropertyListView::OnPropertyDoubleClick)
-    EVT_LISTBOX(wxID_PROP_VALUE_SELECT, wxPropertyListView::OnValueListSelect)
-END_EVENT_TABLE()
-
-wxPropertyListView::wxPropertyListView(wxPanel *propPanel, long flags):wxPropertyView(flags)
-{
-  m_propertyScrollingList = NULL;
-  m_valueList = NULL;
-  m_valueText = NULL;
-  m_editButton = NULL;
-  m_confirmButton = NULL;
-  m_cancelButton = NULL;
-  m_propertyWindow = propPanel;
-  m_managedWindow = NULL;
-
-  m_windowCloseButton = NULL;
-  m_windowCancelButton = NULL;
-  m_windowHelpButton = NULL;
-
-  m_detailedEditing = false;
-}
-
-wxPropertyListView::~wxPropertyListView()
-{
-}
-
-void wxPropertyListView::ShowView(wxPropertySheet *ps, wxPanel *panel)
-{
-  m_propertySheet = ps;
-
-  AssociatePanel(panel);
-  CreateControls();
-
-  UpdatePropertyList();
-  panel->Layout();
-}
-
-// Update this view of the viewed object, called e.g. by
-// the object itself.
-bool wxPropertyListView::OnUpdateView()
-{
-  return true;
-}
-
-bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
-{
-  if (!m_propertyScrollingList || !m_propertySheet)
-    return false;
-
-  m_propertyScrollingList->Clear();
-  if (clearEditArea)
-  {
-    m_valueList->Clear();
-    m_valueText->SetValue(wxEmptyString);
-  }
-  wxNode *node = m_propertySheet->GetProperties().GetFirst();
-
-  // Should sort them... later...
-  while (node)
-  {
-    wxProperty *property = (wxProperty *)node->GetData();
-    wxString stringValueRepr(property->GetValue().GetStringRepresentation());
-    wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
-    m_propertyScrollingList->Append(paddedString.GetData(), (void *)property);
-    node = node->GetNext();
-  }
-  return true;
-}
-
-bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
-{
-  if (!m_propertyScrollingList || !m_propertySheet)
-    return false;
-
-#ifdef __WXMSW__
-  int currentlySelected = m_propertyScrollingList->GetSelection();
-#endif
-// #ifdef __WXMSW__
-  wxString stringValueRepr(property->GetValue().GetStringRepresentation());
-  wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
-  int sel = FindListIndexForProperty(property);
-
-  if (sel > -1)
-  {
-    // Don't update the listbox unnecessarily because it can cause
-    // ugly flashing.
-
-    if (paddedString != m_propertyScrollingList->GetString(sel))
-      m_propertyScrollingList->SetString(sel, paddedString.GetData());
-  }
-//#else
-//  UpdatePropertyList(false);
-//#endif
-
-  // TODO: why is this necessary?
-#ifdef __WXMSW__
-  if (currentlySelected > -1)
-    m_propertyScrollingList->SetSelection(currentlySelected);
-#endif
-
-  return true;
-}
-
-// Find the wxListBox index corresponding to this property
-int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
-{
-  int n = m_propertyScrollingList->GetCount();
-  for (int i = 0; i < n; i++)
-  {
-    if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
-      return i;
-  }
-  return wxNOT_FOUND;
-}
-
-wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)
-{
-  wxString theString(name);
-
-  int nameWidth = 25;
-  int padWith = nameWidth - theString.length();
-  if (padWith < 0)
-    padWith = 0;
-
-  if (GetFlags() & wxPROP_SHOWVALUES)
-  {
-    // Want to pad with spaces
-    theString.Append( wxT(' '), padWith);
-    theString += value;
-  }
-
-  return theString;
-}
-
-// Select and show string representation in validator the given
-// property. NULL resets to show no property.
-bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
-{
-  if (m_currentProperty)
-  {
-    EndShowingProperty(m_currentProperty);
-    m_currentProperty = NULL;
-  }
-
-  m_valueList->Clear();
-  m_valueText->SetValue(wxEmptyString);
-
-  if (property)
-  {
-    m_currentProperty = property;
-    BeginShowingProperty(property);
-  }
-  if (select)
-  {
-    int sel = FindListIndexForProperty(property);
-    if (sel != wxNOT_FOUND)
-      m_propertyScrollingList->SetSelection(sel);
-  }
-  return true;
-}
-
-// Find appropriate validator and load property into value controls
-bool wxPropertyListView::BeginShowingProperty(wxProperty *property)
-{
-  m_currentValidator = FindPropertyValidator(property);
-  if (!m_currentValidator)
-    return false;
-
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return false;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  listValidator->OnPrepareControls(property, this, m_propertyWindow);
-  DisplayProperty(property);
-  return true;
-}
-
-// Find appropriate validator and unload property from value controls
-bool wxPropertyListView::EndShowingProperty(wxProperty *property)
-{
-  if (!m_currentValidator)
-    return false;
-
-  RetrieveProperty(property);
-
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return false;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  listValidator->OnClearControls(property, this, m_propertyWindow);
-  if (m_detailedEditing)
-  {
-    listValidator->OnClearDetailControls(property, this, m_propertyWindow);
-    m_detailedEditing = false;
-  }
-  return true;
-}
-
-void wxPropertyListView::BeginDetailedEditing()
-{
-  if (!m_currentValidator)
-    return;
-  if (!m_currentProperty)
-    return;
-  if (m_detailedEditing)
-    return;
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return;
-  if (!m_currentProperty->IsEnabled())
-    return;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  if (listValidator->OnPrepareDetailControls(m_currentProperty, this, m_propertyWindow))
-    m_detailedEditing = true;
-}
-
-void wxPropertyListView::EndDetailedEditing()
-{
-  if (!m_currentValidator)
-    return;
-  if (!m_currentProperty)
-    return;
-
-  RetrieveProperty(m_currentProperty);
-
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  if (m_detailedEditing)
-  {
-    listValidator->OnClearDetailControls(m_currentProperty, this, m_propertyWindow);
-    m_detailedEditing = false;
-  }
-}
-
-bool wxPropertyListView::DisplayProperty(wxProperty *property)
-{
-  if (!m_currentValidator)
-    return false;
-
-  if (((m_currentValidator->GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == 0) || !property->IsEnabled())
-    m_valueText->SetEditable(false);
-  else
-    m_valueText->SetEditable(true);
-
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return false;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  listValidator->OnDisplayValue(property, this, m_propertyWindow);
-  return true;
-}
-
-bool wxPropertyListView::RetrieveProperty(wxProperty *property)
-{
-  if (!m_currentValidator)
-    return false;
-  if (!property->IsEnabled())
-    return false;
-
-  if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-    return false;
-
-  wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-  if (listValidator->OnCheckValue(property, this, m_propertyWindow))
-  {
-    if (listValidator->OnRetrieveValue(property, this, m_propertyWindow))
-    {
-      UpdatePropertyDisplayInList(property);
-      OnPropertyChanged(property);
-    }
-  }
-  else
-  {
-    // Revert to old value
-    listValidator->OnDisplayValue(property, this, m_propertyWindow);
-  }
-  return true;
-}
-
-
-bool wxPropertyListView::EditProperty(wxProperty *WXUNUSED(property))
-{
-  return true;
-}
-
-// Called by the listbox callback
-void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))
-{
-  int sel = m_propertyScrollingList->GetSelection();
-  if (sel != wxNOT_FOUND)
-  {
-    wxProperty *newSel = (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(sel);
-    if (newSel && newSel != m_currentProperty)
-    {
-      ShowProperty(newSel, false);
-    }
-  }
-}
-
-bool wxPropertyListView::CreateControls()
-{
-    wxPanel *panel = (wxPanel *)m_propertyWindow;
-
-    wxSize largeButtonSize( 70, 25 );
-    wxSize smallButtonSize( 23, 23 );
-
-    if (m_valueText)
-        return true;
-
-    if (!panel)
-        return false;
-
-    wxFont guiFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-
-#ifdef __WXMSW__
-    wxFont *boringFont =
-        wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN,
-                                        wxNORMAL, wxNORMAL, false, _T("Courier New"));
-#else
-    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
-#endif
-
-    // May need to be changed in future to eliminate clashes with app.
-    // WHAT WAS THIS FOR?
-//  panel->SetClientData((char *)this);
-
-    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-
-    // top row with optional buttons and input line
-
-    wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
-    int buttonborder = 3;
-
-    if (m_buttonFlags & wxPROP_BUTTON_CHECK_CROSS)
-    {
-        wxBitmap tickBitmap = wxArtProvider::GetBitmap(wxART_TICK_MARK);
-        wxBitmap crossBitmap = wxArtProvider::GetBitmap(wxART_CROSS_MARK);
-
-        if ( tickBitmap.Ok() && crossBitmap.Ok() )
-        {
-            m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, tickBitmap, wxDefaultPosition, smallButtonSize );
-            m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, crossBitmap, wxDefaultPosition, smallButtonSize );
-        }
-        else
-        {
-            m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, _T(":-)"), wxDefaultPosition, smallButtonSize );
-            m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, _T("X"), wxDefaultPosition, smallButtonSize );
-        }
-
-        topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
-        topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
-    }
-
-    m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
-       wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxTE_PROCESS_ENTER);
-    m_valueText->Disable();
-    topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
-
-    if (m_buttonFlags & wxPROP_PULLDOWN)
-    {
-        m_editButton = new wxButton(panel, wxID_PROP_EDIT, _T("..."),  wxDefaultPosition, smallButtonSize);
-        m_editButton->Disable();
-        topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
-    }
-
-    mainsizer->Add( topsizer, 0, wxEXPAND );
-
-    // middle section with two list boxes
-
-    m_middleSizer = new wxBoxSizer( wxVERTICAL );
-
-    m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultCoord, 60));
-    m_valueList->Show(false);
-
-    m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));
-    m_propertyScrollingList->SetFont(* boringFont);
-    m_middleSizer->Add( m_propertyScrollingList, 1, wxALL|wxEXPAND, buttonborder );
-
-    mainsizer->Add( m_middleSizer, 1, wxEXPAND );
-
-    // bottom row with buttons
-
-    if ((m_buttonFlags & wxPROP_BUTTON_OK) ||
-        (m_buttonFlags & wxPROP_BUTTON_CLOSE) ||
-        (m_buttonFlags & wxPROP_BUTTON_CANCEL) ||
-        (m_buttonFlags & wxPROP_BUTTON_HELP))
-    {
-        wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
-        buttonborder = 5;
-
-        if (m_buttonFlags & wxPROP_BUTTON_OK)
-        {
-            m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxDefaultPosition, largeButtonSize );
-            m_windowCloseButton->SetDefault();
-            m_windowCloseButton->SetFocus();
-            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
-        }
-        else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
-        {
-            m_windowCloseButton = new wxButton(panel, wxID_OK, _("Close"), wxDefaultPosition, largeButtonSize );
-            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
-        }
-        if (m_buttonFlags & wxPROP_BUTTON_CANCEL)
-        {
-            m_windowCancelButton = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, largeButtonSize );
-            bottomsizer->Add( m_windowCancelButton, 0, wxALL, buttonborder );
-        }
-        if (m_buttonFlags & wxPROP_BUTTON_HELP)
-        {
-            m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxDefaultPosition, largeButtonSize );
-            bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
-        }
-
-        mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );
-    }
-
-    panel->SetSizer( mainsizer );
-
-    return true;
-}
-
-void wxPropertyListView::ShowTextControl(bool show)
-{
-  if (m_valueText)
-    m_valueText->Show(show);
-}
-
-void wxPropertyListView::ShowListBoxControl(bool show)
-{
-    if (!m_valueList) return;
-
-    m_valueList->Show(show);
-
-    if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD)
-    {
-        if (show)
-            m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 );
-        else
-            m_middleSizer->Remove( 0 );
-
-        m_propertyWindow->Layout();
-    }
-}
-
-void wxPropertyListView::EnableCheck(bool show)
-{
-  if (m_confirmButton)
-    m_confirmButton->Enable(show);
-}
-
-void wxPropertyListView::EnableCross(bool show)
-{
-  if (m_cancelButton)
-    m_cancelButton->Enable(show);
-}
-
-bool wxPropertyListView::OnClose()
-{
-  // Retrieve the value if any
-  wxCommandEvent event;
-  OnCheck(event);
-
-  delete this;
-  return true;
-}
-
-void wxPropertyListView::OnValueListSelect(wxCommandEvent& WXUNUSED(event))
-{
-  if (m_currentProperty && m_currentValidator)
-  {
-    if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-      return;
-
-    wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-    listValidator->OnValueListSelect(m_currentProperty, this, m_propertyWindow);
-  }
-}
-
-void wxPropertyListView::OnOk(wxCommandEvent& event)
-{
-  // Retrieve the value if any
-  OnCheck(event);
-
-  m_managedWindow->Close(true);
-  sm_dialogCancelled = false;
-}
-
-void wxPropertyListView::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-//  SetReturnCode(wxID_CANCEL);
-  m_managedWindow->Close(true);
-  sm_dialogCancelled = true;
-}
-
-void wxPropertyListView::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxPropertyListView::OnCheck(wxCommandEvent& WXUNUSED(event))
-{
-  if (m_currentProperty)
-  {
-    RetrieveProperty(m_currentProperty);
-  }
-}
-
-void wxPropertyListView::OnCross(wxCommandEvent& WXUNUSED(event))
-{
-  if (m_currentProperty && m_currentValidator)
-  {
-    if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-      return;
-
-    wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-    // Revert to old value
-    listValidator->OnDisplayValue(m_currentProperty, this, m_propertyWindow);
-  }
-}
-
-void wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent& WXUNUSED(event))
-{
-  if (m_currentProperty && m_currentValidator)
-  {
-    if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-      return;
-
-    wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-    // Revert to old value
-    listValidator->OnDoubleClick(m_currentProperty, this, m_propertyWindow);
-  }
-}
-
-void wxPropertyListView::OnEdit(wxCommandEvent& WXUNUSED(event))
-{
-  if (m_currentProperty && m_currentValidator)
-  {
-    if (!m_currentValidator->IsKindOf(CLASSINFO(wxPropertyListValidator)))
-      return;
-
-    wxPropertyListValidator *listValidator = (wxPropertyListValidator *)m_currentValidator;
-
-    listValidator->OnEdit(m_currentProperty, this, m_propertyWindow);
-  }
-}
-
-void wxPropertyListView::OnText(wxCommandEvent& event)
-{
-  if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
-  {
-    OnCheck(event);
-  }
-}
-
-// ----------------------------------------------------------------------------
-// Property dialog box
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)
-    EVT_CLOSE(wxPropertyListDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView *v, wxWindow *parent,
-    const wxString& title, const wxPoint& pos,
-    const wxSize& size, long style, const wxString& name):
-     wxDialog(parent, wxID_ANY, title, pos, size, style, name)
-{
-  m_view = v;
-  m_view->AssociatePanel( ((wxPanel*)this) );
-  m_view->SetManagedWindow(this);
-  SetAutoLayout(true);
-}
-
-void wxPropertyListDialog::OnCloseWindow(wxCloseEvent& event)
-{
-  if (m_view)
-  {
-    SetReturnCode(wxID_CANCEL);
-    m_view->OnClose();
-    m_view = NULL;
-    this->Destroy();
-  }
-  else
-  {
-    event.Veto();
-  }
-}
-
-void wxPropertyListDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    SetReturnCode(wxID_CANCEL);
-    this->Close();
-}
-
-void wxPropertyListDialog::OnDefaultAction(wxControl *WXUNUSED(item))
-{
-/*
-  if (item == m_view->GetPropertyScrollingList())
-    view->OnDoubleClick();
-*/
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
-{
-    if ( !m_view || ! m_view->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return true;
-}
-
-// ----------------------------------------------------------------------------
-// Property panel
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)
-
-BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
-    EVT_SIZE(wxPropertyListPanel::OnSize)
-END_EVENT_TABLE()
-
-wxPropertyListPanel::~wxPropertyListPanel()
-{
-}
-
-void wxPropertyListPanel::OnDefaultAction(wxControl *WXUNUSED(item))
-{
-/*
-  if (item == view->GetPropertyScrollingList())
-    view->OnDoubleClick();
-*/
-}
-
-// Extend event processing to search the view's event table
-bool wxPropertyListPanel::ProcessEvent(wxEvent& event)
-{
-    if ( !m_view || ! m_view->ProcessEvent(event) )
-        return wxEvtHandler::ProcessEvent(event);
-    else
-        return true;
-}
-
-void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    Layout();
-}
-
-// ----------------------------------------------------------------------------
-// Property frame
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)
-
-BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
-    EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void wxPropertyListFrame::OnCloseWindow(wxCloseEvent& event)
-{
-  if (m_view)
-  {
-    if (m_propertyPanel)
-        m_propertyPanel->SetView(NULL);
-    m_view->OnClose();
-    m_view = NULL;
-    this->Destroy();
-  }
-  else
-  {
-    event.Veto();
-  }
-}
-
-wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
-{
-  return new wxPropertyListPanel(v, parent);
-}
-
-bool wxPropertyListFrame::Initialize()
-{
-  m_propertyPanel = OnCreatePanel(this, m_view);
-  if (m_propertyPanel)
-  {
-    m_view->AssociatePanel(m_propertyPanel);
-    m_view->SetManagedWindow(this);
-    m_propertyPanel->SetAutoLayout(true);
-    return true;
-  }
-  else
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// Property list specific validator
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyListValidator, wxPropertyValidator)
-
-bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-//  view->GetValueText()->Show(true);
-  if (select)
-    OnDisplayValue(property, view, parentWindow);
-
-  return true;
-}
-
-bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  wxString s(view->GetValueList()->GetStringSelection());
-  if ( !s.empty() )
-  {
-    view->GetValueText()->SetValue(s);
-    view->RetrieveProperty(property);
-  }
-  return true;
-}
-
-bool wxPropertyListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-//  view->GetValueText()->Show(true);
-  wxString str(property->GetValue().GetStringRepresentation());
-
-  view->GetValueText()->SetValue(str);
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxPropertyListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  return false;
-}
-
-void wxPropertyListValidator::OnEdit(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetDetailedEditing())
-    view->EndDetailedEditing();
-  else
-    view->BeginDetailedEditing();
-}
-
-bool wxPropertyListValidator::OnClearControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Disable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Disable();
-  if (view->GetEditButton())
-    view->GetEditButton()->Disable();
-  return true;
-}
-
-// ----------------------------------------------------------------------------
-// Default validators
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxRealListValidator, wxPropertyListValidator)
-
-///
-/// Real number validator
-///
-bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (m_realMin == 0.0 && m_realMax == 0.0)
-    return true;
-
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-
-  float val = 0.0;
-  if (!StringToFloat(WXSTRINGCAST value, &val))
-  {
-    wxChar buf[200];
-    wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
-    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-
-  if (val < m_realMin || val > m_realMax)
-  {
-    wxChar buf[200];
-    wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
-    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-
-  if (wxStrlen(view->GetValueText()->GetValue()) == 0)
-    return false;
-
-  wxString value(view->GetValueText()->GetValue());
-  float f = (float)wxAtof(value.GetData());
-  property->GetValue() = f;
-  return true;
-}
-
-bool wxRealListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Enable();
-  if (view->GetEditButton())
-    view->GetEditButton()->Disable();
-  if (view->GetValueText())
-    view->GetValueText()->Enable();
-  return true;
-}
-
-///
-/// Integer validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxIntegerListValidator, wxPropertyListValidator)
-
-bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (m_integerMin == 0 && m_integerMax == 0)
-    return true;
-
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-
-  long val = 0;
-  if (!StringToLong(WXSTRINGCAST value, &val))
-  {
-    wxChar buf[200];
-    wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
-    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-  if (val < m_integerMin || val > m_integerMax)
-  {
-    wxChar buf[200];
-    wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
-    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-
-  if (wxStrlen(view->GetValueText()->GetValue()) == 0)
-    return false;
-
-  wxString value(view->GetValueText()->GetValue());
-  long val = (long)wxAtoi(value.GetData());
-  property->GetValue() = (long)val;
-  return true;
-}
-
-bool wxIntegerListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Enable();
-  if (view->GetEditButton())
-    view->GetEditButton()->Disable();
-  if (view->GetValueText())
-    view->GetValueText()->Enable();
-  return true;
-}
-
-///
-/// boolean validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxBoolListValidator, wxPropertyListValidator)
-
-bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-  if (value != wxT("True") && value != wxT("False"))
-  {
-    wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-
-  if (wxStrlen(view->GetValueText()->GetValue()) == 0)
-    return false;
-
-  wxString value(view->GetValueText()->GetValue());
-  bool boolValue = (value == wxT("True"));
-  property->GetValue() = boolValue;
-  return true;
-}
-
-bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString str(property->GetValue().GetStringRepresentation());
-
-  view->GetValueText()->SetValue(str);
-
-  if (view->GetValueList()->IsShown())
-  {
-    view->GetValueList()->SetStringSelection(str);
-  }
-  return true;
-}
-
-bool wxBoolListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Disable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Disable();
-  if (view->GetEditButton())
-    view->GetEditButton()->Enable();
-  if (view->GetValueText())
-    view->GetValueText()->Disable();
-  return true;
-}
-
-bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetValueList())
-  {
-    view->ShowListBoxControl(true);
-    view->GetValueList()->Enable();
-
-    view->GetValueList()->Append(wxT("True"));
-    view->GetValueList()->Append(wxT("False"));
-    wxChar *currentString = copystring(view->GetValueText()->GetValue());
-    view->GetValueList()->SetStringSelection(currentString);
-    delete[] currentString;
-  }
-  return true;
-}
-
-bool wxBoolListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetValueList())
-  {
-    view->GetValueList()->Clear();
-    view->ShowListBoxControl(false);
-    view->GetValueList()->Disable();
-  }
-  return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxBoolListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  if (property->GetValue().BoolValue())
-    property->GetValue() = false;
-  else
-    property->GetValue() = true;
-  view->DisplayProperty(property);
-  view->UpdatePropertyDisplayInList(property);
-  view->OnPropertyChanged(property);
-  return true;
-}
-
-///
-/// String validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxStringListValidator, wxPropertyListValidator)
-
-wxStringListValidator::wxStringListValidator(wxStringList *list, long flags):
-  wxPropertyListValidator(flags)
-{
-  m_strings = list;
-  // If no constraint, we just allow the string to be edited.
-  if (!m_strings && ((m_validatorFlags & wxPROP_ALLOW_TEXT_EDITING) == 0))
-    m_validatorFlags |= wxPROP_ALLOW_TEXT_EDITING;
-}
-
-bool wxStringListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!m_strings)
-    return true;
-
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-
-  if (!m_strings->Member(value.GetData()))
-  {
-    wxString str( wxT("Value ") );
-    str += value.GetData();
-    str += wxT(" is not valid.");
-    wxMessageBox( str.GetData(), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
-    return false;
-  }
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxStringListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-  property->GetValue() = value ;
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString str(property->GetValue().GetStringRepresentation());
-  view->GetValueText()->SetValue(str);
-  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->GetCount() > 0)
-  {
-    view->GetValueList()->SetStringSelection(str);
-  }
-  return true;
-}
-
-bool wxStringListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  // Unconstrained
-  if (!m_strings)
-  {
-    if (view->GetEditButton())
-      view->GetEditButton()->Disable();
-    if (view->GetConfirmButton())
-      view->GetConfirmButton()->Enable();
-    if (view->GetCancelButton())
-      view->GetCancelButton()->Enable();
-    if (view->GetValueText())
-      view->GetValueText()->Enable();
-    return true;
-  }
-
-  // Constrained
-  if (view->GetValueText())
-    view->GetValueText()->Disable();
-
-  if (view->GetEditButton())
-    view->GetEditButton()->Enable();
-
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Disable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Disable();
-  return true;
-}
-
-bool wxStringListValidator::OnPrepareDetailControls( wxProperty *property,
-                                                     wxPropertyListView *view,
-                                                     wxWindow *WXUNUSED(parentWindow) )
-{
-  if (view->GetValueList())
-  {
-    view->ShowListBoxControl(true);
-    view->GetValueList()->Enable();
-    wxStringList::Node  *node = m_strings->GetFirst();
-    while (node)
-    {
-      wxChar *s = node->GetData();
-      view->GetValueList()->Append(s);
-      node = node->GetNext();
-    }
-    wxChar *currentString = property->GetValue().StringValue();
-    view->GetValueList()->SetStringSelection(currentString);
-  }
-  return true;
-}
-
-bool wxStringListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!m_strings)
-  {
-    return true;
-  }
-
-  if (view->GetValueList())
-  {
-    view->GetValueList()->Clear();
-    view->ShowListBoxControl(false);
-    view->GetValueList()->Disable();
-  }
-  return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxStringListValidator::OnDoubleClick( wxProperty *property,
-                                           wxPropertyListView *view,
-                                           wxWindow *WXUNUSED(parentWindow) )
-{
-  if (!view->GetValueText())
-    return false;
-  if (!m_strings)
-    return false;
-
-  wxStringList::Node    *node = m_strings->GetFirst();
-  wxChar                *currentString = property->GetValue().StringValue();
-  while (node)
-  {
-    wxChar *s = node->GetData();
-    if (wxStrcmp(s, currentString) == 0)
-    {
-      wxChar *nextString;
-      if (node->GetNext())
-        nextString = node->GetNext()->GetData();
-      else
-        nextString = m_strings->GetFirst()->GetData();
-      property->GetValue() = wxString(nextString);
-      view->DisplayProperty(property);
-      view->UpdatePropertyDisplayInList(property);
-      view->OnPropertyChanged(property);
-      return true;
-    }
-    else node = node->GetNext();
-  }
-  return true;
-}
-
-///
-/// Filename validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxFilenameListValidator, wxPropertyListValidator)
-
-wxFilenameListValidator::wxFilenameListValidator(wxString message , wxString wildcard, long flags):
-  wxPropertyListValidator(flags), m_filenameWildCard(wildcard), m_filenameMessage(message)
-{
-}
-
-wxFilenameListValidator::~wxFilenameListValidator()
-{
-}
-
-bool wxFilenameListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxFilenameListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-  property->GetValue() = value ;
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxFilenameListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString str(property->GetValue().GetStringRepresentation());
-  view->GetValueText()->SetValue(str);
-  return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxFilenameListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!view->GetValueText())
-    return false;
-  OnEdit(property, view, parentWindow);
-  return true;
-}
-
-bool wxFilenameListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Enable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Enable();
-  if (view->GetEditButton())
-    view->GetEditButton()->Enable();
-  if (view->GetValueText())
-    view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
-  return true;
-}
-
-void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!view->GetValueText())
-    return;
-
-#if wxUSE_FILEDLG
-    wxString s = wxFileSelector(
-        m_filenameMessage.GetData(),
-        wxPathOnly(property->GetValue().StringValue()),
-        wxFileNameFromPath(property->GetValue().StringValue()),
-        NULL,
-        m_filenameWildCard.GetData(),
-        0,
-        parentWindow);
-    if ( !s.empty() )
-    {
-        property->GetValue() = s;
-        view->DisplayProperty(property);
-        view->UpdatePropertyDisplayInList(property);
-        view->OnPropertyChanged(property);
-    }
-#else
-    wxUnusedVar(property);
-    wxUnusedVar(view);
-    wxUnusedVar(parentWindow);
-#endif
-}
-
-///
-/// Colour validator
-///
-IMPLEMENT_DYNAMIC_CLASS(wxColourListValidator, wxPropertyListValidator)
-
-wxColourListValidator::wxColourListValidator(long flags):
-  wxPropertyListValidator(flags)
-{
-}
-
-wxColourListValidator::~wxColourListValidator()
-{
-}
-
-bool wxColourListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxColourListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString value(view->GetValueText()->GetValue());
-
-  property->GetValue() = value ;
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself
-bool wxColourListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString str(property->GetValue().GetStringRepresentation());
-  view->GetValueText()->SetValue(str);
-  return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxColourListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!view->GetValueText())
-    return false;
-  OnEdit(property, view, parentWindow);
-  return true;
-}
-
-bool wxColourListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-    if (view->GetConfirmButton())
-        view->GetConfirmButton()->Enable();
-
-    if (view->GetCancelButton())
-        view->GetCancelButton()->Enable();
-
-    if (view->GetEditButton())
-        view->GetEditButton()->Enable();
-
-    if (view->GetValueText())
-        view->GetValueText()->Enable((GetFlags() & wxPROP_ALLOW_TEXT_EDITING) == wxPROP_ALLOW_TEXT_EDITING);
-
-    return true;
-}
-
-void wxColourListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-  if (!view->GetValueText())
-    return;
-
-  wxChar *s = property->GetValue().StringValue();
-  unsigned char r = 0;
-  unsigned char g = 0;
-  unsigned char b = 0;
-  if (s)
-  {
-    r = (unsigned char)wxHexToDec(s);
-    g = (unsigned char)wxHexToDec(s+2);
-    b = (unsigned char)wxHexToDec(s+4);
-  }
-
-  wxColour col(r,g,b);
-
-  wxColourData data;
-  data.SetChooseFull(true);
-  data.SetColour(col);
-
-  for (int i = 0; i < 16; i++)
-  {
-    wxColour colour((unsigned char)(i*16),
-                    (unsigned char)(i*16),
-                    (unsigned char)(i*16));
-    data.SetCustomColour(i, colour);
-  }
-
-  wxColourDialog dialog(parentWindow, &data);
-  if (dialog.ShowModal() != wxID_CANCEL)
-  {
-    wxColourData retData = dialog.GetColourData();
-    col = retData.GetColour();
-
-    wxChar buf[7];
-    wxDecToHex(col.Red(), buf);
-    wxDecToHex(col.Green(), buf+2);
-    wxDecToHex(col.Blue(), buf+4);
-
-    property->GetValue() = wxString(buf);
-    view->DisplayProperty(property);
-    view->UpdatePropertyDisplayInList(property);
-    view->OnPropertyChanged(property);
-  }
-}
-
-///
-/// List of strings validator. For this we need more user interface than
-/// we get with a property list; so create a new dialog for editing the list.
-///
-IMPLEMENT_DYNAMIC_CLASS(wxListOfStringsListValidator, wxPropertyListValidator)
-
-wxListOfStringsListValidator::wxListOfStringsListValidator(long flags):
-  wxPropertyListValidator(flags)
-{
-}
-
-bool wxListOfStringsListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
-  // No constraints for an arbitrary, user-editable list of strings.
-  return true;
-}
-
-// Called when TICK is pressed or focus is lost or view wants to update
-// the property list.
-// Does the transferance from the property editing area to the property itself.
-// In this case, the user cannot directly edit the string list.
-bool wxListOfStringsListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))
-{
-  return true;
-}
-
-bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (!view->GetValueText())
-    return false;
-  wxString str(property->GetValue().GetStringRepresentation());
-  view->GetValueText()->SetValue(str);
-  return true;
-}
-
-bool wxListOfStringsListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
-{
-  if (view->GetEditButton())
-    view->GetEditButton()->Enable();
-  if (view->GetValueText())
-    view->GetValueText()->Disable();
-
-  if (view->GetConfirmButton())
-    view->GetConfirmButton()->Disable();
-  if (view->GetCancelButton())
-    view->GetCancelButton()->Disable();
-  return true;
-}
-
-// Called when the property is double clicked. Extra functionality can be provided,
-// cycling through possible values.
-bool wxListOfStringsListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-{
-  OnEdit(property, view, parentWindow);
-  return true;
-}
-
-void wxListOfStringsListValidator::OnEdit( wxProperty *property,
-                                           wxPropertyListView *view,
-                                           wxWindow *parentWindow )
-{
-  // Convert property value to a list of strings for editing
-  wxStringList *stringList = new wxStringList;
-
-  wxPropertyValue *expr = property->GetValue().GetFirst();
-  while (expr)
-  {
-    wxChar *s = expr->StringValue();
-    if (s)
-      stringList->Add(s);
-    expr = expr->GetNext();
-  }
-
-  wxString title(wxT("Editing "));
-  title += property->GetName();
-
-  if (EditStringList(parentWindow, stringList, title.GetData()))
-  {
-    wxPropertyValue& oldValue = property->GetValue();
-    oldValue.ClearList();
-    wxStringList::Node  *node = stringList->GetFirst();
-    while (node)
-    {
-      wxChar *s = node->GetData();
-      oldValue.Append(new wxPropertyValue(s));
-
-      node = node->GetNext();
-    }
-
-    view->DisplayProperty(property);
-    view->UpdatePropertyDisplayInList(property);
-    view->OnPropertyChanged(property);
-  }
-  delete stringList;
-}
-
-class wxPropertyStringListEditorDialog: public wxDialog
-{
-public:
-    wxPropertyStringListEditorDialog(wxWindow *parent, const wxString& title,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-          long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("stringEditorDialogBox")):
-               wxDialog(parent, wxID_ANY, title, pos, size, windowStyle, name)
-    {
-        m_stringList = NULL;
-        m_stringText = NULL;
-        m_listBox = NULL;
-        sm_dialogCancelled = false;
-        m_currentSelection = -1;
-    }
-    ~wxPropertyStringListEditorDialog(void) {}
-    void OnCloseWindow(wxCloseEvent& event);
-    void SaveCurrentSelection(void);
-    void ShowCurrentSelection(void);
-
-    void OnOK(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-    void OnAdd(wxCommandEvent& event);
-    void OnDelete(wxCommandEvent& event);
-    void OnStrings(wxCommandEvent& event);
-    void OnText(wxCommandEvent& event);
-
-public:
-    wxStringList*       m_stringList;
-    wxListBox*          m_listBox;
-    wxTextCtrl*         m_stringText;
-    static bool         sm_dialogCancelled;
-    int                 m_currentSelection;
-DECLARE_EVENT_TABLE()
-};
-
-#define    wxID_PROP_SL_ADD            3000
-#define    wxID_PROP_SL_DELETE            3001
-#define    wxID_PROP_SL_STRINGS        3002
-#define    wxID_PROP_SL_TEXT            3003
-
-BEGIN_EVENT_TABLE(wxPropertyStringListEditorDialog, wxDialog)
-    EVT_BUTTON(wxID_OK,                 wxPropertyStringListEditorDialog::OnOK)
-    EVT_BUTTON(wxID_CANCEL,                wxPropertyStringListEditorDialog::OnCancel)
-    EVT_BUTTON(wxID_PROP_SL_ADD,        wxPropertyStringListEditorDialog::OnAdd)
-    EVT_BUTTON(wxID_PROP_SL_DELETE,        wxPropertyStringListEditorDialog::OnDelete)
-    EVT_LISTBOX(wxID_PROP_SL_STRINGS,    wxPropertyStringListEditorDialog::OnStrings)
-    EVT_TEXT_ENTER(wxID_PROP_SL_TEXT,            wxPropertyStringListEditorDialog::OnText)
-    EVT_CLOSE(wxPropertyStringListEditorDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-class wxPropertyStringListEditorText: public wxTextCtrl
-{
- public:
-  wxPropertyStringListEditorText(wxWindow *parent, wxWindowID id, const wxString& val,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-    long windowStyle = 0, const wxString& name = wxT("text")):
-     wxTextCtrl(parent, id, val, pos, size, windowStyle, wxDefaultValidator, name)
-  {
-  }
-  void OnKillFocus()
-  {
-    wxPropertyStringListEditorDialog *dialog = (wxPropertyStringListEditorDialog *)GetParent();
-    dialog->SaveCurrentSelection();
-  }
-};
-
-bool wxPropertyStringListEditorDialog::sm_dialogCancelled = false;
-
-// Edit the string list.
-bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList *stringList, const wxChar *title)
-{
-  int largeButtonWidth = 60;
-  int largeButtonHeight = 25;
-
-  wxBeginBusyCursor();
-  wxPropertyStringListEditorDialog *dialog = new wxPropertyStringListEditorDialog(parent,
-      title, wxPoint(10, 10), wxSize(400, 400));
-
-  dialog->m_stringList = stringList;
-
-  dialog->m_listBox = new wxListBox(dialog, wxID_PROP_SL_STRINGS,
-    wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
-
-  dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
-       wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
-       wxSize(300, wxDefaultCoord), wxTE_PROCESS_ENTER);
-  dialog->m_stringText->Disable();
-
-  wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
-  wxButton *deleteButton = new wxButton(dialog, wxID_PROP_SL_DELETE, wxT("Delete"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
-  wxButton *cancelButton = new wxButton(dialog, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
-  wxButton *okButton = new wxButton(dialog, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
-
-#ifndef __WXGTK__
-  okButton->SetDefault();
-#endif
-
-  wxBoxSizer *m_bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
-  m_bottom_sizer->Add(addButton, 0, wxALL | wxALIGN_LEFT, 2 );
-  m_bottom_sizer->Add(deleteButton, 0, wxALL | wxALIGN_LEFT, 2 );
-  m_bottom_sizer->Add(1, 1, 1, wxEXPAND | wxALL);
-  m_bottom_sizer->Add(cancelButton, 0, wxALL | wxALIGN_RIGHT, 2 );
-  m_bottom_sizer->Add(okButton, 0, wxALL | wxALIGN_RIGHT, 2 );
-
-  wxBoxSizer *m_sizer = new wxBoxSizer( wxVERTICAL );
-  m_sizer->Add(dialog->m_listBox, 1, wxEXPAND | wxALL, 2 );
-  m_sizer->Add(dialog->m_stringText, 0, wxEXPAND | wxALL, 2 );
-  m_sizer->Add(m_bottom_sizer, 0, wxEXPAND | wxALL , 0 );
-
-  dialog->SetSizer( m_sizer );
-  m_sizer->SetSizeHints( dialog );
-
-  wxStringList::Node    *node = stringList->GetFirst();
-  while (node)
-  {
-    wxChar *str = node->GetData();
-    // Save node as client data for each listbox item
-    dialog->m_listBox->Append(str, (wxChar *)node);
-    node = node->GetNext();
-  }
-
-  dialog->SetClientSize(310, 305);
-  dialog->Layout();
-
-  dialog->Centre(wxBOTH);
-  wxEndBusyCursor();
-  if (dialog->ShowModal() == wxID_CANCEL)
-    return false;
-  else
-    return true;
-}
-
-/*
- * String list editor callbacks
- *
- */
-
-void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
-{
-    int sel = m_listBox->GetSelection();
-    if (sel != wxNOT_FOUND)
-    {
-        m_currentSelection = sel;
-
-        ShowCurrentSelection();
-    }
-}
-
-void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
-{
-    int sel = m_listBox->GetSelection();
-    if (sel == wxNOT_FOUND)
-        return;
-
-    wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);
-    if (!node)
-        return;
-
-    m_listBox->Delete(sel);
-    delete[] (wxChar *)node->GetData();
-    delete node;
-    m_currentSelection = -1;
-    m_stringText->SetValue(wxEmptyString);
-}
-
-void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
-{
-  SaveCurrentSelection();
-
-  wxString initialText;
-  wxNode *node = m_stringList->Add(initialText);
-  m_listBox->Append(initialText, (void *)node);
-  m_currentSelection = m_stringList->GetCount() - 1;
-  m_listBox->SetSelection(m_currentSelection);
-  ShowCurrentSelection();
-  m_stringText->SetFocus();
-}
-
-void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
-    SaveCurrentSelection();
-    EndModal(wxID_OK);
-//  Close(true);
-    this->Destroy();
-}
-
-void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    sm_dialogCancelled = true;
-    EndModal(wxID_CANCEL);
-//  Close(true);
-    this->Destroy();
-}
-
-void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
-{
-    if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
-    {
-        SaveCurrentSelection();
-    }
-}
-
-void
-wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    SaveCurrentSelection();
-
-    Destroy();
-}
-
-void wxPropertyStringListEditorDialog::SaveCurrentSelection()
-{
-  if (m_currentSelection == -1)
-    return;
-
-  wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
-  if (!node)
-    return;
-
-  wxString txt(m_stringText->GetValue());
-  if (node->GetData())
-    delete[] (wxChar *)node->GetData();
-  node->SetData((wxObject *)wxStrdup(txt));
-
-  m_listBox->SetString(m_currentSelection, (wxChar *)node->GetData());
-}
-
-void wxPropertyStringListEditorDialog::ShowCurrentSelection()
-{
-  if (m_currentSelection == -1)
-  {
-    m_stringText->SetValue(wxEmptyString);
-    return;
-  }
-  wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
-  wxChar *txt = (wxChar *)node->GetData();
-  m_stringText->SetValue(txt);
-  m_stringText->Enable();
-}
-
-
-#endif // wxUSE_PROPSHEET
diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
deleted file mode 100644
index 40a9acfb40..0000000000
--- a/contrib/src/deprecated/resource.cpp
+++ /dev/null
@@ -1,3297 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/src/deprecated/resource.cpp
-// Purpose:     Resource system
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_WX_RESOURCES
-
-#ifdef __VISUALC__
-#pragma warning(disable:4706)   // assignment within conditional expression
-#endif // VC++
-
-#ifndef WX_PRECOMP
-    #include "wx/panel.h"
-    #include "wx/list.h"
-    #include "wx/hash.h"
-    #include "wx/gdicmn.h"
-    #include "wx/utils.h"
-    #include "wx/types.h"
-    #include "wx/menu.h"
-    #include "wx/stattext.h"
-    #include "wx/button.h"
-    #include "wx/bmpbuttn.h"
-    #include "wx/radiobox.h"
-    #include "wx/listbox.h"
-    #include "wx/choice.h"
-    #include "wx/checkbox.h"
-    #include "wx/settings.h"
-    #include "wx/slider.h"
-    #include "wx/icon.h"
-    #include "wx/statbox.h"
-    #include "wx/statbmp.h"
-    #include "wx/gauge.h"
-    #include "wx/textctrl.h"
-    #include "wx/msgdlg.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/treebase.h"
-#include "wx/listctrl.h"
-
-#if wxUSE_RADIOBTN
-#include "wx/radiobut.h"
-#endif
-
-#if wxUSE_SCROLLBAR
-#include "wx/scrolbar.h"
-#endif
-
-#if wxUSE_COMBOBOX
-#include "wx/combobox.h"
-#endif
-
-#include "wx/splitter.h"
-#include "wx/toolbar.h"
-
-#include "wx/validate.h"
-#include "wx/log.h"
-#include "wx/module.h"
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "wx/string.h"
-#include "wx/settings.h"
-#include "wx/stream.h"
-
-#include "wx/deprecated/resource.h"
-#include "wx/deprecated/wxexpr.h"
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
-    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-// Forward (private) declarations
-bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = false);
-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretString(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, wxExpr *expr);
-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr);
-// Interpret list expression
-wxFont wxResourceInterpretFontSpec(wxExpr *expr);
-
-bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
-bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table) ;
-bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);
-
-wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
-
-char *wxResourceBuffer = (char *) NULL;
-long wxResourceBufferSize = 0;
-long wxResourceBufferCount = 0;
-int wxResourceStringPtr = 0;
-
-void wxInitializeResourceSystem()
-{
-    if (!wxDefaultResourceTable)
-        wxDefaultResourceTable = new wxResourceTable;
-}
-
-void wxCleanUpResourceSystem()
-{
-    delete wxDefaultResourceTable;
-    if (wxResourceBuffer)
-        delete[] wxResourceBuffer;
-}
-
-// Module to ensure the resource system data gets initialized
-// and cleaned up.
-
-class wxResourceModule: public wxModule
-{
-public:
-    wxResourceModule() : wxModule() {}
-    virtual bool OnInit() { wxInitializeResourceSystem(); return true; }
-    virtual void OnExit() { wxCleanUpResourceSystem();  }
-
-    DECLARE_DYNAMIC_CLASS(wxResourceModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxResourceModule, wxModule)
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
-
-wxItemResource::wxItemResource()
-{
-    m_itemType = wxEmptyString;
-    m_title = wxEmptyString;
-    m_name = wxEmptyString;
-    m_windowStyle = 0;
-    m_x = m_y = m_width = m_height = 0;
-    m_value1 = m_value2 = m_value3 = m_value5 = 0;
-    m_value4 = wxEmptyString;
-    m_windowId = 0;
-    m_exStyle = 0;
-}
-
-wxItemResource::~wxItemResource()
-{
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-        wxItemResource *item = (wxItemResource *)node->GetData();
-        delete item;
-        delete node;
-        node = m_children.GetFirst();
-    }
-}
-
-/*
-* Resource table
-*/
-
-wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)
-{
-}
-
-wxResourceTable::~wxResourceTable()
-{
-    ClearTable();
-}
-
-wxItemResource *wxResourceTable::FindResource(const wxString& name) const
-{
-    wxItemResource *item = (wxItemResource *)Get(WXSTRINGCAST name);
-    return item;
-}
-
-void wxResourceTable::AddResource(wxItemResource *item)
-{
-    wxString name = item->GetName();
-    if (name.empty())
-        name = item->GetTitle();
-    if (name.empty())
-        name = wxT("no name");
-
-    // Delete existing resource, if any.
-    Delete(name);
-
-    Put(name, item);
-}
-
-bool wxResourceTable::DeleteResource(const wxString& name)
-{
-    wxItemResource *item = (wxItemResource *)Delete(WXSTRINGCAST name);
-    if (item)
-    {
-        // See if any resource has this as its child; if so, delete from
-        // parent's child list.
-        BeginFind();
-        wxHashTable::Node *node = Next();
-        while (node != NULL)
-        {
-            wxItemResource *parent = (wxItemResource *)node->GetData();
-            if (parent->GetChildren().Member(item))
-            {
-                parent->GetChildren().DeleteObject(item);
-                break;
-            }
-            node = Next();
-        }
-
-        delete item;
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxResourceTable::ParseResourceFile( wxInputStream *is )
-{
-    wxExprDatabase db;
-    int len = is->GetSize() ;
-
-    bool eof = false;
-    while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
-    {
-        wxResourceReadOneResource(is, db, &eof, this) ;
-    }
-    return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::ParseResourceFile(const wxString& filename)
-{
-    wxExprDatabase db;
-
-    FILE *fd = wxFopen(filename, wxT("r"));
-    if (!fd)
-        return false;
-    bool eof = false;
-    while (wxResourceReadOneResource(fd, db, &eof, this) && !eof)
-    {
-        // Loop
-    }
-    fclose(fd);
-    return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::ParseResourceData(const wxString& data)
-{
-    wxExprDatabase db;
-    if (!db.ReadFromString(data))
-    {
-        wxLogWarning(_("Ill-formed resource file syntax."));
-        return false;
-    }
-
-    return wxResourceInterpretResources(*this, db);
-}
-
-bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits[], int width, int height)
-{
-    // Register pre-loaded bitmap data
-    wxItemResource *item = new wxItemResource;
-    //  item->SetType(wxRESOURCE_TYPE_XBM_DATA);
-    item->SetType(wxT("wxXBMData"));
-    item->SetName(name);
-    item->SetValue1((long)bits);
-    item->SetValue2((long)width);
-    item->SetValue3((long)height);
-    AddResource(item);
-    return true;
-}
-
-bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **data)
-{
-    // Register pre-loaded bitmap data
-    wxItemResource *item = new wxItemResource;
-    //  item->SetType(wxRESOURCE_TYPE_XPM_DATA);
-    item->SetType(wxT("wxXPMData"));
-    item->SetName(name);
-    item->SetValue1((long)data);
-    AddResource(item);
-    return true;
-}
-
-bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
-{
-    return false;
-}
-
-void wxResourceTable::ClearTable()
-{
-    BeginFind();
-    wxHashTable::Node *node = Next();
-    while (node)
-    {
-        wxHashTable::Node *next = Next();
-        wxItemResource *item = (wxItemResource *)node->GetData();
-        delete item;
-        delete node;
-        node = next;
-    }
-}
-
-wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* childResource, const wxItemResource* parentResource) const
-{
-    int id = childResource->GetId();
-    if ( id == 0 )
-        id = wxID_ANY;
-
-    bool dlgUnits = ((parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0);
-
-    wxControl *control = (wxControl *) NULL;
-    wxString itemType(childResource->GetType());
-
-    wxPoint pos;
-    wxSize size;
-    if (dlgUnits)
-    {
-        pos = parent->ConvertDialogToPixels(wxPoint(childResource->GetX(), childResource->GetY()));
-        size = parent->ConvertDialogToPixels(wxSize(childResource->GetWidth(), childResource->GetHeight()));
-    }
-    else
-    {
-        pos = wxPoint(childResource->GetX(), childResource->GetY());
-        size = wxSize(childResource->GetWidth(), childResource->GetHeight());
-    }
-
-    if (itemType == wxString(wxT("wxButton")) || itemType == wxString(wxT("wxBitmapButton")))
-    {
-        if (!childResource->GetValue4().empty())
-        {
-            // Bitmap button
-            wxBitmap bitmap = childResource->GetBitmap();
-            if (!bitmap.Ok())
-            {
-                bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
-                ((wxItemResource*) childResource)->SetBitmap(bitmap);
-            }
-            if (!bitmap.Ok())
-#if defined(__WXPM__)
-                //
-                // OS/2 uses integer id's to access resources, not file name strings
-                //
-                bitmap.LoadFile(wxCROSS_BITMAP, wxBITMAP_TYPE_BMP_RESOURCE);
-#else
-                bitmap.LoadFile(wxT("cross_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
-#endif
-            control = new wxBitmapButton(parent, id, bitmap, pos, size,
-                childResource->GetStyle() | wxBU_AUTODRAW, wxDefaultValidator, childResource->GetName());
-        }
-        else
-            // Normal, text button
-            control = new wxButton(parent, id, childResource->GetTitle(), pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-    }
-    else if (itemType == wxString(wxT("wxMessage")) || itemType == wxString(wxT("wxStaticText")) ||
-        itemType == wxString(wxT("wxStaticBitmap")))
-    {
-        if (!childResource->GetValue4().empty() || itemType == wxString(wxT("wxStaticBitmap")) )
-        {
-            // Bitmap message
-            wxBitmap bitmap = childResource->GetBitmap();
-            if (!bitmap.Ok())
-            {
-                bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
-                ((wxItemResource*) childResource)->SetBitmap(bitmap);
-            }
-#if wxUSE_BITMAP_MESSAGE
-#ifdef __WXMSW__
-            // Use a default bitmap
-            if (!bitmap.Ok())
-                bitmap.LoadFile(wxT("cross_bmp"), wxBITMAP_TYPE_BMP_RESOURCE);
-#endif
-
-            if (bitmap.Ok())
-                control = new wxStaticBitmap(parent, id, bitmap, pos, size,
-                childResource->GetStyle(), childResource->GetName());
-#endif
-        }
-        else
-        {
-            control = new wxStaticText(parent, id, childResource->GetTitle(), pos, size,
-                childResource->GetStyle(), childResource->GetName());
-        }
-    }
-    else if (itemType == wxString(wxT("wxText")) || itemType == wxString(wxT("wxTextCtrl")) || itemType == wxString(wxT("wxMultiText")))
-    {
-        control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-    }
-    else if (itemType == wxString(wxT("wxCheckBox")))
-    {
-        control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
-        ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
-    }
-#if wxUSE_GAUGE
-    else if (itemType == wxString(wxT("wxGauge")))
-    {
-        control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
-        ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
-    }
-#endif
-#if wxUSE_RADIOBTN
-    else if (itemType == wxString(wxT("wxRadioButton")))
-    {
-        control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
-            pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-    }
-#endif
-#if wxUSE_SCROLLBAR
-    else if (itemType == wxString(wxT("wxScrollBar")))
-    {
-        control = new wxScrollBar(parent, id, pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-            /*
-            ((wxScrollBar *)control)->SetValue((int)childResource->GetValue1());
-            ((wxScrollBar *)control)->SetPageSize((int)childResource->GetValue2());
-            ((wxScrollBar *)control)->SetObjectLength((int)childResource->GetValue3());
-            ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());
-        */
-        ((wxScrollBar *)control)->SetScrollbar((int)childResource->GetValue1(),(int)childResource->GetValue2(),
-            (int)childResource->GetValue3(),(int)(long)childResource->GetValue5(),false);
-
-    }
-#endif
-    else if (itemType == wxString(wxT("wxSlider")))
-    {
-        control = new wxSlider(parent, id, (int)childResource->GetValue1(),
-            (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,
-            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-    }
-    else if (itemType == wxString(wxT("wxGroupBox")) || itemType == wxString(wxT("wxStaticBox")))
-    {
-        control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,
-            childResource->GetStyle(), childResource->GetName());
-    }
-    else if (itemType == wxString(wxT("wxListBox")))
-    {
-        wxStringList& stringList = childResource->GetStringValues();
-        wxString *strings = (wxString *) NULL;
-        int noStrings = 0;
-        if (stringList.GetCount() > 0)
-        {
-            noStrings = stringList.GetCount();
-            strings = new wxString[noStrings];
-            wxStringListNode *node = stringList.GetFirst();
-            int i = 0;
-            while (node)
-            {
-                strings[i] = (wxChar *)node->GetData();
-                i ++;
-                node = node->GetNext();
-            }
-        }
-        control = new wxListBox(parent, id, pos, size,
-            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
-        if (strings)
-            delete[] strings;
-    }
-    else if (itemType == wxString(wxT("wxChoice")))
-    {
-        wxStringList& stringList = childResource->GetStringValues();
-        wxString *strings = (wxString *) NULL;
-        int noStrings = 0;
-        if (stringList.GetCount() > 0)
-        {
-            noStrings = stringList.GetCount();
-            strings = new wxString[noStrings];
-            wxStringListNode *node = stringList.GetFirst();
-            int i = 0;
-            while (node)
-            {
-                strings[i] = (wxChar *)node->GetData();
-                i ++;
-                node = node->GetNext();
-            }
-        }
-        control = new wxChoice(parent, id, pos, size,
-            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
-        if (strings)
-            delete[] strings;
-    }
-#if wxUSE_COMBOBOX
-    else if (itemType == wxString(wxT("wxComboBox")))
-    {
-        wxStringList& stringList = childResource->GetStringValues();
-        wxString *strings = (wxString *) NULL;
-        int noStrings = 0;
-        if (stringList.GetCount() > 0)
-        {
-            noStrings = stringList.GetCount();
-            strings = new wxString[noStrings];
-            wxStringListNode *node = stringList.GetFirst();
-            int i = 0;
-            while (node)
-            {
-                strings[i] = (wxChar *)node->GetData();
-                i ++;
-                node = node->GetNext();
-            }
-        }
-        control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
-            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
-
-        if (strings)
-            delete[] strings;
-    }
-#endif
-    else if (itemType == wxString(wxT("wxRadioBox")))
-    {
-        wxStringList& stringList = childResource->GetStringValues();
-        wxString *strings = (wxString *) NULL;
-        int noStrings = 0;
-        if (stringList.GetCount() > 0)
-        {
-            noStrings = stringList.GetCount();
-            strings = new wxString[noStrings];
-            wxStringListNode *node = stringList.GetFirst();
-            int i = 0;
-            while (node)
-            {
-                strings[i] = (wxChar *)node->GetData();
-                i ++;
-                node = node->GetNext();
-            }
-        }
-        control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
-            noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
-            childResource->GetName());
-
-        if (strings)
-            delete[] strings;
-    }
-
-    if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
-    {
-        // Don't set font; will be inherited from parent.
-    }
-    else
-    {
-        if (control && childResource->GetFont().Ok())
-        {
-            control->SetFont(childResource->GetFont());
-
-#ifdef __WXMSW__
-            // Force the layout algorithm since the size changes the layout
-            if (control->IsKindOf(CLASSINFO(wxRadioBox)))
-            {
-                control->SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
-            }
-#endif
-        }
-    }
-    return control;
-}
-
-/*
-* Interpret database as a series of resources
-*/
-
-bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
-{
-    wxNode *node = db.GetFirst();
-    while (node)
-    {
-        wxExpr *clause = (wxExpr *)node->GetData();
-        wxString functor(clause->Functor());
-
-        wxItemResource *item = (wxItemResource *) NULL;
-        if (functor == wxT("dialog"))
-            item = wxResourceInterpretDialog(table, clause);
-        else if (functor == wxT("panel"))
-            item = wxResourceInterpretDialog(table, clause, true);
-        else if (functor == wxT("menubar"))
-            item = wxResourceInterpretMenuBar(table, clause);
-        else if (functor == wxT("menu"))
-            item = wxResourceInterpretMenu(table, clause);
-        else if (functor == wxT("string"))
-            item = wxResourceInterpretString(table, clause);
-        else if (functor == wxT("bitmap"))
-            item = wxResourceInterpretBitmap(table, clause);
-        else if (functor == wxT("icon"))
-            item = wxResourceInterpretIcon(table, clause);
-
-        if (item)
-        {
-            // Remove any existing resource of same name
-            if (!item->GetName().empty())
-                table.DeleteResource(item->GetName());
-            table.AddResource(item);
-        }
-        node = node->GetNext();
-    }
-    return true;
-}
-
-static const wxChar *g_ValidControlClasses[] =
-{
-    wxT("wxButton"),
-        wxT("wxBitmapButton"),
-        wxT("wxMessage"),
-        wxT("wxStaticText"),
-        wxT("wxStaticBitmap"),
-        wxT("wxText"),
-        wxT("wxTextCtrl"),
-        wxT("wxMultiText"),
-        wxT("wxListBox"),
-        wxT("wxRadioBox"),
-        wxT("wxRadioButton"),
-        wxT("wxCheckBox"),
-        wxT("wxBitmapCheckBox"),
-        wxT("wxGroupBox"),
-        wxT("wxStaticBox"),
-        wxT("wxSlider"),
-        wxT("wxGauge"),
-        wxT("wxScrollBar"),
-        wxT("wxChoice"),
-        wxT("wxComboBox")
-};
-
-static bool wxIsValidControlClass(const wxString& c)
-{
-    for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )
-    {
-        if ( c == g_ValidControlClasses[i] )
-            return true;
-    }
-    return false;
-}
-
-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel)
-{
-    wxItemResource *dialogItem = new wxItemResource;
-    if (isPanel)
-        dialogItem->SetType(wxT("wxPanel"));
-    else
-        dialogItem->SetType(wxT("wxDialog"));
-    wxString style = wxEmptyString;
-    wxString title = wxEmptyString;
-    wxString name = wxEmptyString;
-    wxString backColourHex = wxEmptyString;
-    wxString labelColourHex = wxEmptyString;
-    wxString buttonColourHex = wxEmptyString;
-
-    long windowStyle = wxDEFAULT_DIALOG_STYLE;
-    if (isPanel)
-        windowStyle = 0;
-
-    int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;
-    int isModal = 0;
-    wxExpr *labelFontExpr = (wxExpr *) NULL;
-    wxExpr *buttonFontExpr = (wxExpr *) NULL;
-    wxExpr *fontExpr = (wxExpr *) NULL;
-    expr->GetAttributeValue(wxT("style"), style);
-    expr->GetAttributeValue(wxT("name"), name);
-    expr->GetAttributeValue(wxT("title"), title);
-    expr->GetAttributeValue(wxT("x"), x);
-    expr->GetAttributeValue(wxT("y"), y);
-    expr->GetAttributeValue(wxT("width"), width);
-    expr->GetAttributeValue(wxT("height"), height);
-    expr->GetAttributeValue(wxT("modal"), isModal);
-    expr->GetAttributeValue(wxT("label_font"), &labelFontExpr);
-    expr->GetAttributeValue(wxT("button_font"), &buttonFontExpr);
-    expr->GetAttributeValue(wxT("font"), &fontExpr);
-    expr->GetAttributeValue(wxT("background_colour"), backColourHex);
-    expr->GetAttributeValue(wxT("label_colour"), labelColourHex);
-    expr->GetAttributeValue(wxT("button_colour"), buttonColourHex);
-
-    int useDialogUnits = 0;
-    expr->GetAttributeValue(wxT("use_dialog_units"), useDialogUnits);
-    if (useDialogUnits != 0)
-        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
-
-    int useDefaults = 0;
-    expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);
-    if (useDefaults != 0)
-        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
-
-    int id = 0;
-    expr->GetAttributeValue(wxT("id"), id);
-    dialogItem->SetId(id);
-
-    if (!style.empty())
-    {
-        windowStyle = wxParseWindowStyle(style);
-    }
-    dialogItem->SetStyle(windowStyle);
-    dialogItem->SetValue1(isModal);
-
-#if WXWIN_COMPATIBILITY_2_6
-
-#ifdef __VMS
-#pragma message disable CODCAUUNR
-#endif
-   if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
-        dialogItem->SetValue1(true);
-#ifdef __VMS
-#pragma message enable CODCAUUNR
-#endif
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-    dialogItem->SetName(name);
-    dialogItem->SetTitle(title);
-    dialogItem->SetSize(x, y, width, height);
-
-    // Check for wxWin 1.68-style specifications
-    if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)
-        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
-    else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)
-        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
-
-    if (!backColourHex.empty())
-    {
-        int r = 0;
-        int g = 0;
-        int b = 0;
-        r = wxHexToDec(backColourHex.Mid(0, 2));
-        g = wxHexToDec(backColourHex.Mid(2, 2));
-        b = wxHexToDec(backColourHex.Mid(4, 2));
-        dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    }
-    if (!labelColourHex.empty())
-    {
-        int r = 0;
-        int g = 0;
-        int b = 0;
-        r = wxHexToDec(labelColourHex.Mid(0, 2));
-        g = wxHexToDec(labelColourHex.Mid(2, 2));
-        b = wxHexToDec(labelColourHex.Mid(4, 2));
-        dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    }
-    if (!buttonColourHex.empty())
-    {
-        int r = 0;
-        int g = 0;
-        int b = 0;
-        r = wxHexToDec(buttonColourHex.Mid(0, 2));
-        g = wxHexToDec(buttonColourHex.Mid(2, 2));
-        b = wxHexToDec(buttonColourHex.Mid(4, 2));
-        dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    }
-
-    if (fontExpr)
-        dialogItem->SetFont(wxResourceInterpretFontSpec(fontExpr));
-    else if (buttonFontExpr)
-        dialogItem->SetFont(wxResourceInterpretFontSpec(buttonFontExpr));
-    else if (labelFontExpr)
-        dialogItem->SetFont(wxResourceInterpretFontSpec(labelFontExpr));
-
-    // Now parse all controls
-    wxExpr *controlExpr = expr->GetFirst();
-    while (controlExpr)
-    {
-        if (controlExpr->Number() == 3)
-        {
-            wxString controlKeyword(controlExpr->Nth(1)->StringValue());
-            if (!controlKeyword.empty() && controlKeyword == wxT("control"))
-            {
-                // The value part: always a list.
-                wxExpr *listExpr = controlExpr->Nth(2);
-                if (listExpr->Type() == PrologList)
-                {
-                    wxItemResource *controlItem = wxResourceInterpretControl(table, listExpr);
-                    if (controlItem)
-                    {
-                        dialogItem->GetChildren().Append(controlItem);
-                    }
-                }
-            }
-        }
-        controlExpr = controlExpr->GetNext();
-    }
-    return dialogItem;
-}
-
-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
-{
-    wxItemResource *controlItem = new wxItemResource;
-
-    // First, find the standard features of a control definition:
-    // [optional integer/string id], control name, title, style, name, x, y, width, height
-
-    wxString controlType;
-    wxString style;
-    wxString title;
-    wxString name;
-    int id = 0;
-    long windowStyle = 0;
-    int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;
-    int count = 0;
-
-    wxExpr *expr1 = expr->Nth(0);
-
-    if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
-    {
-        if ( wxIsValidControlClass(expr1->StringValue()) )
-        {
-            count = 1;
-            controlType = expr1->StringValue();
-        }
-        else
-        {
-            wxString str(expr1->StringValue());
-            id = wxResourceGetIdentifier(str, &table);
-            if (id == 0)
-            {
-                wxLogWarning(_("Could not resolve control class or id '%s'. Use (non-zero) integer instead\n or provide #define (see manual for caveats)"),
-                    (const wxChar*) expr1->StringValue());
-                delete controlItem;
-                return (wxItemResource *) NULL;
-            }
-            else
-            {
-                // Success - we have an id, so the 2nd element must be the control class.
-                controlType = expr->Nth(1)->StringValue();
-                count = 2;
-            }
-        }
-    }
-    else if (expr1->Type() == PrologInteger)
-    {
-        id = (int)expr1->IntegerValue();
-        // Success - we have an id, so the 2nd element must be the control class.
-        controlType = expr->Nth(1)->StringValue();
-        count = 2;
-    }
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if ( expr1 )
-        title = expr1->StringValue();
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-    {
-        style = expr1->StringValue();
-        windowStyle = wxParseWindowStyle(style);
-    }
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-        name = expr1->StringValue();
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-        x = (int)expr1->IntegerValue();
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-        y = (int)expr1->IntegerValue();
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-        width = (int)expr1->IntegerValue();
-
-    expr1 = expr->Nth(count);
-    count ++;
-    if (expr1)
-        height = (int)expr1->IntegerValue();
-
-    controlItem->SetStyle(windowStyle);
-    controlItem->SetName(name);
-    controlItem->SetTitle(title);
-    controlItem->SetSize(x, y, width, height);
-    controlItem->SetType(controlType);
-    controlItem->SetId(id);
-
-    // Check for wxWin 1.68-style specifications
-    if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)
-        controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
-    else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)
-        controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
-
-    if (controlType == wxT("wxButton"))
-    {
-        // Check for bitmap resource name (in case loading old-style resource file)
-        if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
-        {
-            wxString str(expr->Nth(count)->StringValue());
-            count ++;
-
-            if (!str.empty())
-            {
-                controlItem->SetValue4(str);
-                controlItem->SetType(wxT("wxBitmapButton"));
-            }
-        }
-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-    }
-    else if (controlType == wxT("wxBitmapButton"))
-    {
-        // Check for bitmap resource name
-        if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
-        {
-            wxString str(expr->Nth(count)->StringValue());
-            controlItem->SetValue4(str);
-            count ++;
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-        }
-    }
-    else if (controlType == wxT("wxCheckBox"))
-    {
-        // Check for default value
-        if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-        {
-            controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-            count ++;
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-        }
-    }
-#if wxUSE_RADIOBTN
-    else if (controlType == wxT("wxRadioButton"))
-    {
-        // Check for default value
-        if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-        {
-            controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-            count ++;
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-        }
-    }
-#endif
-    else if (controlType == wxT("wxText") || controlType == wxT("wxTextCtrl") || controlType == wxT("wxMultiText"))
-    {
-        // Check for default value
-        if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
-        {
-            wxString str(expr->Nth(count)->StringValue());
-            controlItem->SetValue4(str);
-            count ++;
-
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            {
-                // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-                // Skip past the obsolete label font spec if there are two consecutive specs
-                if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                    count ++;
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-            }
-        }
-    }
-    else if (controlType == wxT("wxMessage") || controlType == wxT("wxStaticText"))
-    {
-        // Check for bitmap resource name (in case it's an old-style .wxr file)
-        if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
-        {
-            wxString str(expr->Nth(count)->StringValue());
-            controlItem->SetValue4(str);
-            count ++;
-            controlItem->SetType(wxT("wxStaticText"));
-        }
-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-    }
-    else if (controlType == wxT("wxStaticBitmap"))
-    {
-        // Check for bitmap resource name
-        if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
-        {
-            wxString str(expr->Nth(count)->StringValue());
-            controlItem->SetValue4(str);
-            count ++;
-        }
-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-    }
-    else if (controlType == wxT("wxGroupBox") || controlType == wxT("wxStaticBox"))
-    {
-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-    }
-    else if (controlType == wxT("wxGauge"))
-    {
-        // Check for default value
-        if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-        {
-            controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-            count ++;
-
-            // Check for range
-            if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-            {
-                controlItem->SetValue2(expr->Nth(count)->IntegerValue());
-                count ++;
-
-                if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                {
-                    // Skip past the obsolete label font spec if there are two consecutive specs
-                    if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                        count ++;
-                    controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-                }
-            }
-        }
-    }
-    else if (controlType == wxT("wxSlider"))
-    {
-        // Check for default value
-        if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-        {
-            controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-            count ++;
-
-            // Check for min
-            if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-            {
-                controlItem->SetValue2(expr->Nth(count)->IntegerValue());
-                count ++;
-
-                // Check for max
-                if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-                {
-                    controlItem->SetValue3(expr->Nth(count)->IntegerValue());
-                    count ++;
-
-                    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                    {
-                        // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-                        // do nothing
-                        count ++;
-
-                        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-                    }
-                }
-            }
-        }
-    }
-    else if (controlType == wxT("wxScrollBar"))
-    {
-        // DEFAULT VALUE
-        if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-        {
-            controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-            count ++;
-
-            // PAGE LENGTH
-            if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-            {
-                controlItem->SetValue2(expr->Nth(count)->IntegerValue());
-                count ++;
-
-                // OBJECT LENGTH
-                if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-                {
-                    controlItem->SetValue3(expr->Nth(count)->IntegerValue());
-                    count ++;
-
-                    // VIEW LENGTH
-                    if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-                        controlItem->SetValue5(expr->Nth(count)->IntegerValue());
-                }
-            }
-        }
-    }
-    else if (controlType == wxT("wxListBox"))
-    {
-        wxExpr *valueList = (wxExpr *) NULL;
-
-        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
-        {
-            wxStringList stringList;
-            wxExpr *stringExpr = valueList->GetFirst();
-            while (stringExpr)
-            {
-                stringList.Add(stringExpr->StringValue());
-                stringExpr = stringExpr->GetNext();
-            }
-            controlItem->SetStringValues(stringList);
-            count ++;
-            // This is now obsolete: it's in the window style.
-            // Check for wxSINGLE/wxMULTIPLE
-            wxExpr *mult = (wxExpr *) NULL;
-            /*
-            controlItem->SetValue1(wxLB_SINGLE);
-            */
-            if (((mult = expr->Nth(count)) != 0) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
-            {
-            /*
-            wxString m(mult->StringValue());
-            if (m == "wxLB_MULTIPLE")
-            controlItem->SetValue1(wxLB_MULTIPLE);
-            else if (m == "wxLB_EXTENDED")
-            controlItem->SetValue1(wxLB_EXTENDED);
-                */
-                // Ignore the value
-                count ++;
-            }
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            {
-                // Skip past the obsolete label font spec if there are two consecutive specs
-                if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                    count ++;
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-            }
-        }
-    }
-    else if (controlType == wxT("wxChoice"))
-    {
-        wxExpr *valueList = (wxExpr *) NULL;
-        // Check for default value list
-        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
-        {
-            wxStringList stringList;
-            wxExpr *stringExpr = valueList->GetFirst();
-            while (stringExpr)
-            {
-                stringList.Add(stringExpr->StringValue());
-                stringExpr = stringExpr->GetNext();
-            }
-            controlItem->SetStringValues(stringList);
-
-            count ++;
-
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            {
-                // Skip past the obsolete label font spec if there are two consecutive specs
-                if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                    count ++;
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-            }
-        }
-    }
-#if wxUSE_COMBOBOX
-    else if (controlType == wxT("wxComboBox"))
-    {
-        wxExpr *textValue = expr->Nth(count);
-        if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
-        {
-            wxString str(textValue->StringValue());
-            controlItem->SetValue4(str);
-
-            count ++;
-
-            wxExpr *valueList = (wxExpr *) NULL;
-            // Check for default value list
-            if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
-            {
-                wxStringList stringList;
-                wxExpr *stringExpr = valueList->GetFirst();
-                while (stringExpr)
-                {
-                    stringList.Add(stringExpr->StringValue());
-                    stringExpr = stringExpr->GetNext();
-                }
-                controlItem->SetStringValues(stringList);
-
-                count ++;
-
-                if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-                {
-                    // Skip past the obsolete label font spec if there are two consecutive specs
-                    if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                        count ++;
-                    controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-                }
-            }
-        }
-    }
-#endif
-#if 1
-    else if (controlType == wxT("wxRadioBox"))
-    {
-        wxExpr *valueList = (wxExpr *) NULL;
-        // Check for default value list
-        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))
-        {
-            wxStringList stringList;
-            wxExpr *stringExpr = valueList->GetFirst();
-            while (stringExpr)
-            {
-                stringList.Add(stringExpr->StringValue());
-                stringExpr = stringExpr->GetNext();
-            }
-            controlItem->SetStringValues(stringList);
-            count ++;
-
-            // majorDim (number of rows or cols)
-            if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
-            {
-                controlItem->SetValue1(expr->Nth(count)->IntegerValue());
-                count ++;
-            }
-            else
-                controlItem->SetValue1(0);
-
-            if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            {
-                // Skip past the obsolete label font spec if there are two consecutive specs
-                if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
-                    count ++;
-                controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-            }
-        }
-    }
-#endif
-    else
-    {
-        delete controlItem;
-        return (wxItemResource *) NULL;
-    }
-    return controlItem;
-}
-
-// Forward declaration
-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);
-
-/*
-* Interpet a menu item
-*/
-
-wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr)
-{
-    wxItemResource *item = new wxItemResource;
-
-    wxExpr *labelExpr = expr->Nth(0);
-    wxExpr *idExpr = expr->Nth(1);
-    wxExpr *helpExpr = expr->Nth(2);
-    wxExpr *checkableExpr = expr->Nth(3);
-
-    // Further keywords/attributes to follow sometime...
-    if (expr->Number() == 0)
-    {
-        //    item->SetType(wxRESOURCE_TYPE_SEPARATOR);
-        item->SetType(wxT("wxMenuSeparator"));
-        return item;
-    }
-    else
-    {
-        //    item->SetType(wxTYPE_MENU); // Well, menu item, but doesn't matter.
-        item->SetType(wxT("wxMenu")); // Well, menu item, but doesn't matter.
-        if (labelExpr)
-        {
-            wxString str(labelExpr->StringValue());
-            item->SetTitle(str);
-        }
-        if (idExpr)
-        {
-            int id = 0;
-            // If a string or word, must look up in identifier table.
-            if ((idExpr->Type() == PrologString) || (idExpr->Type() == PrologWord))
-            {
-                wxString str(idExpr->StringValue());
-                id = wxResourceGetIdentifier(str, &table);
-                if (id == 0)
-                {
-                    wxLogWarning(_("Could not resolve menu id '%s'. Use (non-zero) integer instead\nor provide #define (see manual for caveats)"),
-                        (const wxChar*) idExpr->StringValue());
-                }
-            }
-            else if (idExpr->Type() == PrologInteger)
-                id = (int)idExpr->IntegerValue();
-            item->SetValue1(id);
-        }
-        if (helpExpr)
-        {
-            wxString str(helpExpr->StringValue());
-            item->SetValue4(str);
-        }
-        if (checkableExpr)
-            item->SetValue2(checkableExpr->IntegerValue());
-
-        // Find the first expression that's a list, for submenu
-        wxExpr *subMenuExpr = expr->GetFirst();
-        while (subMenuExpr && (subMenuExpr->Type() != PrologList))
-            subMenuExpr = subMenuExpr->GetNext();
-
-        while (subMenuExpr)
-        {
-            wxItemResource *child = wxResourceInterpretMenuItem(table, subMenuExpr);
-            item->GetChildren().Append(child);
-            subMenuExpr = subMenuExpr->GetNext();
-        }
-    }
-    return item;
-}
-
-/*
-* Interpret a nested list as a menu
-*/
-/*
-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr)
-{
-wxItemResource *menu = new wxItemResource;
-//  menu->SetType(wxTYPE_MENU);
-menu->SetType("wxMenu");
-wxExpr *element = expr->GetFirst();
-while (element)
-{
-wxItemResource *item = wxResourceInterpretMenuItem(table, element);
-if (item)
-menu->GetChildren().Append(item);
-element = element->GetNext();
-}
-return menu;
-}
-*/
-
-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
-{
-    wxExpr *listExpr = (wxExpr *) NULL;
-    expr->GetAttributeValue(wxT("menu"), &listExpr);
-    if (!listExpr)
-        return (wxItemResource *) NULL;
-
-    wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
-
-    if (!menuResource)
-        return (wxItemResource *) NULL;
-
-    wxString name;
-    if (expr->GetAttributeValue(wxT("name"), name))
-    {
-        menuResource->SetName(name);
-    }
-
-    return menuResource;
-}
-
-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
-{
-    wxExpr *listExpr = (wxExpr *) NULL;
-    expr->GetAttributeValue(wxT("menu"), &listExpr);
-    if (!listExpr)
-        return (wxItemResource *) NULL;
-
-    wxItemResource *resource = new wxItemResource;
-    resource->SetType(wxT("wxMenu"));
-    //  resource->SetType(wxTYPE_MENU);
-
-    wxExpr *element = listExpr->GetFirst();
-    while (element)
-    {
-        wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
-        resource->GetChildren().Append(menuResource);
-        element = element->GetNext();
-    }
-
-    wxString name;
-    if (expr->GetAttributeValue(wxT("name"), name))
-    {
-        resource->SetName(name);
-    }
-
-    return resource;
-}
-
-wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), wxExpr *WXUNUSED(expr))
-{
-    return (wxItemResource *) NULL;
-}
-
-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxExpr *expr)
-{
-    wxItemResource *bitmapItem = new wxItemResource;
-    //  bitmapItem->SetType(wxTYPE_BITMAP);
-    bitmapItem->SetType(wxT("wxBitmap"));
-    wxString name;
-    if (expr->GetAttributeValue(wxT("name"), name))
-    {
-        bitmapItem->SetName(name);
-    }
-    // Now parse all bitmap specifications
-    wxExpr *bitmapExpr = expr->GetFirst();
-    while (bitmapExpr)
-    {
-        if (bitmapExpr->Number() == 3)
-        {
-            wxString bitmapKeyword(bitmapExpr->Nth(1)->StringValue());
-            if (bitmapKeyword == wxT("bitmap") || bitmapKeyword == wxT("icon"))
-            {
-                // The value part: always a list.
-                wxExpr *listExpr = bitmapExpr->Nth(2);
-                if (listExpr->Type() == PrologList)
-                {
-                    wxItemResource *bitmapSpec = new wxItemResource;
-                    //          bitmapSpec->SetType(wxTYPE_BITMAP);
-                    bitmapSpec->SetType(wxT("wxBitmap"));
-
-                    // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
-                    // where everything after 'filename' is optional.
-                    wxExpr *nameExpr = listExpr->Nth(0);
-                    wxExpr *typeExpr = listExpr->Nth(1);
-                    wxExpr *platformExpr = listExpr->Nth(2);
-                    wxExpr *coloursExpr = listExpr->Nth(3);
-                    wxExpr *xresExpr = listExpr->Nth(4);
-                    wxExpr *yresExpr = listExpr->Nth(5);
-                    if (nameExpr && !nameExpr->StringValue().empty())
-                    {
-                        bitmapSpec->SetName(nameExpr->StringValue());
-                    }
-                    if (typeExpr && !typeExpr->StringValue().empty())
-                    {
-                        bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
-                    }
-                    else
-                        bitmapSpec->SetValue1(0);
-
-                    if (platformExpr && !platformExpr->StringValue().empty())
-                    {
-                        wxString plat(platformExpr->StringValue());
-                        if (plat == wxT("windows") || plat == wxT("WINDOWS"))
-                            bitmapSpec->SetValue2(RESOURCE_PLATFORM_WINDOWS);
-                        else if (plat == wxT("x") || plat == wxT("X"))
-                            bitmapSpec->SetValue2(RESOURCE_PLATFORM_X);
-                        else if (plat == wxT("mac") || plat == wxT("MAC"))
-                            bitmapSpec->SetValue2(RESOURCE_PLATFORM_MAC);
-                        else
-                            bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
-                    }
-                    else
-                        bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
-
-                    if (coloursExpr)
-                        bitmapSpec->SetValue3(coloursExpr->IntegerValue());
-                    int xres = 0;
-                    int yres = 0;
-                    if (xresExpr)
-                        xres = (int)xresExpr->IntegerValue();
-                    if (yresExpr)
-                        yres = (int)yresExpr->IntegerValue();
-                    bitmapSpec->SetSize(0, 0, xres, yres);
-
-                    bitmapItem->GetChildren().Append(bitmapSpec);
-                }
-            }
-        }
-        bitmapExpr = bitmapExpr->GetNext();
-    }
-
-    return bitmapItem;
-}
-
-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr)
-{
-    wxItemResource *item = wxResourceInterpretBitmap(table, expr);
-    if (item)
-    {
-        //    item->SetType(wxTYPE_ICON);
-        item->SetType(wxT("wxIcon"));
-        return item;
-    }
-    else
-        return (wxItemResource *) NULL;
-}
-
-// Interpret list expression as a font
-wxFont wxResourceInterpretFontSpec(wxExpr *expr)
-{
-    if (expr->Type() != PrologList)
-        return wxNullFont;
-
-    int point = 10;
-    int family = wxSWISS;
-    int style = wxNORMAL;
-    int weight = wxNORMAL;
-    int underline = 0;
-    wxString faceName;
-
-    wxExpr *pointExpr = expr->Nth(0);
-    wxExpr *familyExpr = expr->Nth(1);
-    wxExpr *styleExpr = expr->Nth(2);
-    wxExpr *weightExpr = expr->Nth(3);
-    wxExpr *underlineExpr = expr->Nth(4);
-    wxExpr *faceNameExpr = expr->Nth(5);
-    if (pointExpr)
-        point = (int)pointExpr->IntegerValue();
-
-    wxString str;
-    if (familyExpr)
-    {
-        str = familyExpr->StringValue();
-        family = (int)wxParseWindowStyle(str);
-    }
-    if (styleExpr)
-    {
-        str = styleExpr->StringValue();
-        style = (int)wxParseWindowStyle(str);
-    }
-    if (weightExpr)
-    {
-        str = weightExpr->StringValue();
-        weight = (int)wxParseWindowStyle(str);
-    }
-    if (underlineExpr)
-        underline = (int)underlineExpr->IntegerValue();
-    if (faceNameExpr)
-        faceName = faceNameExpr->StringValue();
-
-    return *wxTheFontList->FindOrCreateFont(point, family, style, weight,
-                                            (underline != 0), faceName);
-}
-
-/*
-* (Re)allocate buffer for reading in from resource file
-*/
-
-bool wxReallocateResourceBuffer()
-{
-    if (!wxResourceBuffer)
-    {
-        wxResourceBufferSize = 1000;
-        wxResourceBuffer = new char[wxResourceBufferSize];
-        return true;
-    }
-    if (wxResourceBuffer)
-    {
-        long newSize = wxResourceBufferSize + 1000;
-        char *tmp = new char[(int)newSize];
-        strncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount);
-        delete[] wxResourceBuffer;
-        wxResourceBuffer = tmp;
-        wxResourceBufferSize = newSize;
-    }
-    return true;
-}
-
-static bool wxEatWhiteSpace(FILE *fd)
-{
-    int ch;
-
-    while ((ch = getc(fd)) != EOF)
-    {
-        switch (ch)
-        {
-        case ' ':
-        case 0x0a:
-        case 0x0d:
-        case 0x09:
-            break;
-        case '/':
-            {
-                int prev_ch = ch;
-                ch = getc(fd);
-                if (ch == EOF)
-                {
-                    ungetc(prev_ch, fd);
-                    return true;
-                }
-
-                if (ch == '*')
-                {
-                    // Eat C comment
-                    prev_ch = 0;
-                    while ((ch = getc(fd)) != EOF)
-                    {
-                        if (ch == '/' && prev_ch == '*')
-                            break;
-                        prev_ch = ch;
-                    }
-                }
-                else if (ch == '/')
-                {
-                    // Eat C++ comment
-                    static char buffer[255];
-                    fgets(buffer, 255, fd);
-                }
-                else
-                {
-                    ungetc(prev_ch, fd);
-                    ungetc(ch, fd);
-                    return true;
-                }
-            }
-            break;
-        default:
-            ungetc(ch, fd);
-            return true;
-
-        }
-    }
-    return false;
-}
-static bool wxEatWhiteSpace(wxInputStream *is)
-{
-    char ch = is->GetC() ;
-    if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
-    {
-        is->Ungetch(ch);
-        return true;
-    }
-
-    // Eat whitespace
-    while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-        ch = is->GetC();
-    // Check for comment
-    if (ch == '/')
-    {
-        ch = is->GetC();
-        if (ch == '*')
-        {
-            bool finished = false;
-            while (!finished)
-            {
-                ch = is->GetC();
-                if (is->LastRead() == 0)
-                    return false;
-                if (ch == '*')
-                {
-                    int newCh = is->GetC();
-                    if (newCh == '/')
-                        finished = true;
-                    else
-                    {
-                        is->Ungetch(ch);
-                    }
-                }
-            }
-        }
-        else // False alarm
-            return false;
-    }
-    else
-        is->Ungetch(ch);
-    return wxEatWhiteSpace(is);
-}
-
-bool wxGetResourceToken(FILE *fd)
-{
-    if (!wxResourceBuffer)
-        wxReallocateResourceBuffer();
-    wxResourceBuffer[0] = 0;
-    wxEatWhiteSpace(fd);
-
-    int ch = getc(fd);
-    if (ch == '"')
-    {
-        // Get string
-        wxResourceBufferCount = 0;
-        ch = getc(fd);
-        while (ch != '"')
-        {
-            int actualCh = ch;
-            if (ch == EOF)
-            {
-                wxResourceBuffer[wxResourceBufferCount] = 0;
-                return false;
-            }
-            // Escaped characters
-            else if (ch == '\\')
-            {
-                int newCh = getc(fd);
-                if (newCh == '"')
-                    actualCh = '"';
-                else if (newCh == 10)
-                    actualCh = 10;
-                else
-                {
-                    ungetc(newCh, fd);
-                }
-            }
-
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
-            wxResourceBufferCount ++;
-            ch = getc(fd);
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-    }
-    else
-    {
-        wxResourceBufferCount = 0;
-        // Any other token
-        while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
-        {
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)ch;
-            wxResourceBufferCount ++;
-
-            ch = getc(fd);
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-        if (ch == EOF)
-            return false;
-    }
-    return true;
-}
-
-bool wxGetResourceToken(wxInputStream *is)
-{
-    if (!wxResourceBuffer)
-        wxReallocateResourceBuffer();
-    wxResourceBuffer[0] = 0;
-    wxEatWhiteSpace(is);
-
-    int ch = is->GetC() ;
-    if (ch == '"')
-    {
-        // Get string
-        wxResourceBufferCount = 0;
-        ch = is->GetC();
-        while (ch != '"')
-        {
-            int actualCh = ch;
-            if (ch == EOF)
-            {
-                wxResourceBuffer[wxResourceBufferCount] = 0;
-                return false;
-            }
-            // Escaped characters
-            else if (ch == '\\')
-            {
-                char newCh = is->GetC();
-                if (newCh == '"')
-                    actualCh = '"';
-                else if (newCh == 10)
-                    actualCh = 10;
-                else if (newCh == 13) // mac
-                    actualCh = 10;
-                else
-                {
-                    is->Ungetch(newCh);
-                }
-            }
-
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
-            wxResourceBufferCount ++;
-            ch = is->GetC();
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-    }
-    else
-    {
-        wxResourceBufferCount = 0;
-        // Any other token
-        while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
-        {
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)ch;
-            wxResourceBufferCount ++;
-
-            ch = is->GetC();
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-        if (ch == EOF)
-            return false;
-    }
-    return true;
-}
-
-/*
-* Files are in form:
-static char *name = "....";
-with possible comments.
-*/
-
-bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    // static or #define
-    if (!wxGetResourceToken(fd))
-    {
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "#define") == 0)
-    {
-        wxGetResourceToken(fd);
-        wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-        wxGetResourceToken(fd);
-        wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-        if (wxIsdigit(value[0]))
-        {
-            int val = (int)wxAtol(value);
-            wxResourceAddIdentifier(name, val, table);
-        }
-        else
-        {
-            wxLogWarning(_("#define %s must be an integer."), name);
-            delete[] name;
-            delete[] value;
-            return false;
-        }
-        delete[] name;
-        delete[] value;
-
-        return true;
-    }
-    else if (strcmp(wxResourceBuffer, "#include") == 0)
-    {
-        wxGetResourceToken(fd);
-        wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-        wxChar *actualName = name;
-        if (name[0] == wxT('"'))
-            actualName = name + 1;
-        int len = wxStrlen(name);
-        if ((len > 0) && (name[len-1] == wxT('"')))
-            name[len-1] = 0;
-        if (!wxResourceParseIncludeFile(actualName, table))
-        {
-            wxLogWarning(_("Could not find resource include file %s."), actualName);
-        }
-        delete[] name;
-        return true;
-    }
-    else if (strcmp(wxResourceBuffer, "static") != 0)
-    {
-        wxChar buf[300];
-        wxStrcpy(buf, _("Found "));
-        wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
-        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
-        wxLogWarning(buf);
-        return false;
-    }
-
-    // char
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "char") != 0)
-    {
-        wxLogWarning(_("Expected 'char' while parsing resource."));
-        return false;
-    }
-
-    // *name
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (wxResourceBuffer[0] != '*')
-    {
-        wxLogWarning(_("Expected '*' while parsing resource."));
-        return false;
-    }
-    wxChar nameBuf[100];
-    wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
-    nameBuf[99] = 0;
-
-    // =
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "=") != 0)
-    {
-        wxLogWarning(_("Expected '=' while parsing resource."));
-        return false;
-    }
-
-    // String
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-    else
-    {
-        if (!db.ReadPrologFromString(wxResourceBuffer))
-        {
-            wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
-            return false;
-        }
-    }
-    // Semicolon
-    if (!wxGetResourceToken(fd))
-    {
-        *eof = true;
-    }
-    return true;
-}
-
-bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    // static or #define
-    if (!wxGetResourceToken(fd))
-    {
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "#define") == 0)
-    {
-        wxGetResourceToken(fd);
-        wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
-        wxGetResourceToken(fd);
-        wxChar *value = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
-        if (wxIsalpha(value[0]))
-        {
-            int val = (int)wxAtol(value);
-            wxResourceAddIdentifier(name, val, table);
-        }
-        else
-        {
-            wxLogWarning(_("#define %s must be an integer."), name);
-            delete[] name;
-            delete[] value;
-            return false;
-        }
-        delete[] name;
-        delete[] value;
-
-        return true;
-    }
-    else if (strcmp(wxResourceBuffer, "#include") == 0)
-    {
-        wxGetResourceToken(fd);
-        wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
-        wxChar *actualName = name;
-        if (name[0] == wxT('"'))
-            actualName = name + 1;
-        int len = wxStrlen(name);
-        if ((len > 0) && (name[len-1] == wxT('"')))
-            name[len-1] = 0;
-        if (!wxResourceParseIncludeFile(actualName, table))
-        {
-            wxLogWarning(_("Could not find resource include file %s."), actualName);
-        }
-        delete[] name;
-        return true;
-    }
-    else if (strcmp(wxResourceBuffer, "static") != 0)
-    {
-        wxChar buf[300];
-        wxStrcpy(buf, _("Found "));
-        wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
-        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
-        wxLogWarning(buf);
-        return false;
-    }
-
-    // char
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "char") != 0)
-    {
-        wxLogWarning(_("Expected 'char' while parsing resource."));
-        return false;
-    }
-
-    // *name
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (wxResourceBuffer[0] != '*')
-    {
-        wxLogWarning(_("Expected '*' while parsing resource."));
-        return false;
-    }
-    char nameBuf[100];
-    strncpy(nameBuf, wxResourceBuffer+1, 99);
-
-    // =
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "=") != 0)
-    {
-        wxLogWarning(_("Expected '=' while parsing resource."));
-        return false;
-    }
-
-    // String
-    if (!wxGetResourceToken(fd))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-    else
-    {
-        if (!db.ReadPrologFromString(wxResourceBuffer))
-        {
-            wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
-            return false;
-        }
-    }
-    // Semicolon
-    if (!wxGetResourceToken(fd))
-    {
-        *eof = true;
-    }
-    return true;
-}
-
-/*
-* Parses string window style into integer window style
-*/
-
-/*
-* Style flag parsing, e.g.
-* "wxSYSTEM_MENU | wxBORDER" -> integer
-*/
-
-wxChar* wxResourceParseWord(wxChar*s, int *i)
-{
-    if (!s)
-        return (wxChar*) NULL;
-
-    static wxChar buf[150];
-    int len = wxStrlen(s);
-    int j = 0;
-    int ii = *i;
-    while ((ii < len) && (wxIsalpha(s[ii]) || (s[ii] == wxT('_'))))
-    {
-        buf[j] = s[ii];
-        j ++;
-        ii ++;
-    }
-    buf[j] = 0;
-
-    // Eat whitespace and conjunction characters
-    while ((ii < len) &&
-        ((s[ii] == wxT(' ')) || (s[ii] == wxT('|')) || (s[ii] == wxT(','))))
-    {
-        ii ++;
-    }
-    *i = ii;
-    if (j == 0)
-        return (wxChar*) NULL;
-    else
-        return buf;
-}
-
-struct wxResourceBitListStruct
-{
-    const wxChar *word;
-    long bits;
-};
-
-static wxResourceBitListStruct wxResourceBitListTable[] =
-{
-    /* wxListBox */
-    { wxT("wxSINGLE"), wxLB_SINGLE },
-    { wxT("wxMULTIPLE"), wxLB_MULTIPLE },
-    { wxT("wxEXTENDED"), wxLB_EXTENDED },
-    { wxT("wxLB_SINGLE"), wxLB_SINGLE },
-    { wxT("wxLB_MULTIPLE"), wxLB_MULTIPLE },
-    { wxT("wxLB_EXTENDED"), wxLB_EXTENDED },
-    { wxT("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
-    { wxT("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
-    { wxT("wxLB_SORT"), wxLB_SORT },
-    { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
-    { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },
-
-    /* wxComboxBox */
-    { wxT("wxCB_SIMPLE"), wxCB_SIMPLE },
-    { wxT("wxCB_DROPDOWN"), wxCB_DROPDOWN },
-    { wxT("wxCB_READONLY"), wxCB_READONLY },
-    { wxT("wxCB_SORT"), wxCB_SORT },
-
-    /* wxGauge */
-#if WXWIN_COMPATIBILITY_2_6
-    { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
-#endif // WXWIN_COMPATIBILITY_2_6
-    { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
-    { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
-
-    /* wxTextCtrl */
-#if WXWIN_COMPATIBILITY_2_6
-    { wxT("wxPASSWORD"), wxTE_PASSWORD},
-    { wxT("wxPROCESS_ENTER"), wxTE_PROCESS_ENTER},
-#endif
-    { wxT("wxTE_PASSWORD"), wxTE_PASSWORD},
-    { wxT("wxTE_READONLY"), wxTE_READONLY},
-    { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
-    { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
-    { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
-
-    /* wxRadioBox/wxRadioButton */
-    { wxT("wxRB_GROUP"), wxRB_GROUP },
-    { wxT("wxRA_SPECIFY_COLS"), wxRA_SPECIFY_COLS },
-    { wxT("wxRA_SPECIFY_ROWS"), wxRA_SPECIFY_ROWS },
-    { wxT("wxRA_HORIZONTAL"), wxRA_HORIZONTAL },
-    { wxT("wxRA_VERTICAL"), wxRA_VERTICAL },
-
-    /* wxSlider */
-    { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
-    { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },
-    { wxT("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
-    { wxT("wxSL_LABELS"), wxSL_LABELS },
-    { wxT("wxSL_LEFT"), wxSL_LEFT },
-    { wxT("wxSL_TOP"), wxSL_TOP },
-    { wxT("wxSL_RIGHT"), wxSL_RIGHT },
-    { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
-    { wxT("wxSL_BOTH"), wxSL_BOTH },
-    { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },
-
-    /* wxScrollBar */
-    { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
-    { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },
-
-    /* wxButton */
-    { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
-    { wxT("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },
-
-    /* wxTreeCtrl */
-    { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
-    { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
-    { wxT("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },
-
-    /* wxListCtrl */
-    { wxT("wxLC_ICON"), wxLC_ICON },
-    { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
-    { wxT("wxLC_LIST"), wxLC_LIST },
-    { wxT("wxLC_REPORT"), wxLC_REPORT },
-    { wxT("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
-    { wxT("wxLC_ALIGN_LEFT"), wxLC_ALIGN_LEFT },
-    { wxT("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
-    { wxT("wxLC_USER_TEXT"), wxLC_USER_TEXT },
-    { wxT("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
-    { wxT("wxLC_NO_HEADER"), wxLC_NO_HEADER },
-    { wxT("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
-    { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
-    { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
-    { wxT("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },
-
-    /* wxSpinButton */
-    { wxT("wxSP_VERTICAL"), wxSP_VERTICAL},
-    { wxT("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
-    { wxT("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
-    { wxT("wxSP_WRAP"), wxSP_WRAP},
-
-    /* wxSplitterWnd */
-    { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
-    { wxT("wxSP_3D"), wxSP_3D},
-    { wxT("wxSP_BORDER"), wxSP_BORDER},
-
-    /* wxTabCtrl */
-    { wxT("wxTC_MULTILINE"), wxTC_MULTILINE},
-    { wxT("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
-    { wxT("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
-    { wxT("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},
-
-    /* wxStatusBar95 */
-    { wxT("wxST_SIZEGRIP"), wxST_SIZEGRIP},
-
-    /* wxControl */
-    { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
-    { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},
-    { wxT("wxALIGN_CENTER"), wxALIGN_CENTER},
-    { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
-    { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
-    { wxT("wxCOLOURED"), wxCOLOURED},
-
-    /* wxToolBar */
-    { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
-    { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
-    { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
-    { wxT("wxTB_FLAT"), wxTB_FLAT},
-
-#if WXWIN_COMPATIBILITY_2_6
-    /* wxDialog */
-    { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },
-#endif // WXWIN_COMPATIBILITY_2_6
-
-    /* Generic */
-    { wxT("wxVSCROLL"), wxVSCROLL },
-    { wxT("wxHSCROLL"), wxHSCROLL },
-    { wxT("wxCAPTION"), wxCAPTION },
-    { wxT("wxSTAY_ON_TOP"), wxSTAY_ON_TOP},
-    { wxT("wxICONIZE"), wxICONIZE},
-    { wxT("wxMINIMIZE"), wxICONIZE},
-    { wxT("wxMAXIMIZE"), wxMAXIMIZE},
-    { wxT("wxSDI"), 0},
-    { wxT("wxMDI_PARENT"), 0},
-    { wxT("wxMDI_CHILD"), 0},
-    { wxT("wxTHICK_FRAME"), wxRESIZE_BORDER},
-    { wxT("wxRESIZE_BORDER"), wxRESIZE_BORDER},
-    { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
-    { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
-    { wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
-#if WXWIN_COMPATIBILITY_2_6
-    { wxT("wxRESIZE_BOX"), wxRESIZE_BOX},
-#endif // WXWIN_COMPATIBILITY_2_6
-    { wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
-    { wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
-    { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},
-    { wxT("wxBORDER"), wxBORDER},
-    { wxT("wxRETAINED"), wxRETAINED},
-    { wxT("wxNATIVE_IMPL"), 0},
-    { wxT("wxEXTENDED_IMPL"), 0},
-    { wxT("wxBACKINGSTORE"), wxBACKINGSTORE},
-    //  { wxT("wxFLAT"), wxFLAT},
-    //  { wxT("wxMOTIF_RESIZE"), wxMOTIF_RESIZE},
-    { wxT("wxFIXED_LENGTH"), 0},
-    { wxT("wxDOUBLE_BORDER"), wxDOUBLE_BORDER},
-    { wxT("wxSUNKEN_BORDER"), wxSUNKEN_BORDER},
-    { wxT("wxRAISED_BORDER"), wxRAISED_BORDER},
-    { wxT("wxSIMPLE_BORDER"), wxSIMPLE_BORDER},
-    { wxT("wxSTATIC_BORDER"), wxSTATIC_BORDER},
-    { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
-    { wxT("wxNO_BORDER"), wxNO_BORDER},
-    { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
-    { wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
-    { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
-
-    { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
-    { wxT("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
-
-    // Text font families
-    { wxT("wxDEFAULT"), wxDEFAULT},
-    { wxT("wxDECORATIVE"), wxDECORATIVE},
-    { wxT("wxROMAN"), wxROMAN},
-    { wxT("wxSCRIPT"), wxSCRIPT},
-    { wxT("wxSWISS"), wxSWISS},
-    { wxT("wxMODERN"), wxMODERN},
-    { wxT("wxTELETYPE"), wxTELETYPE},
-    { wxT("wxVARIABLE"), wxVARIABLE},
-    { wxT("wxFIXED"), wxFIXED},
-    { wxT("wxNORMAL"), wxNORMAL},
-    { wxT("wxLIGHT"), wxLIGHT},
-    { wxT("wxBOLD"), wxBOLD},
-    { wxT("wxITALIC"), wxITALIC},
-    { wxT("wxSLANT"), wxSLANT},
-    { wxT("wxSOLID"), wxSOLID},
-    { wxT("wxDOT"), wxDOT},
-    { wxT("wxLONG_DASH"), wxLONG_DASH},
-    { wxT("wxSHORT_DASH"), wxSHORT_DASH},
-    { wxT("wxDOT_DASH"), wxDOT_DASH},
-    { wxT("wxUSER_DASH"), wxUSER_DASH},
-    { wxT("wxTRANSPARENT"), wxTRANSPARENT},
-    { wxT("wxSTIPPLE"), wxSTIPPLE},
-    { wxT("wxBDIAGONAL_HATCH"), wxBDIAGONAL_HATCH},
-    { wxT("wxCROSSDIAG_HATCH"), wxCROSSDIAG_HATCH},
-    { wxT("wxFDIAGONAL_HATCH"), wxFDIAGONAL_HATCH},
-    { wxT("wxCROSS_HATCH"), wxCROSS_HATCH},
-    { wxT("wxHORIZONTAL_HATCH"), wxHORIZONTAL_HATCH},
-    { wxT("wxVERTICAL_HATCH"), wxVERTICAL_HATCH},
-    { wxT("wxJOIN_BEVEL"), wxJOIN_BEVEL},
-    { wxT("wxJOIN_MITER"), wxJOIN_MITER},
-    { wxT("wxJOIN_ROUND"), wxJOIN_ROUND},
-    { wxT("wxCAP_ROUND"), wxCAP_ROUND},
-    { wxT("wxCAP_PROJECTING"), wxCAP_PROJECTING},
-    { wxT("wxCAP_BUTT"), wxCAP_BUTT},
-
-    // Logical ops
-    { wxT("wxCLEAR"), wxCLEAR},
-    { wxT("wxXOR"), wxXOR},
-    { wxT("wxINVERT"), wxINVERT},
-    { wxT("wxOR_REVERSE"), wxOR_REVERSE},
-    { wxT("wxAND_REVERSE"), wxAND_REVERSE},
-    { wxT("wxCOPY"), wxCOPY},
-    { wxT("wxAND"), wxAND},
-    { wxT("wxAND_INVERT"), wxAND_INVERT},
-    { wxT("wxNO_OP"), wxNO_OP},
-    { wxT("wxNOR"), wxNOR},
-    { wxT("wxEQUIV"), wxEQUIV},
-    { wxT("wxSRC_INVERT"), wxSRC_INVERT},
-    { wxT("wxOR_INVERT"), wxOR_INVERT},
-    { wxT("wxNAND"), wxNAND},
-    { wxT("wxOR"), wxOR},
-    { wxT("wxSET"), wxSET},
-
-    { wxT("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
-    { wxT("wxFLOOD_BORDER"), wxFLOOD_BORDER},
-    { wxT("wxODDEVEN_RULE"), wxODDEVEN_RULE},
-    { wxT("wxWINDING_RULE"), wxWINDING_RULE},
-    { wxT("wxHORIZONTAL"), wxHORIZONTAL},
-    { wxT("wxVERTICAL"), wxVERTICAL},
-    { wxT("wxBOTH"), wxBOTH},
-    { wxT("wxCENTER_FRAME"), wxCENTER_FRAME},
-    { wxT("wxOK"), wxOK},
-    { wxT("wxYES_NO"), wxYES_NO},
-    { wxT("wxCANCEL"), wxCANCEL},
-    { wxT("wxYES"), wxYES},
-    { wxT("wxNO"), wxNO},
-    { wxT("wxICON_EXCLAMATION"), wxICON_EXCLAMATION},
-    { wxT("wxICON_HAND"), wxICON_HAND},
-    { wxT("wxICON_QUESTION"), wxICON_QUESTION},
-    { wxT("wxICON_INFORMATION"), wxICON_INFORMATION},
-    { wxT("wxICON_STOP"), wxICON_STOP},
-    { wxT("wxICON_ASTERISK"), wxICON_ASTERISK},
-    { wxT("wxICON_MASK"), wxICON_MASK},
-    { wxT("wxCENTRE"), wxCENTRE},
-    { wxT("wxCENTER"), wxCENTRE},
-#if WXWIN_COMPATIBILITY_2_6
-    { wxT("wxUSER_COLOURS"), wxUSER_COLOURS},
-#endif // WXWIN_COMPATIBILITY_2_6
-    { wxT("wxVERTICAL_LABEL"), 0},
-    { wxT("wxHORIZONTAL_LABEL"), 0},
-
-    // Bitmap types (not strictly styles)
-    { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
-    { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
-    { wxT("wxBITMAP_TYPE_BMP"), wxBITMAP_TYPE_BMP},
-    { wxT("wxBITMAP_TYPE_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
-    { wxT("wxBITMAP_TYPE_BMP_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
-    { wxT("wxBITMAP_TYPE_GIF"), wxBITMAP_TYPE_GIF},
-    { wxT("wxBITMAP_TYPE_TIF"), wxBITMAP_TYPE_TIF},
-    { wxT("wxBITMAP_TYPE_ICO"), wxBITMAP_TYPE_ICO},
-    { wxT("wxBITMAP_TYPE_ICO_RESOURCE"), wxBITMAP_TYPE_ICO_RESOURCE},
-    { wxT("wxBITMAP_TYPE_CUR"), wxBITMAP_TYPE_CUR},
-    { wxT("wxBITMAP_TYPE_CUR_RESOURCE"), wxBITMAP_TYPE_CUR_RESOURCE},
-    { wxT("wxBITMAP_TYPE_XBM_DATA"), wxBITMAP_TYPE_XBM_DATA},
-    { wxT("wxBITMAP_TYPE_XPM_DATA"), wxBITMAP_TYPE_XPM_DATA},
-    { wxT("wxBITMAP_TYPE_ANY"), wxBITMAP_TYPE_ANY}
-};
-
-static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
-
-long wxParseWindowStyle(const wxString& bitListString)
-{
-    int i = 0;
-    wxChar *word;
-    long bitList = 0;
-    word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
-    while (word != NULL)
-    {
-        bool found = false;
-        int j;
-        for (j = 0; j < wxResourceBitListCount; j++)
-            if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)
-            {
-                bitList |= wxResourceBitListTable[j].bits;
-                found = true;
-                break;
-            }
-            if (!found)
-            {
-                wxLogWarning(_("Unrecognized style %s while parsing resource."), word);
-                return 0;
-            }
-            word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
-    }
-    return bitList;
-}
-
-/*
-* Load a bitmap from a wxWidgets resource, choosing an optimum
-* depth and appropriate type.
-*/
-
-wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    wxItemResource *item = table->FindResource(resource);
-    if (item)
-    {
-        if ((item->GetType().empty()) || (item->GetType() != wxT("wxBitmap")))
-        {
-            wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource);
-            return wxNullBitmap;
-        }
-        int thisDepth = wxDisplayDepth();
-        long thisNoColours = (long)pow(2.0, (double)thisDepth);
-
-        wxItemResource *optResource = (wxItemResource *) NULL;
-
-        // Try to find optimum bitmap for this platform/colour depth
-        wxNode *node = item->GetChildren().GetFirst();
-        while (node)
-        {
-            wxItemResource *child = (wxItemResource *)node->GetData();
-            int platform = (int)child->GetValue2();
-            int noColours = (int)child->GetValue3();
-            /*
-            char *name = child->GetName();
-            int bitmapType = (int)child->GetValue1();
-            int xRes = child->GetWidth();
-            int yRes = child->GetHeight();
-            */
-
-            switch (platform)
-            {
-            case RESOURCE_PLATFORM_ANY:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours.
-                        // If noColours is zero (unspecified), then assume this
-                        // is the right one.
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#ifdef __WXMSW__
-            case RESOURCE_PLATFORM_WINDOWS:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours > 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-#ifdef __WXGTK__
-            case RESOURCE_PLATFORM_X:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-#ifdef wx_max
-            case RESOURCE_PLATFORM_MAC:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-            default:
-                break;
-            }
-            node = node->GetNext();
-        }
-        // If no matching resource, fail.
-        if (!optResource)
-            return wxNullBitmap;
-
-        wxString name = optResource->GetName();
-        int bitmapType = (int)optResource->GetValue1();
-        switch (bitmapType)
-        {
-        case wxBITMAP_TYPE_XBM_DATA:
-            {
-#ifdef __WXGTK__
-                wxItemResource *item = table->FindResource(name);
-                if (!item)
-                {
-                    wxLogWarning(_("Failed to find XBM resource %s.\n"
-                        "Forgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
-                    return wxNullBitmap;
-                }
-                return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
-#else
-                wxLogWarning(_("No XBM facility available!"));
-                break;
-#endif
-            }
-        case wxBITMAP_TYPE_XPM_DATA:
-            {
-                wxItemResource *item = table->FindResource(name);
-                if (!item)
-                {
-                    wxLogWarning(_("Failed to find XPM resource %s.\nForgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
-                    return wxNullBitmap;
-                }
-                return wxBitmap((char **)item->GetValue1());
-            }
-        default:
-            {
-#if defined(__WXPM__)
-                return wxNullBitmap;
-#else
-                return wxBitmap(name, (wxBitmapType)bitmapType);
-#endif
-            }
-        }
-#ifndef __WXGTK__
-        return wxNullBitmap;
-#endif
-  }
-  else
-  {
-      wxLogWarning(_("Bitmap resource specification %s not found."), (const wxChar*) resource);
-      return wxNullBitmap;
-  }
-}
-
-/*
-* Load an icon from a wxWidgets resource, choosing an optimum
-* depth and appropriate type.
-*/
-
-wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    wxItemResource *item = table->FindResource(resource);
-    if (item)
-    {
-        if ((item->GetType().empty()) || wxStrcmp(item->GetType(), wxT("wxIcon")) != 0)
-        {
-            wxLogWarning(_("%s not an icon resource specification."), (const wxChar*) resource);
-            return wxNullIcon;
-        }
-        int thisDepth = wxDisplayDepth();
-        long thisNoColours = (long)pow(2.0, (double)thisDepth);
-
-        wxItemResource *optResource = (wxItemResource *) NULL;
-
-        // Try to find optimum icon for this platform/colour depth
-        wxNode *node = item->GetChildren().GetFirst();
-        while (node)
-        {
-            wxItemResource *child = (wxItemResource *)node->GetData();
-            int platform = (int)child->GetValue2();
-            int noColours = (int)child->GetValue3();
-            /*
-            char *name = child->GetName();
-            int bitmapType = (int)child->GetValue1();
-            int xRes = child->GetWidth();
-            int yRes = child->GetHeight();
-            */
-
-            switch (platform)
-            {
-            case RESOURCE_PLATFORM_ANY:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours.
-                        // If noColours is zero (unspecified), then assume this
-                        // is the right one.
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#ifdef __WXMSW__
-            case RESOURCE_PLATFORM_WINDOWS:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours > 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-#ifdef __WXGTK__
-            case RESOURCE_PLATFORM_X:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-#ifdef wx_max
-            case RESOURCE_PLATFORM_MAC:
-                {
-                    if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
-                        optResource = child;
-                    else
-                    {
-                        // Maximise the number of colours
-                        if ((noColours == 0) || ((noColours <= thisNoColours) && (noColours > optResource->GetValue3())))
-                            optResource = child;
-                    }
-                    break;
-                }
-#endif
-            default:
-                break;
-            }
-            node = node->GetNext();
-        }
-        // If no matching resource, fail.
-        if (!optResource)
-            return wxNullIcon;
-
-        wxString name = optResource->GetName();
-        int bitmapType = (int)optResource->GetValue1();
-        switch (bitmapType)
-        {
-        case wxBITMAP_TYPE_XBM_DATA:
-            {
-#ifdef __WXGTK__
-                wxItemResource *item = table->FindResource(name);
-                if (!item)
-                {
-                    wxLogWarning(_("Failed to find XBM resource %s.\n"
-                        "Forgot to use wxResourceLoadIconData?"), (const wxChar*) name);
-                    return wxNullIcon;
-                }
-                return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
-#else
-                wxLogWarning(_("No XBM facility available!"));
-                break;
-#endif
-            }
-        case wxBITMAP_TYPE_XPM_DATA:
-            {
-                // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
-                /*
-                wxItemResource *item = table->FindResource(name);
-                if (!item)
-                {
-                char buf[400];
-                sprintf(buf, _("Failed to find XPM resource %s.\nForgot to use wxResourceLoadIconData?"), name);
-                wxLogWarning(buf);
-                return NULL;
-                }
-                return wxIcon((char **)item->GetValue1());
-                */
-                wxLogWarning(_("No XPM icon facility available!"));
-                break;
-            }
-        default:
-            {
-#if defined( __WXGTK__ ) || defined( __WXMOTIF__ )
-                wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
-                break;
-#else
-                return wxIcon(name, (wxBitmapType) bitmapType);
-#endif
-            }
-        }
-        return wxNullIcon;
-  }
-  else
-  {
-      wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
-      return wxNullIcon;
-  }
-}
-
-#if wxUSE_MENUS
-
-wxMenu *wxResourceCreateMenu(wxItemResource *item)
-{
-    wxMenu *menu = new wxMenu;
-    wxNode *node = item->GetChildren().GetFirst();
-    while (node)
-    {
-        wxItemResource *child = (wxItemResource *)node->GetData();
-        if ((!child->GetType().empty()) && (child->GetType() == wxT("wxMenuSeparator")))
-            menu->AppendSeparator();
-        else if (child->GetChildren().GetCount() > 0)
-        {
-            wxMenu *subMenu = wxResourceCreateMenu(child);
-            if (subMenu)
-                menu->Append((int)child->GetValue1(), child->GetTitle(), subMenu, child->GetValue4());
-        }
-        else
-        {
-            menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
-        }
-        node = node->GetNext();
-    }
-    return menu;
-}
-
-wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table, wxMenuBar *menuBar)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    wxItemResource *menuResource = table->FindResource(resource);
-    if (menuResource && (!menuResource->GetType().empty()) && (menuResource->GetType() == wxT("wxMenu")))
-    {
-        if (!menuBar)
-            menuBar = new wxMenuBar;
-        wxNode *node = menuResource->GetChildren().GetFirst();
-        while (node)
-        {
-            wxItemResource *child = (wxItemResource *)node->GetData();
-            wxMenu *menu = wxResourceCreateMenu(child);
-            if (menu)
-                menuBar->Append(menu, child->GetTitle());
-            node = node->GetNext();
-        }
-        return menuBar;
-    }
-    return (wxMenuBar *) NULL;
-}
-
-wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    wxItemResource *menuResource = table->FindResource(resource);
-    if (menuResource && (!menuResource->GetType().empty()) && (menuResource->GetType() == wxT("wxMenu")))
-        //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
-        return wxResourceCreateMenu(menuResource);
-    return (wxMenu *) NULL;
-}
-
-#endif // wxUSE_MENUS
-
-// Global equivalents (so don't have to refer to default table explicitly)
-bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return table->ParseResourceData(resource);
-}
-
-bool wxResourceParseData(const char* resource, wxResourceTable *table)
-{
-    wxString str(resource, wxConvLibc);
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return table->ParseResourceData(str);
-}
-
-bool wxResourceParseFile(const wxString& filename, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return table->ParseResourceFile(filename);
-}
-
-// Register XBM/XPM data
-bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return table->RegisterResourceBitmapData(name, bits, width, height);
-}
-
-bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return table->RegisterResourceBitmapData(name, data);
-}
-
-void wxResourceClear(wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    table->ClearTable();
-}
-
-/*
-* Identifiers
-*/
-
-bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    table->identifiers.Put(name, (wxObject *)(long)value);
-    return true;
-}
-
-int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    return (int)(long)table->identifiers.Get(name);
-}
-
-/*
-* Parse #include file for #defines (only)
-*/
-
-bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    FILE *fd = wxFopen(f, wxT("r"));
-    if (!fd)
-    {
-        return false;
-    }
-    while (wxGetResourceToken(fd))
-    {
-        if (strcmp(wxResourceBuffer, "#define") == 0)
-        {
-            wxGetResourceToken(fd);
-            wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-            wxGetResourceToken(fd);
-            wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-            if (wxIsdigit(value[0]))
-            {
-                int val = (int)wxAtol(value);
-                wxResourceAddIdentifier(name, val, table);
-            }
-            delete[] name;
-            delete[] value;
-        }
-    }
-    fclose(fd);
-    return true;
-}
-
-/*
-* Reading strings as if they were .wxr files
-*/
-
-static int getc_string(char *s)
-{
-    int ch = s[wxResourceStringPtr];
-    if (ch == 0)
-        return EOF;
-    else
-    {
-        wxResourceStringPtr ++;
-        return ch;
-    }
-}
-
-static int ungetc_string()
-{
-    wxResourceStringPtr --;
-    return 0;
-}
-
-bool wxEatWhiteSpaceString(char *s)
-{
-    int ch;
-
-    while ((ch = getc_string(s)) != EOF)
-    {
-        switch (ch)
-        {
-        case ' ':
-        case 0x0a:
-        case 0x0d:
-        case 0x09:
-            break;
-        case '/':
-            {
-                ch = getc_string(s);
-                if (ch == EOF)
-                {
-                    ungetc_string();
-                    return true;
-                }
-
-                if (ch == '*')
-                {
-                    // Eat C comment
-                    int prev_ch = 0;
-                    while ((ch = getc_string(s)) != EOF)
-                    {
-                        if (ch == '/' && prev_ch == '*')
-                            break;
-                        prev_ch = ch;
-                    }
-                }
-                else
-                {
-                    ungetc_string();
-                    ungetc_string();
-                    return true;
-                }
-            }
-            break;
-        default:
-            ungetc_string();
-            return true;
-
-        }
-    }
-    return false;
-}
-
-bool wxGetResourceTokenString(char *s)
-{
-    if (!wxResourceBuffer)
-        wxReallocateResourceBuffer();
-    wxResourceBuffer[0] = 0;
-    wxEatWhiteSpaceString(s);
-
-    int ch = getc_string(s);
-    if (ch == '"')
-    {
-        // Get string
-        wxResourceBufferCount = 0;
-        ch = getc_string(s);
-        while (ch != '"')
-        {
-            int actualCh = ch;
-            if (ch == EOF)
-            {
-                wxResourceBuffer[wxResourceBufferCount] = 0;
-                return false;
-            }
-            // Escaped characters
-            else if (ch == '\\')
-            {
-                int newCh = getc_string(s);
-                if (newCh == '"')
-                    actualCh = '"';
-                else if (newCh == 10)
-                    actualCh = 10;
-                else
-                {
-                    ungetc_string();
-                }
-            }
-
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
-            wxResourceBufferCount ++;
-            ch = getc_string(s);
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-    }
-    else
-    {
-        wxResourceBufferCount = 0;
-        // Any other token
-        while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
-        {
-            if (wxResourceBufferCount >= wxResourceBufferSize-1)
-                wxReallocateResourceBuffer();
-            wxResourceBuffer[wxResourceBufferCount] = (char)ch;
-            wxResourceBufferCount ++;
-
-            ch = getc_string(s);
-        }
-        wxResourceBuffer[wxResourceBufferCount] = 0;
-        if (ch == EOF)
-            return false;
-    }
-    return true;
-}
-
-/*
-* Files are in form:
-static char *name = "....";
-with possible comments.
-*/
-
-bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    // static or #define
-    if (!wxGetResourceTokenString(s))
-    {
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "#define") == 0)
-    {
-        wxGetResourceTokenString(s);
-        wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-        wxGetResourceTokenString(s);
-        wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
-        if (wxIsdigit(value[0]))
-        {
-            int val = (int)wxAtol(value);
-            wxResourceAddIdentifier(name, val, table);
-        }
-        else
-        {
-            wxLogWarning(_("#define %s must be an integer."), name);
-            delete[] name;
-            delete[] value;
-            return false;
-        }
-        delete[] name;
-        delete[] value;
-
-        return true;
-    }
-    /*
-    else if (strcmp(wxResourceBuffer, "#include") == 0)
-    {
-    wxGetResourceTokenString(s);
-    char *name = copystring(wxResourceBuffer);
-    char *actualName = name;
-    if (name[0] == '"')
-    actualName = name + 1;
-    int len = strlen(name);
-    if ((len > 0) && (name[len-1] == '"'))
-    name[len-1] = 0;
-    if (!wxResourceParseIncludeFile(actualName, table))
-    {
-    char buf[400];
-    sprintf(buf, _("Could not find resource include file %s."), actualName);
-    wxLogWarning(buf);
-    }
-    delete[] name;
-    return true;
-    }
-    */
-    else if (strcmp(wxResourceBuffer, "static") != 0)
-    {
-        wxChar buf[300];
-        wxStrcpy(buf, _("Found "));
-        wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
-        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));
-        wxLogWarning(buf);
-        return false;
-    }
-
-    // char
-    if (!wxGetResourceTokenString(s))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "char") != 0)
-    {
-        wxLogWarning(_("Expected 'char' while parsing resource."));
-        return false;
-    }
-
-    // *name
-    if (!wxGetResourceTokenString(s))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (wxResourceBuffer[0] != '*')
-    {
-        wxLogWarning(_("Expected '*' while parsing resource."));
-        return false;
-    }
-    wxChar nameBuf[100];
-    wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
-    nameBuf[99] = 0;
-
-    // =
-    if (!wxGetResourceTokenString(s))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-
-    if (strcmp(wxResourceBuffer, "=") != 0)
-    {
-        wxLogWarning(_("Expected '=' while parsing resource."));
-        return false;
-    }
-
-    // String
-    if (!wxGetResourceTokenString(s))
-    {
-        wxLogWarning(_("Unexpected end of file while parsing resource."));
-        *eof = true;
-        return false;
-    }
-    else
-    {
-        if (!db.ReadPrologFromString(wxResourceBuffer))
-        {
-            wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
-            return false;
-        }
-    }
-    // Semicolon
-    if (!wxGetResourceTokenString(s))
-    {
-        *eof = true;
-    }
-    return true;
-}
-
-bool wxResourceParseString(const wxString& s, wxResourceTable *WXUNUSED(table))
-{
-#if wxUSE_UNICODE
-    return wxResourceParseString( (char*)s.mb_str().data() );
-#else
-    return wxResourceParseString( (char*)s.c_str() );
-#endif
-}
-
-bool wxResourceParseString(char *s, wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    if (!s)
-        return false;
-
-    // Turn backslashes into spaces
-    if (s)
-    {
-        int len = strlen(s);
-        int i;
-        for (i = 0; i < len; i++)
-            if (s[i] == 92 && s[i+1] == 13)
-            {
-                s[i] = ' ';
-                s[i+1] = ' ';
-            }
-    }
-
-    wxExprDatabase db;
-    wxResourceStringPtr = 0;
-
-    bool eof = false;
-    while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
-    {
-        // Loop
-    }
-    return wxResourceInterpretResources(*table, db);
-}
-
-/*
-* resource loading facility
-*/
-
-bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-
-    wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
-    //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
-    if (!resource || (resource->GetType().empty()) ||
-        ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
-        return false;
-
-    wxString title(resource->GetTitle());
-    long theWindowStyle = resource->GetStyle();
-    bool isModal = (resource->GetValue1() != 0) ;
-    int x = resource->GetX();
-    int y = resource->GetY();
-    int width = resource->GetWidth();
-    int height = resource->GetHeight();
-    wxString name = resource->GetName();
-
-    // this is used for loading wxWizard pages from WXR
-    if ( parent != thisWindow )
-    {
-        if (thisWindow->IsKindOf(CLASSINFO(wxDialog)))
-        {
-            wxDialog *dialogBox = (wxDialog *)thisWindow;
-            long modalStyle = isModal ?
-#if WXWIN_COMPATIBILITY_2_6
-                                        wxDIALOG_MODAL
-#else
-                                        0
-#endif // WXWIN_COMPATIBILITY_2_6
-                                      : 0;
-            if (!dialogBox->Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
-                return false;
-
-            // Only reset the client size if we know we're not going to do it again below.
-            if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
-                dialogBox->SetClientSize(width, height);
-        }
-        else if (thisWindow->IsKindOf(CLASSINFO(wxPanel)))
-        {
-            wxPanel* panel = (wxPanel *)thisWindow;
-            if (!panel->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
-                return false;
-        }
-        else
-        {
-            if (!((wxWindow *)thisWindow)->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
-                return false;
-        }
-    }
-
-    if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
-    {
-        // No need to do this since it's done in wxPanel or wxDialog constructor.
-        // SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    }
-    else
-    {
-        if (resource->GetFont().Ok())
-            thisWindow->SetFont(resource->GetFont());
-        if (resource->GetBackgroundColour().Ok())
-            thisWindow->SetBackgroundColour(resource->GetBackgroundColour());
-    }
-
-    // Should have some kind of font at this point
-    if (!thisWindow->GetFont().Ok())
-        thisWindow->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    if (!thisWindow->GetBackgroundColour().Ok())
-        thisWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
-    // Only when we've created the window and set the font can we set the correct size,
-    // if based on dialog units.
-    if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
-    {
-        wxSize sz = thisWindow->ConvertDialogToPixels(wxSize(width, height));
-        thisWindow->SetClientSize(sz.x, sz.y);
-
-        wxPoint pt = thisWindow->ConvertDialogToPixels(wxPoint(x, y));
-        thisWindow->Move(pt.x, pt.y);
-    }
-
-    // Now create children
-    wxNode *node = resource->GetChildren().GetFirst();
-    while (node)
-    {
-        wxItemResource *childResource = (wxItemResource *)node->GetData();
-
-        (void) wxCreateItem(thisWindow, childResource, resource, table);
-
-        node = node->GetNext();
-    }
-    return true;
-}
-
-wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)
-{
-    if (!table)
-        table = wxDefaultResourceTable;
-    return table->CreateItem(thisWindow, resource, parentResource);
-}
-
-#ifdef __VISUALC__
-#pragma warning(default:4706)   // assignment within conditional expression
-#endif // VC++
-
-#endif // wxUSE_WX_RESOURCES
diff --git a/contrib/src/deprecated/tbarsmpl.cpp b/contrib/src/deprecated/tbarsmpl.cpp
deleted file mode 100644
index d87379de75..0000000000
--- a/contrib/src/deprecated/tbarsmpl.cpp
+++ /dev/null
@@ -1,1007 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        contrib/src/deprecated//tbarsmpl.cpp
-// Purpose:     wxToolBarSimple
-// Author:      Julian Smart
-// Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/window.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/deprecated/tbarsmpl.h"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_DEPRECATED wxToolBarToolSimple : public wxToolBarToolBase
-{
-public:
-    wxToolBarToolSimple(wxToolBarSimple *tbar,
-                        int id,
-                        const wxString& label,
-                        const wxBitmap& bmpNormal,
-                        const wxBitmap& bmpDisabled,
-                        wxItemKind kind,
-                        wxObject *clientData,
-                        const wxString& shortHelp,
-                        const wxString& longHelp)
-        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
-                            clientData, shortHelp, longHelp)
-    {
-    }
-
-    wxToolBarToolSimple(wxToolBarSimple *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
-    {
-    }
-
-    void SetSize(const wxSize& size)
-    {
-        m_width = size.x;
-        m_height = size.y;
-    }
-
-    wxCoord GetWidth() const { return m_width; }
-    wxCoord GetHeight() const { return m_height; }
-
-    wxCoord m_x;
-    wxCoord m_y;
-    wxCoord m_width;
-    wxCoord m_height;
-
-    DECLARE_NO_COPY_CLASS(wxToolBarToolSimple)
-};
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
-
-#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
-    IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
-#endif
-
-BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
-    EVT_SIZE(wxToolBarSimple::OnSize)
-    EVT_SCROLL(wxToolBarSimple::OnScroll)
-    EVT_PAINT(wxToolBarSimple::OnPaint)
-    EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
-    EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// tool bar tools creation
-// ----------------------------------------------------------------------------
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(int id,
-                                               const wxString& label,
-                                               const wxBitmap& bmpNormal,
-                                               const wxBitmap& bmpDisabled,
-                                               wxItemKind kind,
-                                               wxObject *clientData,
-                                               const wxString& shortHelp,
-                                               const wxString& longHelp)
-{
-    return new wxToolBarToolSimple(this, id, label, bmpNormal, bmpDisabled,
-                                   kind, clientData, shortHelp, longHelp);
-}
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(wxControl *control)
-{
-    return new wxToolBarToolSimple(this, control);
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBarSimple creation
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::Init()
-{
-    m_currentRowsOrColumns = 0;
-
-    m_lastX =
-    m_lastY = 0;
-
-    m_maxWidth =
-    m_maxHeight = 0;
-
-    m_pressedTool =
-    m_currentTool = -1;
-
-    m_xPos =
-    m_yPos = wxDefaultCoord;
-
-    m_toolPacking = 1;
-    m_toolSeparation = 5;
-
-    m_defaultWidth = 16;
-    m_defaultHeight = 15;
-
-    m_xScrollPixelsPerLine = 1;
-    m_yScrollPixelsPerLine = 1;
-    m_xScrollingEnabled = false;
-    m_yScrollingEnabled = false;
-    m_xScrollPosition = 0;
-    m_yScrollPosition = 0;
-    m_xScrollLines = 0;
-    m_yScrollLines = 0;
-    m_xScrollLinesPerPage = 0;
-    m_yScrollLinesPerPage = 0;
-}
-
-wxToolBarToolBase *wxToolBarSimple::DoAddTool(int id,
-                                              const wxString& label,
-                                              const wxBitmap& bitmap,
-                                              const wxBitmap& bmpDisabled,
-                                              wxItemKind kind,
-                                              const wxString& shortHelp,
-                                              const wxString& longHelp,
-                                              wxObject *clientData,
-                                              wxCoord xPos,
-                                              wxCoord yPos)
-{
-    // rememeber the position for DoInsertTool()
-    m_xPos = xPos;
-    m_yPos = yPos;
-
-    return wxToolBarBase::DoAddTool(id, label, bitmap, bmpDisabled, kind,
-                                    shortHelp, longHelp,
-                                    clientData, xPos, yPos);
-}
-
-bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
-                                   wxToolBarToolBase *toolBase)
-{
-    wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
-    wxCHECK_MSG( !tool->IsControl(), false,
-                 _T("generic wxToolBarSimple doesn't support controls") );
-
-    tool->m_x = m_xPos;
-    if ( tool->m_x == wxDefaultCoord )
-        tool->m_x = m_xMargin;
-
-    tool->m_y = m_yPos;
-    if ( tool->m_y == wxDefaultCoord )
-        tool->m_y = m_yMargin;
-
-    tool->SetSize(GetToolSize());
-
-    if ( tool->IsButton() )
-    {
-        // Calculate reasonable max size in case Layout() not called
-        if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
-            m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
-
-        if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
-            m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
-    }
-
-    return true;
-}
-
-bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
-                                   wxToolBarToolBase *tool)
-{
-    // VZ: didn't test whether it works, but why not...
-    tool->Detach();
-
-    Refresh();
-
-    return true;
-}
-
-bool wxToolBarSimple::Create(wxWindow *parent,
-                             wxWindowID id,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxString& name)
-{
-    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
-        return false;
-
-    // Set it to grey (or other 3D face colour)
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
-    if ( GetWindowStyleFlag() & wxTB_VERTICAL )
-    {
-        m_lastX = 7;
-        m_lastY = 3;
-
-        m_maxRows = 32000;      // a lot
-        m_maxCols = 1;
-    }
-    else
-    {
-        m_lastX = 3;
-        m_lastY = 7;
-
-        m_maxRows = 1;
-        m_maxCols = 32000;      // a lot
-    }
-
-    SetCursor(*wxSTANDARD_CURSOR);
-
-    return true;
-}
-
-wxToolBarSimple::~wxToolBarSimple()
-{
-}
-
-bool wxToolBarSimple::Realize()
-{
-    m_currentRowsOrColumns = 0;
-    m_lastX = m_xMargin;
-    m_lastY = m_yMargin;
-    m_maxWidth = 0;
-    m_maxHeight = 0;
-
-    int maxToolWidth = 0;
-    int maxToolHeight = 0;
-
-    // Find the maximum tool width and height
-    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-    while ( node )
-    {
-        wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
-        if ( tool->GetWidth() > maxToolWidth )
-            maxToolWidth = tool->GetWidth();
-        if (tool->GetHeight() > maxToolHeight)
-            maxToolHeight = tool->GetHeight();
-
-        node = node->GetNext();
-    }
-
-    int separatorSize = m_toolSeparation;
-
-    node = m_tools.GetFirst();
-    while ( node )
-    {
-        wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
-        if ( tool->IsSeparator() )
-        {
-            if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-            {
-                if (m_currentRowsOrColumns >= m_maxCols)
-                    m_lastY += separatorSize;
-                else
-                    m_lastX += separatorSize;
-            }
-            else
-            {
-                if (m_currentRowsOrColumns >= m_maxRows)
-                    m_lastX += separatorSize;
-                else
-                    m_lastY += separatorSize;
-            }
-        }
-        else if ( tool->IsButton() )
-        {
-            if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-            {
-                if (m_currentRowsOrColumns >= m_maxCols)
-                {
-                    m_currentRowsOrColumns = 0;
-                    m_lastX = m_xMargin;
-                    m_lastY += maxToolHeight + m_toolPacking;
-                }
-                tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
-                tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
-                m_lastX += maxToolWidth + m_toolPacking;
-            }
-            else
-            {
-                if (m_currentRowsOrColumns >= m_maxRows)
-                {
-                    m_currentRowsOrColumns = 0;
-                    m_lastX += (maxToolWidth + m_toolPacking);
-                    m_lastY = m_yMargin;
-                }
-                tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
-                tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
-                m_lastY += maxToolHeight + m_toolPacking;
-            }
-            m_currentRowsOrColumns ++;
-        }
-        else
-        {
-            // TODO: support the controls
-        }
-
-        if (m_lastX > m_maxWidth)
-            m_maxWidth = m_lastX;
-        if (m_lastY > m_maxHeight)
-            m_maxHeight = m_lastY;
-
-        node = node->GetNext();
-    }
-
-    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-        m_maxHeight += maxToolHeight;
-    else
-        m_maxWidth += maxToolWidth;
-
-    m_maxWidth += m_xMargin;
-    m_maxHeight += m_yMargin;
-
-    SetSize(m_maxWidth, m_maxHeight);
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-
-    static int count = 0;
-    // Prevent reentry of OnPaint which would cause wxMemoryDC errors.
-    if ( count > 0 )
-        return;
-    count++;
-
-    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxToolBarToolBase *tool = node->GetData();
-        if ( tool->IsButton() )
-            DrawTool(dc, tool);
-    }
-
-    count--;
-}
-
-void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
-{
-    if (GetAutoLayout())
-        Layout();
-
-    AdjustScrollbars();
-}
-
-void wxToolBarSimple::OnKillFocus(wxFocusEvent& WXUNUSED(event))
-{
-    OnMouseEnter(m_pressedTool = m_currentTool = -1);
-}
-
-void wxToolBarSimple::OnMouseEvent(wxMouseEvent & event)
-{
-    wxCoord x, y;
-    event.GetPosition(&x, &y);
-    wxToolBarToolSimple *tool = (wxToolBarToolSimple *)FindToolForPosition(x, y);
-
-    if (event.LeftDown())
-    {
-        CaptureMouse();
-    }
-    if (event.LeftUp())
-    {
-        ReleaseMouse();
-    }
-
-    if (!tool)
-    {
-        if (m_currentTool > -1)
-        {
-            if (event.LeftIsDown())
-                SpringUpButton(m_currentTool);
-            m_currentTool = -1;
-            OnMouseEnter(-1);
-        }
-        return;
-    }
-
-    if (!event.IsButton())
-    {
-        if ( tool->GetId() != m_currentTool )
-        {
-            // If the left button is kept down and moved over buttons,
-            // press those buttons.
-            if ( event.LeftIsDown() && tool->IsEnabled() )
-            {
-                SpringUpButton(m_currentTool);
-
-                if ( tool->CanBeToggled() )
-                {
-                    tool->Toggle();
-                }
-
-                DrawTool(tool);
-            }
-
-            m_currentTool = tool->GetId();
-            OnMouseEnter(m_currentTool);
-        }
-        return;
-    }
-
-    // Left button pressed.
-    if ( event.LeftDown() && tool->IsEnabled() )
-    {
-        if ( tool->CanBeToggled() )
-        {
-            tool->Toggle();
-        }
-
-        DrawTool(tool);
-    }
-    else if (event.RightDown())
-    {
-        OnRightClick(tool->GetId(), x, y);
-    }
-
-    // Left Button Released.  Only this action confirms selection.
-    // If the button is enabled and it is not a toggle tool and it is
-    // in the pressed state, then raise the button and call OnLeftClick.
-    //
-    if ( event.LeftUp() && tool->IsEnabled() )
-    {
-        // Pass the OnLeftClick event to tool
-        if ( !OnLeftClick(tool->GetId(), tool->IsToggled()) &&
-                          tool->CanBeToggled() )
-        {
-            // If it was a toggle, and OnLeftClick says No Toggle allowed,
-            // then change it back
-            tool->Toggle();
-        }
-
-        DrawTool(tool);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// drawing
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DrawTool(wxToolBarToolBase *tool)
-{
-    wxClientDC dc(this);
-    DrawTool(dc, tool);
-}
-
-void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
-{
-    wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
-    wxMemoryDC memDC;
-    PrepareDC(dc);
-
-    wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
-    wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
-    wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
-
-    wxBitmap bitmap = tool->GetNormalBitmap();
-    if (!bitmap.Ok())
-        return;
-
-    if ( !tool->IsToggled() )
-    {
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
-        if (bitmap.GetPalette())
-            memDC.SetPalette(*bitmap.GetPalette());
-#endif
-#endif // wxUSE_PALETTE
-
-        int ax = (int)tool->m_x,
-        ay = (int)tool->m_y,
-        bx = (int)(tool->m_x+tool->GetWidth()),
-        by = (int)(tool->m_y+tool->GetHeight());
-
-        memDC.SelectObject(bitmap);
-        if (m_windowStyle & wxTB_3DBUTTONS)
-        {
-            dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
-            dc.Blit((ax+1), (ay+1), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
-            wxPen * old_pen = & dc.GetPen();
-            dc.SetPen( white_pen );
-            dc.DrawLine(ax,(by-1),ax,ay);
-            dc.DrawLine(ax,ay,(bx-1),ay);
-            dc.SetPen( dark_grey_pen );
-            dc.DrawLine((bx-1),(ay+1),(bx-1),(by-1));
-            dc.DrawLine((bx-1),(by-1),(ax+1),(by-1));
-            dc.SetPen( black_pen );
-            dc.DrawLine(bx,ay,bx,by);
-            dc.DrawLine(bx,by,ax,by);
-            dc.SetPen( *old_pen );
-            dc.DestroyClippingRegion();
-            // Select bitmap out of the DC
-        }
-        else
-        {
-            dc.Blit(tool->m_x, tool->m_y,
-                    bitmap.GetWidth(), bitmap.GetHeight(),
-                    &memDC, 0, 0);
-        }
-        memDC.SelectObject(wxNullBitmap);
-
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
-        if (bitmap.GetPalette())
-            memDC.SetPalette(wxNullPalette);
-#endif
-#endif // wxUSE_PALETTE
-    }
-    // No second bitmap, so draw a thick line around bitmap, or invert if mono
-    else if ( tool->IsToggled() )
-    {
-        bool drawBorder = false;
-#ifdef __X__ // X doesn't invert properly on colour
-        drawBorder = wxColourDisplay();
-#else       // Inversion works fine under Windows
-        drawBorder = false;
-#endif
-
-        if (!drawBorder)
-        {
-            memDC.SelectObject(tool->GetNormalBitmap());
-            dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
-                    &memDC, 0, 0, wxSRC_INVERT);
-            memDC.SelectObject(wxNullBitmap);
-        }
-        else
-        {
-            bitmap = tool->GetNormalBitmap();
-
-            if (m_windowStyle & wxTB_3DBUTTONS)
-            {
-                int ax = (int)tool->m_x,
-                ay = (int)tool->m_y,
-                bx = (int)(tool->m_x+tool->GetWidth()),
-                by = (int)(tool->m_y+tool->GetHeight());
-
-                memDC.SelectObject(bitmap);
-                dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
-                dc.Blit((ax+2), (ay+2), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
-                wxPen * old_pen = & dc.GetPen();
-                dc.SetPen( black_pen );
-                dc.DrawLine(ax,(by-1),ax,ay);
-                dc.DrawLine(ax,ay,(bx-1),ay);
-                dc.SetPen( dark_grey_pen );
-                dc.DrawLine((ax+1),(by-2),(ax+1),(ay+1));
-                dc.DrawLine((ax+1),(ay+1),(bx-2),(ay+1));
-                dc.SetPen( white_pen );
-                dc.DrawLine(bx,ay,bx,by);
-                dc.DrawLine(bx,by,ax,by);
-                dc.SetPen( *old_pen );
-                dc.DestroyClippingRegion();
-                memDC.SelectObject(wxNullBitmap);
-            }
-            else
-            {
-                wxCoord x = tool->m_x;
-                wxCoord y = tool->m_y;
-                wxCoord w = bitmap.GetWidth();
-                wxCoord h = bitmap.GetHeight();
-                wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
-
-                memDC.SelectObject(bitmap);
-                dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
-                dc.Blit(tool->m_x, tool->m_y, w, h,
-                        &memDC, 0, 0);
-                dc.SetPen(thick_black_pen);
-                dc.SetBrush(*wxTRANSPARENT_BRUSH);
-                dc.DrawRectangle(x, y, w-1, h-1);
-                dc.DestroyClippingRegion();
-                memDC.SelectObject(wxNullBitmap);
-            }
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// toolbar geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::SetRows(int nRows)
-{
-    wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
-
-    m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
-
-    AdjustScrollbars();
-    Refresh();
-}
-
-wxToolBarToolBase *wxToolBarSimple::FindToolForPosition(wxCoord x,
-                                                        wxCoord y) const
-{
-    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-    while (node)
-    {
-        wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
-        if ((x >= tool->m_x) && (y >= tool->m_y) &&
-            (x <= (tool->m_x + tool->GetWidth())) &&
-            (y <= (tool->m_y + tool->GetHeight())))
-        {
-            return tool;
-        }
-
-        node = node->GetNext();
-    }
-
-    return (wxToolBarToolBase *)NULL;
-}
-
-// ----------------------------------------------------------------------------
-// tool state change handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DoEnableTool(wxToolBarToolBase *tool,
-                                   bool WXUNUSED(enable))
-{
-    DrawTool(tool);
-}
-
-void wxToolBarSimple::DoToggleTool(wxToolBarToolBase *tool,
-                                   bool WXUNUSED(toggle))
-{
-    DrawTool(tool);
-}
-
-void wxToolBarSimple::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
-                                  bool WXUNUSED(toggle))
-{
-    // nothing to do
-}
-
-// Okay, so we've left the tool we're in ... we must check if the tool we're
-// leaving was a 'sprung push button' and if so, spring it back to the up
-// state.
-void wxToolBarSimple::SpringUpButton(int id)
-{
-    wxToolBarToolBase *tool = FindById(id);
-
-    if ( tool && tool->CanBeToggled() )
-    {
-        if (tool->IsToggled())
-            tool->Toggle();
-
-        DrawTool(tool);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// scrolling implementation
-// ----------------------------------------------------------------------------
-
-/*
- * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
- * noUnitsX/noUnitsY:        : no. units per scrollbar
- */
-void wxToolBarSimple::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
-                                   int noUnitsX, int noUnitsY,
-                                   int xPos, int yPos)
-{
-    m_xScrollPixelsPerLine = pixelsPerUnitX;
-    m_yScrollPixelsPerLine = pixelsPerUnitY;
-    m_xScrollLines = noUnitsX;
-    m_yScrollLines = noUnitsY;
-
-    int w, h;
-    GetSize(&w, &h);
-
-    // Recalculate scroll bar range and position
-    if (m_xScrollLines > 0)
-    {
-        m_xScrollPosition = xPos;
-        SetScrollPos (wxHORIZONTAL, m_xScrollPosition, true);
-    }
-    else
-    {
-        SetScrollbar(wxHORIZONTAL, 0, 0, 0, false);
-        m_xScrollPosition = 0;
-    }
-
-    if (m_yScrollLines > 0)
-    {
-        m_yScrollPosition = yPos;
-        SetScrollPos (wxVERTICAL, m_yScrollPosition, true);
-    }
-    else
-    {
-        SetScrollbar(wxVERTICAL, 0, 0, 0, false);
-        m_yScrollPosition = 0;
-    }
-    AdjustScrollbars();
-    Refresh();
-
-#if 0 //def __WXMSW__
-    ::UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::OnScroll(wxScrollEvent& event)
-{
-    int orient = event.GetOrientation();
-
-    int nScrollInc = CalcScrollInc(event);
-    if (nScrollInc == 0)
-        return;
-
-    if (orient == wxHORIZONTAL)
-    {
-        int newPos = m_xScrollPosition + nScrollInc;
-        SetScrollPos(wxHORIZONTAL, newPos, true );
-    }
-    else
-    {
-        int newPos = m_yScrollPosition + nScrollInc;
-        SetScrollPos(wxVERTICAL, newPos, true );
-    }
-
-    if (orient == wxHORIZONTAL)
-    {
-        if (m_xScrollingEnabled)
-            ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
-        else
-            Refresh();
-    }
-    else
-    {
-        if (m_yScrollingEnabled)
-            ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
-        else
-            Refresh();
-    }
-
-    if (orient == wxHORIZONTAL)
-    {
-        m_xScrollPosition += nScrollInc;
-    }
-    else
-    {
-        m_yScrollPosition += nScrollInc;
-    }
-
-}
-
-int wxToolBarSimple::CalcScrollInc(wxScrollEvent& event)
-{
-    int pos = event.GetPosition();
-    int orient = event.GetOrientation();
-
-    int nScrollInc = 0;
-    if (event.GetEventType() == wxEVT_SCROLL_TOP)
-    {
-            if (orient == wxHORIZONTAL)
-                nScrollInc = - m_xScrollPosition;
-            else
-                nScrollInc = - m_yScrollPosition;
-    } else
-    if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
-    {
-            if (orient == wxHORIZONTAL)
-                nScrollInc = m_xScrollLines - m_xScrollPosition;
-            else
-                nScrollInc = m_yScrollLines - m_yScrollPosition;
-    } else
-    if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
-    {
-            nScrollInc = -1;
-    } else
-    if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
-    {
-            nScrollInc = 1;
-    } else
-    if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
-    {
-            if (orient == wxHORIZONTAL)
-                nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
-            else
-                nScrollInc = -GetScrollPageSize(wxVERTICAL);
-    } else
-    if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
-    {
-            if (orient == wxHORIZONTAL)
-                nScrollInc = GetScrollPageSize(wxHORIZONTAL);
-            else
-                nScrollInc = GetScrollPageSize(wxVERTICAL);
-    } else
-    if ((event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) ||
-        (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE))
-    {
-            if (orient == wxHORIZONTAL)
-                nScrollInc = pos - m_xScrollPosition;
-            else
-                nScrollInc = pos - m_yScrollPosition;
-    }
-
-    if (orient == wxHORIZONTAL)
-    {
-        int w, h;
-        GetClientSize(&w, &h);
-
-        int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
-        int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
-        if (noPositions < 0)
-            noPositions = 0;
-
-        if ( (m_xScrollPosition + nScrollInc) < 0 )
-            nScrollInc = -m_xScrollPosition; // As -ve as we can go
-        else if ( (m_xScrollPosition + nScrollInc) > noPositions )
-            nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
-
-        return nScrollInc;
-    }
-    else
-    {
-        int w, h;
-        GetClientSize(&w, &h);
-
-        int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-        int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
-        if (noPositions < 0)
-            noPositions = 0;
-
-        if ( (m_yScrollPosition + nScrollInc) < 0 )
-            nScrollInc = -m_yScrollPosition; // As -ve as we can go
-        else if ( (m_yScrollPosition + nScrollInc) > noPositions )
-            nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
-
-        return nScrollInc;
-    }
-}
-
-// Adjust the scrollbars - new version.
-void wxToolBarSimple::AdjustScrollbars()
-{
-    int w, h;
-    GetClientSize(&w, &h);
-
-    // Recalculate scroll bar range and position
-    if (m_xScrollLines > 0)
-    {
-        int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
-        int newRange = (int) ( ((nMaxWidth)/(float)m_xScrollPixelsPerLine) + 0.5 );
-        if (newRange < 0)
-            newRange = 0;
-
-        m_xScrollPosition = wxMin(newRange, m_xScrollPosition);
-
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
-        if (noPagePositions < 1)
-            noPagePositions = 1;
-
-        SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, newRange);
-        SetScrollPageSize(wxHORIZONTAL, noPagePositions);
-    }
-    if (m_yScrollLines > 0)
-    {
-        int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-        int newRange = (int) ( ((nMaxHeight)/(float)m_yScrollPixelsPerLine) + 0.5 );
-        if (newRange < 0)
-            newRange = 0;
-
-        m_yScrollPosition = wxMin(newRange, m_yScrollPosition);
-
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
-        if (noPagePositions < 1)
-            noPagePositions = 1;
-
-        SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, newRange);
-        SetScrollPageSize(wxVERTICAL, noPagePositions);
-    }
-}
-
-// Prepare the DC by translating it according to the current scroll position
-void wxToolBarSimple::PrepareDC(wxDC& dc)
-{
-    dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
-}
-
-void wxToolBarSimple::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
-{
-      *x_unit = m_xScrollPixelsPerLine;
-      *y_unit = m_yScrollPixelsPerLine;
-}
-
-int wxToolBarSimple::GetScrollPageSize(int orient) const
-{
-    if ( orient == wxHORIZONTAL )
-        return m_xScrollLinesPerPage;
-    else
-        return m_yScrollLinesPerPage;
-}
-
-void wxToolBarSimple::SetScrollPageSize(int orient, int pageSize)
-{
-    if ( orient == wxHORIZONTAL )
-        m_xScrollLinesPerPage = pageSize;
-    else
-        m_yScrollLinesPerPage = pageSize;
-}
-
-/*
- * Scroll to given position (scroll position, not pixel position)
- */
-void wxToolBarSimple::Scroll (int x_pos, int y_pos)
-{
-    int old_x, old_y;
-    ViewStart (&old_x, &old_y);
-    if (((x_pos == wxDefaultCoord) || (x_pos == old_x)) && ((y_pos == wxDefaultCoord) || (y_pos == old_y)))
-        return;
-
-    if (x_pos != wxDefaultCoord)
-    {
-        m_xScrollPosition = x_pos;
-        SetScrollPos (wxHORIZONTAL, x_pos, true);
-    }
-    if (y_pos != wxDefaultCoord)
-    {
-        m_yScrollPosition = y_pos;
-        SetScrollPos (wxVERTICAL, y_pos, true);
-    }
-    Refresh();
-
-#if 0 //def __WXMSW__
-    UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::EnableScrolling (bool x_scroll, bool y_scroll)
-{
-    m_xScrollingEnabled = x_scroll;
-    m_yScrollingEnabled = y_scroll;
-}
-
-void wxToolBarSimple::GetVirtualSize (int *x, int *y) const
-{
-    *x = m_xScrollPixelsPerLine * m_xScrollLines;
-    *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-
-// Where the current view starts from
-void wxToolBarSimple::ViewStart (int *x, int *y) const
-{
-    *x = m_xScrollPosition;
-    *y = m_yScrollPosition;
-}
-
-#endif // wxUSE_TOOLBAR_SIMPLE
-
diff --git a/contrib/src/deprecated/treelay.cpp b/contrib/src/deprecated/treelay.cpp
deleted file mode 100644
index 28c4207bfd..0000000000
--- a/contrib/src/deprecated/treelay.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        treelay.h
-// Purpose:     wxTreeLayout class
-// Author:      Julian Smart
-// Modified by:
-// Created:     7/4/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/dc.h"
-#include "wx/event.h"
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_TREELAYOUT
-
-#include "wx/deprecated/treelay.h"
-
-/*
- * Abstract tree
- *
- */
-
-IMPLEMENT_ABSTRACT_CLASS(wxTreeLayout, wxObject)
-
-wxTreeLayout::wxTreeLayout()
-{
-    m_xSpacing = 16;
-    m_ySpacing = 20;
-    m_topMargin = 5;
-    m_leftMargin = 5;
-    m_orientation = false;
-    m_parentNode = 0;
-}
-
-void wxTreeLayout::DoLayout(wxDC& dc, long topId)
-{
-    if (topId != wxID_ANY)
-        SetTopNode(topId);
-
-    long actualTopId = GetTopNode();
-    long id = actualTopId;
-    while (id != wxID_ANY)
-    {
-        SetNodeX(id, 0);
-        SetNodeY(id, 0);
-        ActivateNode(id, false);
-        id = GetNextNode(id);
-    }
-    m_lastY = m_topMargin;
-    m_lastX = m_leftMargin;
-    CalcLayout(actualTopId, 0, dc);
-}
-
-void wxTreeLayout::Draw(wxDC& dc)
-{
-    dc.Clear();
-    DrawBranches(dc);
-    DrawNodes(dc);
-}
-
-void wxTreeLayout::DrawNodes(wxDC& dc)
-{
-    long id = GetTopNode();
-    while (id != wxID_ANY)
-    {
-        if (NodeActive(id))
-            DrawNode(id, dc);
-        id = GetNextNode(id);
-    }
-}
-
-void wxTreeLayout::DrawBranches(wxDC& dc)
-{
-    long id = GetTopNode();
-    while (id != wxID_ANY)
-    {
-        if (GetNodeParent(id) != wxID_ANY)
-        {
-            long parent = GetNodeParent(id);
-            if (NodeActive(parent))
-                DrawBranch(parent, id, dc);
-        }
-        id = GetNextNode(id);
-    }
-}
-
-void wxTreeLayout::DrawNode(long id, wxDC& dc)
-{
-    wxChar buf[80];
-    wxString name(GetNodeName(id));
-    if (name != wxT(""))
-        wxSprintf(buf, wxT("%s"), (const wxChar*) name);
-    else
-        wxSprintf(buf, wxT("<unnamed>"));
-
-    long x = 80;
-    long y = 20;
-    dc.GetTextExtent(buf, &x, &y);
-    dc.DrawText(buf, GetNodeX(id), (long)(GetNodeY(id) - (y/2.0)));
-}
-
-void wxTreeLayout::DrawBranch(long from, long to, wxDC& dc)
-{
-    long w, h;
-    GetNodeSize(from, &w, &h, dc);
-    dc.DrawLine(GetNodeX(from)+w, GetNodeY(from),
-        GetNodeX(to), GetNodeY(to));
-}
-
-void wxTreeLayout::Initialize(void)
-{
-}
-
-void wxTreeLayout::GetNodeSize(long id, long *x, long *y, wxDC& dc)
-{
-    wxString name(GetNodeName(id));
-    if (name != wxT(""))
-        dc.GetTextExtent(name, x, y);
-    else
-    {
-        *x = 70; *y = 20;
-    }
-}
-
-void wxTreeLayout::CalcLayout(long nodeId, int level, wxDC& dc)
-{
-    wxList children;
-    GetChildren(nodeId, children);
-    int n = children.GetCount();
-
-    if (m_orientation == false)
-    {
-        // Left to right
-        // X Calculations
-        if (level == 0)
-            SetNodeX(nodeId, m_leftMargin);
-        else
-        {
-            long x = 0;
-            long y = 0;
-            long parentId = GetNodeParent(nodeId);
-            if (parentId != wxID_ANY)
-                GetNodeSize(parentId, &x, &y, dc);
-            SetNodeX(nodeId, (long)(GetNodeX(parentId) + m_xSpacing + x));
-        }
-
-        wxList::compatibility_iterator node = children.GetFirst();
-        while (node)
-        {
-            CalcLayout((long)node->GetData(), level+1, dc);
-            node = node->GetNext();
-        }
-
-        // Y Calculations
-        long averageY;
-        ActivateNode(nodeId, true);
-
-        if (n > 0)
-        {
-            averageY = 0;
-            node = children.GetFirst();
-            while (node)
-            {
-                averageY += GetNodeY((long)node->GetData());
-                node = node->GetNext();
-            }
-            averageY = averageY / n;
-            SetNodeY(nodeId, averageY);
-        }
-        else
-        {
-            SetNodeY(nodeId, m_lastY);
-            long x, y;
-            GetNodeSize(nodeId, &x, &y, dc);
-
-            m_lastY = m_lastY + y + m_ySpacing;
-        }
-    }
-    else
-    {
-        // Top to bottom
-
-        // Y Calculations
-        if (level == 0)
-            SetNodeY(nodeId, m_topMargin);
-        else
-        {
-            long x = 0;
-            long y = 0;
-            long parentId = GetNodeParent(nodeId);
-            if (parentId != wxID_ANY)
-                GetNodeSize(parentId, &x, &y, dc);
-            SetNodeY(nodeId, (long)(GetNodeY(parentId) + m_ySpacing + y));
-        }
-
-        wxList::compatibility_iterator node = children.GetFirst();
-        while (node)
-        {
-            CalcLayout((long)node->GetData(), level+1, dc);
-            node = node->GetNext();
-        }
-
-        // X Calculations
-        long averageX;
-        ActivateNode(nodeId, true);
-
-        if (n > 0)
-        {
-            averageX = 0;
-            node = children.GetFirst();
-            while (node)
-            {
-                averageX += GetNodeX((long)node->GetData());
-                node = node->GetNext();
-            }
-            averageX = averageX / n;
-            SetNodeX(nodeId, averageX);
-        }
-        else
-        {
-            SetNodeX(nodeId, m_lastX);
-            long x, y;
-            GetNodeSize(nodeId, &x, &y, dc);
-
-            m_lastX = m_lastX + x + m_xSpacing;
-        }
-    }
-}
-
-/*
- * Tree with storage
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreeLayoutStored, wxTreeLayout)
-
-wxTreeLayoutStored::wxTreeLayoutStored(int n):wxTreeLayout()
-{
-    m_nodes = NULL;
-    m_maxNodes = 0;
-    Initialize(n);
-}
-
-wxTreeLayoutStored::~wxTreeLayoutStored(void)
-{
-    if (m_nodes)
-        delete[] m_nodes;
-}
-
-void wxTreeLayoutStored::Initialize(int n)
-{
-    m_maxNodes = n;
-    wxTreeLayout::Initialize();
-    if (m_nodes) delete[] m_nodes;
-    m_nodes = new wxStoredNode[m_maxNodes];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        m_nodes[i].m_name = wxT("");
-        m_nodes[i].m_active = false;
-        m_nodes[i].m_parentId = wxID_ANY;
-        m_nodes[i].m_x = 0;
-        m_nodes[i].m_y = 0;
-    }
-    m_num = 0;
-}
-
-long wxTreeLayoutStored::AddChild(const wxString& name, const wxString& parent)
-{
-    if (m_num < (m_maxNodes -1 ))
-    {
-        long i = -1;
-        if (parent != wxT(""))
-            i = NameToId(parent);
-        else m_parentNode = m_num;
-
-        m_nodes[m_num].m_parentId = i;
-        m_nodes[m_num].m_name = name;
-        m_nodes[m_num].m_x = m_nodes[m_num].m_y = 0;
-        m_nodes[m_num].m_clientData = 0;
-        m_num ++;
-
-        return (m_num - 1);
-    }
-    else
-        return -1;
-}
-
-long wxTreeLayoutStored::AddChild(const wxString& name, long parent)
-{
-    if (m_num < (m_maxNodes -1 ) && parent < m_num)
-    {
-        long i = -1;
-        if (parent != -1)
-        {
-          i = parent;
-        }
-        else
-        {
-          m_parentNode = m_num;
-        }
-
-        m_nodes[m_num].m_parentId = i;
-        m_nodes[m_num].m_name = name;
-        m_nodes[m_num].m_x = m_nodes[m_num].m_y = 0;
-        m_nodes[m_num].m_clientData = 0;
-        m_num ++;
-
-        return (m_num - 1);
-    }
-    else
-        return -1;
-}
-
-long wxTreeLayoutStored::NameToId(const wxString& name)
-{
-    long i;
-    for (i = 0; i < m_num; i++)
-        if (name == m_nodes[i].m_name)
-            return i;
-        return -1;
-}
-
-void wxTreeLayoutStored::GetChildren(long id, wxList& list)
-{
-    long currentId = GetTopNode();
-    while (currentId != wxID_ANY)
-    {
-        if (id == GetNodeParent(currentId))
-            list.Append((wxObject *)currentId);
-        currentId = GetNextNode(currentId);
-    }
-}
-
-wxStoredNode* wxTreeLayoutStored::GetNode(long idx) const
-{
-    wxASSERT(idx < m_num);
-
-    return &m_nodes[idx];
-};
-
-long wxTreeLayoutStored::GetNodeX(long id)
-{
-    wxASSERT(id < m_num);
-
-    return (long)m_nodes[id].m_x;
-}
-
-long wxTreeLayoutStored::GetNodeY(long id)
-{
-    wxASSERT(id < m_num);
-
-    return (long)m_nodes[id].m_y;
-}
-
-void wxTreeLayoutStored::SetNodeX(long id, long x)
-{
-    wxASSERT(id < m_num);
-
-    m_nodes[id].m_x = (int)x;
-}
-
-void wxTreeLayoutStored::SetNodeY(long id, long y)
-{
-    wxASSERT(id < m_num);
-
-    m_nodes[id].m_y = (int)y;
-}
-
-void wxTreeLayoutStored::SetNodeName(long id, const wxString& name)
-{
-    wxASSERT(id < m_num);
-
-    m_nodes[id].m_name = name;
-}
-
-wxString wxTreeLayoutStored::GetNodeName(long id)
-{
-    wxASSERT(id < m_num);
-
-    return m_nodes[id].m_name;
-}
-
-long wxTreeLayoutStored::GetNodeParent(long id)
-{
-    if (id != wxID_ANY)
-    {
-        wxASSERT(id < m_num);
-
-        return m_nodes[id].m_parentId;
-    }
-    else
-        return wxNOT_FOUND;
-}
-
-long wxTreeLayoutStored::GetNextNode(long id)
-{
-    wxASSERT(id < m_num);
-
-    if ((id != wxID_ANY) && (id < (m_num - 1)))
-        return id + 1;
-    else
-        return wxNOT_FOUND;
-}
-
-void wxTreeLayoutStored::SetClientData(long id, long clientData)
-{
-    wxASSERT(id < m_num);
-
-    m_nodes[id].m_clientData = clientData;
-}
-
-long wxTreeLayoutStored::GetClientData(long id) const
-{
-    wxASSERT(id < m_num);
-
-    return m_nodes[id].m_clientData;
-}
-
-void wxTreeLayoutStored::ActivateNode(long id, bool active)
-{
-    wxASSERT(id < m_num);
-
-    m_nodes[id].m_active = active;
-}
-
-bool wxTreeLayoutStored::NodeActive(long id)
-{
-    wxASSERT(id < m_num);
-
-    return m_nodes[id].m_active;
-}
-
-wxString wxTreeLayoutStored::HitTest(wxMouseEvent& event, wxDC& dc)
-{
-    wxPoint pt = event.GetPosition();
-    wxCoord x = pt.x;
-    wxCoord y = pt.y;
-
-    int i;
-    for (i = 0; i < m_maxNodes; i++)
-    {
-        long width, height;
-        dc.GetTextExtent(m_nodes[i].m_name, &width, &height);
-
-        if ( (x >= (m_nodes[i].m_x-10)) && (x < (m_nodes[i].m_x + width+10)) &&
-            (y >= m_nodes[i].m_y-10) && (y < (m_nodes[i].m_y + height+10)) )
-        {
-            return m_nodes[i].m_name;
-        }
-    }
-
-    return wxString( wxT("") );
-}
-
-#endif
-    // wxUSE_TREELAYOUT
diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
deleted file mode 100644
index c1345a610e..0000000000
--- a/contrib/src/deprecated/wxexpr.cpp
+++ /dev/null
@@ -1,1281 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wxexpr.cpp
-// Purpose:     wxExpr
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/deprecated/setup.h"
-
-#if wxUSE_PROLOGIO
-
-#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>
-
-#include "wx/utils.h"
-#include "wx/deprecated/expr.h"
-#include "wx/deprecated/wxexpr.h"
-
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
-    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
-extern "C" void add_expr(char *);
-extern "C" void LexFromFile(FILE *fd);
-extern "C" void LexFromString(char *buf);
-
-
-
-/* Rename all YACC/LEX stuff or we'll conflict with other
- * applications
- */
-
-#define yyback PROIO_yyback
-#define yylook PROIO_yylook
-#define yywrap PROIO_yywrap
-#define yyoutput PROIO_yyoutput
-#define yylex PROIO_yylex
-#define yyerror PROIO_yyerror
-#define yyleng PROIO_yyleng
-#define yytext PROIO_yytext
-#define yymorfg PROIO_yymorfg
-#define yylineno PROIO_yylineno
-#define yytchar PROIO_yytchar
-#define yyin PROIO_yyin
-#define yyout PROIO_yyout
-#define yysvf PROIO_yysvf
-#define yyestate PROIO_yyestate
-#define yysvec PROIO_yysvec
-#define yybgin PROIO_yybgin
-#define yyprevious PROIO_yyprevious
-#define yylhs PROIO_yylhs
-#define yylen PROIO_yylen
-#define yydefred PROIO_yydefred
-#define yydgoto PROIO_yydgoto
-#define yysindex PROIO_yysindex
-#define yyrindex PROIO_yyrindex
-#define yygindex PROIO_yygindex
-#define yytable PROIO_yytable
-#define yycheck PROIO_yycheck
-#define yyname PROIO_yyname
-#define yyrule PROIO_yyrule
-#define yydebug PROIO_yydebug
-#define yynerrs PROIO_yynerrs
-#define yyerrflag PROIO_yyerrflag
-#define yychar PROIO_yychar
-#define yyvsp PROIO_yyvsp
-#define yyssp PROIO_yyssp
-#define yyval PROIO_yyval
-#define yylval PROIO_yylval
-#define yyss PROIO_yyss
-#define yyvs PROIO_yyvs
-#define yyparse PROIO_yyparse
-
-/* +++steve162e: more defines necessary */
-#define yy_init_buffer PROIO_yy_init_buffer
-#define yy_create_buffer PROIO_yy_create_buffer
-#define yy_load_buffer_state PROIO_yy_load_buffer_state
-#define yyrestart PROIO_yyrestart
-#define yy_switch_to_buffer PROIO_yy_switch_to_buffer
-#define yy_delete_buffer PROIO_yy_delete_buffer
-/* ---steve162e */
-
-/* WG 1/96: still more for flex 2.5 */
-#define yy_scan_buffer PROIO_scan_buffer
-#define yy_scan_string PROIO_scan_string
-#define yy_scan_bytes PROIO_scan_bytes
-#define yy_flex_debug PROIO_flex_debug
-#define yy_flush_buffer PROIO_flush_buffer
-#if !defined(__VISAGECPP__)
-/* multiply defined??? */
-#define yyleng PROIO_yyleng
-#define yytext PROIO_yytext
-#endif
-
-extern "C" WXDLLIMPEXP_DATA_DEPRECATED(FILE*) yyin;
-extern "C" WXDLLIMPEXP_DEPRECATED int yyparse(void);
-
-
-wxExprDatabase *thewxExprDatabase = NULL;
-wxExprErrorHandler currentwxExprErrorHandler;
-
-wxExpr::wxExpr(const wxString& functor)
-{
-  type = wxExprList;
-  next = NULL;
-  last = NULL;
-  value.first = NULL;
-
-  wxExpr *pfunctor = new wxExpr(wxExprWord, functor);
-  Append(pfunctor);
-  client_data = NULL;
-}
-
-wxExpr::wxExpr(wxExprType the_type, const wxString& word_or_string)
-{
-  type = the_type;
-
-  switch (the_type)
-  {
-   case wxExprWord:
-    value.word = copystring((const wxChar *)word_or_string);
-    break;
-   case wxExprString:
-    value.string = copystring((const wxChar *)word_or_string);
-    break;
-   case wxExprList:
-    last = NULL;
-    value.first = NULL;
-    break;
-   case wxExprReal:
-   case wxExprInteger:
-   case wxExprNull:
-    break;
-  }
-  client_data = NULL;
-  next = NULL;
-}
-
-wxExpr::wxExpr(wxExprType the_type, wxChar *word_or_string, bool allocate)
-{
-  type = the_type;
-
-  switch (the_type)
-  {
-   case wxExprWord:
-    value.word = allocate ? copystring(word_or_string) : word_or_string;
-    break;
-   case wxExprString:
-    value.string = allocate ? copystring(word_or_string) : word_or_string;
-    break;
-   case wxExprList:
-    last = NULL;
-    value.first = NULL;
-    break;
-   case wxExprReal:
-   case wxExprInteger:
-   case wxExprNull:
-    break;
-  }
-  client_data = NULL;
-  next = NULL;
-}
-
-wxExpr::wxExpr(long the_integer)
-{
-  type = wxExprInteger;
-  value.integer = the_integer;
-  client_data = NULL;
-  next = NULL;
-}
-
-wxExpr::wxExpr(double the_real)
-{
-  type = wxExprReal;
-  value.real = the_real;
-  client_data = NULL;
-  next = NULL;
-}
-
-wxExpr::wxExpr(wxList *the_list)
-{
-  type = wxExprList;
-  client_data = NULL;
-  last = NULL;
-  value.first = NULL;
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  wxNode *node = the_list->GetFirst();
-  while (node)
-  {
-    wxExpr *expr = (wxExpr *)node->GetData();
-    listExpr->Append(expr);
-    node = node->GetNext();
-  }
-  Append(listExpr);
-
-  delete the_list;
-}
-
-wxExpr::~wxExpr(void)
-{
-  switch (type)
-  {
-    case wxExprInteger:
-    case wxExprReal:
-    {
-     break;
-    }
-   case wxExprString:
-   {
-     delete[] value.string;
-     break;
-   }
-   case wxExprWord:
-   {
-     delete[] value.word;
-     break;
-   }
-   case wxExprList:
-   {
-     wxExpr *expr = value.first;
-     while (expr)
-     {
-       wxExpr *expr1 = expr->next;
-
-       delete expr;
-       expr = expr1;
-     }
-     break;
-   }
-   case wxExprNull: break;
-  }
-}
-
-void wxExpr::Append(wxExpr *expr)
-{
-  if (!value.first)
-    value.first = expr;
-
-  if (last)
-    last->next = expr;
-  last = expr;
-}
-
-void wxExpr::Insert(wxExpr *expr)
-{
-  expr->next = value.first;
-  value.first = expr;
-
-  if (!last)
-    last = expr;
-}
-
-wxExpr *wxExpr::Copy(void) const
-{
-  // This seems to get round an optimizer bug when
-  // using Watcom C++ 10a in WIN32 compilation mode.
-  // If these lines not present, the type seems to be
-  // interpreted wrongly as an integer.
-  // I don't want to turn optimization off since it's needed
-  // for reading in files quickly.
-#if defined(__WATCOMC__)
-  char buf[2];
-  sprintf(buf, "");
-#endif
-
-  switch (type)
-  {
-    case wxExprInteger:
-      return new wxExpr(value.integer);
-    case wxExprReal:
-      return new wxExpr(value.real);
-    case wxExprString:
-      return new wxExpr(wxExprString, wxString(value.string));
-    case wxExprWord:
-      return new wxExpr(wxExprWord, wxString(value.word));
-    case wxExprList:
-    {
-      wxExpr *expr = value.first;
-      wxExpr *new_list = new wxExpr(wxExprList);
-      while (expr)
-      {
-        wxExpr *expr2 = expr->Copy();
-        new_list->Append(expr2);
-        expr = expr->next;
-      }
-      return new_list;
-    }
-   case wxExprNull:
-    break;
-  }
-  return NULL;
-}
-
-
-// Get the wxExpr (containing (= wxExpr Value) form) for the given word
-//  or string, assuming that we have Attribute=Value, ...
-wxExpr *wxExpr::GetAttributeValueNode(const wxString& word) const // Use only for a clause or list
-{
-  if (type != wxExprList)
-    return NULL;
-
-  wxExpr *expr = value.first;
-  while (expr)
-  {
-    if (expr->type == wxExprList)
-    {
-      wxExpr *firstNode = expr->value.first;
-      if ((firstNode->type == wxExprWord) && (firstNode->value.word[0] == '='))
-      {
-        wxExpr *secondNode = firstNode->next;
-        if ((secondNode->type == wxExprWord) &&
-            (wxStrcmp((const wxChar *)word, secondNode->value.word) == 0))
-        {
-          return expr;
-        }
-      }
-    }
-    expr = expr->next;
-  }
-  return NULL;
-}
-
-// Get the value (in wxExpr form) for the given word or string, assuming
-// that we have Attribute=Value, ...
-wxExpr *wxExpr::AttributeValue(const wxString& word) const // Use only for a clause or list
-{
-  if (type != wxExprList)
-    return NULL;
-
-  wxExpr *attExpr = GetAttributeValueNode(word);
-  if (attExpr && attExpr->value.first && attExpr->value.first->next)
-    return attExpr->value.first->next->next;
-  else return NULL;
-}
-
-wxString wxExpr::Functor(void) const // Use only for a clause
-{
-  if ((type != wxExprList) || !value.first)
-    return wxString(wxT(""));
-
-  if (value.first->type == wxExprWord)
-    return wxString(value.first->value.word);
-  else
-    return wxString(wxT(""));
-}
-
-bool wxExpr::IsFunctor(const wxString& f) const  // Use only for a clause
-{
-  if ((type != wxExprList) || !value.first)
-    return false;
-
-  return (value.first->type == wxExprWord &&
-          (wxStrcmp((const wxChar *)f, value.first->value.word) == 0));
-}
-
-// Return nth argument of a clause (starting from 1)
-wxExpr *wxExpr::Arg(wxExprType theType, int arg) const
-{
-  wxExpr *expr = value.first;
-  int i;
-  for (i = 1; i < arg; i++)
-    if (expr)
-      expr = expr->next;
-
-  if (expr && (expr->type == theType))
-    return expr;
-  else
-    return NULL;
-}
-
-// Return nth argument of a list expression (starting from zero)
-wxExpr *wxExpr::Nth(int arg) const
-{
-  if (type != wxExprList)
-    return NULL;
-
-  wxExpr *expr = value.first;
-  int i;
-  for (i = 0; i < arg; i++)
-    if (expr)
-      expr = expr->next;
-    else return NULL;
-
-  if (expr)
-    return expr;
-  else
-    return NULL;
-}
-
-  // Returns the number of elements in a list expression
-int wxExpr::Number(void) const
-{
-  if (type != wxExprList)
-    return 0;
-
-  int i = 0;
-  wxExpr *expr = value.first;
-  while (expr)
-  {
-    expr = expr->next;
-    i ++;
-  }
-  return i;
-}
-
-void wxExpr::DeleteAttributeValue(const wxString& attribute)
-{
-  if (type != wxExprList)
-    return;
-
-  wxExpr *expr = value.first;
-  wxExpr *lastExpr = this;
-  while (expr)
-  {
-    if (expr->type == wxExprList)
-    {
-      wxExpr *firstNode = expr->value.first;
-      if ((firstNode->type == wxExprWord) && (firstNode->value.word[0] == '='))
-      {
-        wxExpr *secondNode = firstNode->next;
-        if ((secondNode->type == wxExprWord) &&
-            (wxStrcmp((const wxChar *)attribute, secondNode->value.word) == 0))
-        {
-          wxExpr *nextExpr = expr->next;
-          delete expr;
-
-          lastExpr->next = nextExpr;
-
-          if (last == expr)
-            last = lastExpr;
-
-          return;
-        }
-      }
-    }
-    lastExpr = expr;
-    expr = expr->next;
-  }
-  return;
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, wxExpr *val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-  // Warning - existing code may assume that any existing value
-  // is deleted first. For efficiency, we leave this to the application.
-//  DeleteAttributeValue(attribute);
-
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(val);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, long val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-  // Warning - existing code may assume that any existing value
-  // is deleted first. For efficiency, we leave this to the application.
-//  DeleteAttributeValue(attribute);
-
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pval = new wxExpr(val);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(pval);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, double val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-
-//  DeleteAttributeValue(attribute);
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pval = new wxExpr(val);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(pval);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueString(const wxString& attribute, const wxString& val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-
-//  DeleteAttributeValue(attribute);
-
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pval = new wxExpr(wxExprString, val);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(pval);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueWord(const wxString& attribute, const wxString& val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-
-//  DeleteAttributeValue(attribute);
-
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pval = new wxExpr(wxExprWord, val);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(pval);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValue(const wxString& attribute, wxList *val)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-  if (!val)
-    return;
-
-//  DeleteAttributeValue(attribute);
-
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pval = new wxExpr(val);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr = new wxExpr(wxExprList);
-
-  listExpr->Append(pequals);
-  listExpr->Append(patt);
-  listExpr->Append(pval);
-
-  Append(listExpr);
-}
-
-void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *string_list)
-{
-  if (type != wxExprList)
-  {
-//    cout << "Error! tried to add an attribute-value pair to a nonlist wxExpr expression\n";
-    return;
-  }
-  if (!string_list)
-    return;
-
-//  DeleteAttributeValue(attribute);
-
-  // First make a list of wxExpr strings
-  wxExpr *listExpr = new wxExpr(wxExprList);
-  wxNode *node = string_list->GetFirst();
-  while (node)
-  {
-    wxChar *string = (wxChar*)node->GetData();
-    wxExpr *expr = new wxExpr(wxExprString, wxString(string));
-    listExpr->Append(expr);
-    node = node->GetNext();
-  }
-
-  // Now make an (=, Att, Value) triple
-  wxExpr *patt = new wxExpr(wxExprWord, attribute);
-  wxExpr *pequals = new wxExpr(wxExprWord, wxT("="));
-
-  wxExpr *listExpr2 = new wxExpr(wxExprList);
-
-  listExpr2->Append(pequals);
-  listExpr2->Append(patt);
-  listExpr2->Append(listExpr);
-
-  Append(listExpr2);
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, int& var) const
-{
-  wxExpr *expr = AttributeValue(att);
-
-  if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
-  {
-    var = (int)(expr->IntegerValue());
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, long& var) const
-{
-  wxExpr *expr = AttributeValue(att);
-
-  if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
-  {
-    var = expr->IntegerValue();
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, float& var) const
-{
-  wxExpr *expr = AttributeValue(att);
-  if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
-  {
-    var = (float) expr->RealValue();
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, double& var) const
-{
-  wxExpr *expr = AttributeValue(att);
-  if (expr && (expr->Type() == wxExprInteger || expr->Type() == wxExprReal))
-  {
-    var = expr->RealValue();
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, wxString& var)  const // Word OR string -> string
-{
-  wxExpr *expr = AttributeValue(att);
-  if (expr && expr->Type() == wxExprWord)
-  {
-    var = expr->WordValue();
-    return true;
-  }
-  else if (expr && expr->Type() == wxExprString)
-  {
-    var = expr->StringValue();
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValue(const wxString& att, wxExpr **var) const
-{
-  wxExpr *expr = AttributeValue(att);
-  if (expr)
-  {
-    *var = expr;
-    return true;
-  }
-  else
-    return false;
-}
-
-bool wxExpr::GetAttributeValueStringList(const wxString& att, wxList *var) const
-{
-  wxExpr *expr = AttributeValue(att);
-  if (expr && expr->Type() == wxExprList)
-  {
-    wxExpr *string_expr = expr->value.first;
-    while (string_expr)
-    {
-      if (string_expr->Type() == wxExprString)
-        var->Append((wxObject *)copystring(string_expr->StringValue()));
-
-      string_expr = string_expr->next;
-    }
-    return true;
-  }
-  else
-    return false;
-}
-
-// Compatibility
-void wxExpr::AssignAttributeValue(wxChar *att, wxChar **var) const
-{
-  wxString str;
-  if (GetAttributeValue(att, str))
-  {
-    if (*var)
-      delete[] *var;
-    *var = copystring((const wxChar *) str);
-  }
-}
-
-void wxExpr::WriteClause(FILE* stream)  // Write this expression as a top-level clause
-{
-  if (type != wxExprList)
-    return;
-
-  wxExpr *node = value.first;
-  if (node)
-  {
-    node->WriteExpr(stream);
-    fprintf( stream, "(" );
-    node = node->next;
-    bool first = true;
-    while (node)
-    {
-      if (!first)
-        fprintf( stream, "  " );
-      node->WriteExpr(stream);
-      node = node->next;
-      if (node)
-        fprintf( stream, ",\n" );
-      first = false;
-    }
-    fprintf( stream, ").\n\n" );
-  }
-}
-
-void wxExpr::WriteExpr(FILE* stream)    // Write as any other subexpression
-{
-  // This seems to get round an optimizer bug when
-  // using Watcom C++ 10a in WIN32 compilation mode.
-  // If these lines not present, the type seems to be
-  // interpreted wrongly as an integer.
-  // I don't want to turn optimization off since it's needed
-  // for reading in files quickly.
-#if defined(__WATCOMC__)
-  char buf[2];
-  sprintf(buf, "");
-#endif
-
-  switch (type)
-  {
-    case wxExprInteger:
-    {
-      fprintf( stream, "%ld", value.integer );
-      break;
-    }
-    case wxExprReal:
-    {
-      double f = value.real;
-      fprintf( stream, "%.6g", f);
-      break;
-    }
-    case wxExprString:
-    {
-      fprintf( stream, "\"" );
-      size_t i;
-      const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.string);
-      size_t len = strlen(val);
-      for (i = 0; i < len; i++)
-      {
-        char ch = val[i];
-        if (ch == '"' || ch == '\\')
-        fprintf( stream, "\\" );
-        char tmp[2];
-        tmp[0] = ch;
-        tmp[1] = 0;
-        fprintf( stream, tmp );
-      }
-      fprintf( stream, "\"" );
-      break;
-    }
-    case wxExprWord:
-    {
-      bool quote_it = false;
-      const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.word);
-      size_t len = strlen(val);
-      if ((len == 0) || (len > 0 && (val[(size_t) 0] > 64 && val[(size_t) 0] < 91)))
-        quote_it = true;
-      else
-      {
-        size_t i;
-        for (i = 0; i < len; i++)
-          if ((!isalpha(val[i])) && (!isdigit(val[i])) &&
-              (val[i] != '_'))
-            { quote_it = true; i = len; }
-      }
-
-      if (quote_it)
-        fprintf( stream ,"'" );
-
-      fprintf( stream, val );
-
-      if (quote_it)
-        fprintf( stream, "'" );
-
-      break;
-    }
-    case wxExprList:
-    {
-      if (!value.first)
-        fprintf( stream, "[]" );
-      else
-      {
-        wxExpr *expr = value.first;
-
-        if ((expr->Type() == wxExprWord) && (wxStrcmp(expr->WordValue(), wxT("=")) == 0))
-        {
-          wxExpr *arg1 = expr->next;
-          wxExpr *arg2 = arg1->next;
-          arg1->WriteExpr(stream);
-          fprintf( stream, " = " );
-          arg2->WriteExpr(stream);
-        }
-        else
-        {
-          fprintf( stream, "[" );
-          while (expr)
-          {
-            expr->WriteExpr(stream);
-            expr = expr->next;
-            if (expr)
-              fprintf( stream, ", " );
-          }
-          fprintf( stream, "]" );
-        }
-      }
-      break;
-    }
-   case wxExprNull: break;
-  }
-}
-
-/*
- * wxExpr 'database' (list of expressions)
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
-
-wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
-{
-  position = NULL;
-  hash_table = NULL;
-  currentwxExprErrorHandler = handler;
-  noErrors = 0;
-}
-
-wxExprDatabase::wxExprDatabase(wxExprType type, const wxString& attribute, int size,
-                               wxExprErrorHandler handler)
-{
-  position = NULL;
-  attribute_to_hash = attribute;
-  if (type == wxExprString)
-    hash_table = new wxHashTable(wxKEY_STRING, size);
-  else if (type == wxExprInteger)
-    hash_table = new wxHashTable(wxKEY_INTEGER, size);
-  else hash_table = NULL;
-
-  currentwxExprErrorHandler = handler;
-  noErrors = 0;
-}
-
-wxExprDatabase::~wxExprDatabase(void)
-{
-  ClearDatabase();
-  if (hash_table)
-    delete hash_table;
-}
-
-void wxExprDatabase::BeginFind(void)          // Initialise a search
-{
-  position = GetFirst();
-}
-
-wxExpr *wxExprDatabase::FindClause(long id)  // Find a term based on an integer id attribute
-                                 // e.g. node(id=23, type=rectangle, ....).
-{
-  wxExpr *found = NULL;
-  while (position && !found)
-  {
-    wxExpr *term = (wxExpr *)position->GetData();
-
-    if (term->Type() == wxExprList)
-    {
-      wxExpr *value = term->AttributeValue(wxT("id"));
-      if (value->Type() == wxExprInteger && value->IntegerValue() == id)
-        found = term;
-    }
-    position = position->GetNext();
-  }
-  return found;
-}
-
-// Find on basis of attribute/value pairs, e.g. type=rectangle
-wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val)
-{
-  wxExpr *found = NULL;
-  while (position && !found)
-  {
-    wxExpr *term = (wxExpr *)position->GetData();
-
-    if (term->Type() == wxExprList)
-    {
-      wxExpr *value = term->AttributeValue(word);
-      if ((value->Type() == wxExprWord && value->WordValue() == val) ||
-          (value->Type() == wxExprString && value->StringValue() == val))
-        found = term;
-    }
-    position = position->GetNext();
-  }
-  return found;
-}
-
-wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
-{
-  wxExpr *found = NULL;
-  while (position && !found)
-  {
-    wxExpr *term = (wxExpr *)position->GetData();
-
-    if (term->Type() == wxExprList)
-    {
-      wxExpr *value = term->AttributeValue(word);
-      if ((value->Type() == wxExprInteger) && (value->IntegerValue() == val))
-        found = term;
-    }
-    position = position->GetNext();
-  }
-  return found;
-}
-
-wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
-{
-  wxExpr *found = NULL;
-  while (position && !found)
-  {
-    wxExpr *term = (wxExpr *)position->GetData();
-
-    if (term->Type() == wxExprList)
-    {
-      wxExpr *value = term->AttributeValue(word);
-      if ((value->Type() == wxExprReal) && (value->RealValue() == val))
-        found = term;
-    }
-    position = position->GetNext();
-  }
-  return found;
-}
-
-wxExpr *wxExprDatabase::FindClauseByFunctor(const wxString& functor)
-{
-  wxExpr *found = NULL;
-  while (position && !found)
-  {
-    wxExpr *term = (wxExpr *)position->GetData();
-
-    if (term->Type() == wxExprList)
-    {
-      if (term->Functor() == functor)
-        found = term;
-    }
-    position = position->GetNext();
-  }
-  return found;
-}
-
-// If hashing is on, must store in hash table too
-void wxExprDatabase::Append(wxExpr *clause)
-{
-  wxList::Append((wxObject *)clause);
-  if (hash_table)
-  {
-    wxString functor(clause->Functor());
-    wxExpr *expr = clause->AttributeValue(attribute_to_hash);
-    if (expr)
-    {
-      long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);
-      long value_key;
-      if (expr && expr->Type() == wxExprString)
-      {
-        value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());
-        hash_table->Put(functor_key + value_key, WXSTRINGCAST expr->StringValue(), (wxObject *)clause);
-      }
-      else if (expr && expr->Type() == wxExprInteger)
-      {
-        value_key = expr->IntegerValue();
-        hash_table->Put(functor_key + value_key, expr->IntegerValue(), (wxObject *)clause);
-      }
-
-    }
-  }
-}
-
-wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
-{
-  long key = hash_table->MakeKey(WXSTRINGCAST functor) + value;
-
-  // The key alone isn't guaranteed to be unique:
-  // must supply value too. Let's assume the value of the
-  // id is going to be reasonably unique.
-  return (wxExpr *)hash_table->Get(key, value);
-}
-
-wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) const
-{
-  long key = hash_table->MakeKey(WXSTRINGCAST functor) + hash_table->MakeKey(WXSTRINGCAST value);
-  return (wxExpr *)hash_table->Get(key, WXSTRINGCAST value);
-}
-
-void wxExprDatabase::ClearDatabase(void)
-{
-  noErrors = 0;
-  wxNode *node = GetFirst();
-  while (node)
-  {
-    wxExpr *expr = (wxExpr *)node->GetData();
-    delete expr;
-    delete node;
-    node = GetFirst();
-  }
-
-  if (hash_table)
-    hash_table->Clear();
-}
-
-bool wxExprDatabase::Read(const wxString& filename)
-{
-  noErrors = 0;
-
-  FILE *f = wxFopen(filename, _T("r"));
-  if (f)
-  {
-    thewxExprDatabase = this;
-
-    LexFromFile(f);
-    yyparse();
-    fclose(f);
-
-    wxExprCleanUp();
-    return (noErrors == 0);
-  }
-  else
-  {
-    return false;
-  }
-}
-
-bool wxExprDatabase::ReadFromString(const wxString& buffer)
-{
-  noErrors = 0;
-  thewxExprDatabase = this;
-
-  const wxWX2MBbuf buf = buffer.mb_str();
-  LexFromString(wxMBSTRINGCAST buf);
-  yyparse();
-  wxExprCleanUp();
-  return (noErrors == 0);
-}
-
-bool wxExprDatabase::Write(const wxString& fileName)
-{
-  FILE *stream = wxFopen( fileName, _T("w+"));
-
-  if (!stream)
-    return false;
-
-  bool success = Write(stream);
-  fclose(stream);
-  return success;
-}
-
-bool wxExprDatabase::Write(FILE *stream)
-{
-  noErrors = 0;
-  wxNode *node = GetFirst();
-  while (node)
-  {
-    wxExpr *expr = (wxExpr *)node->GetData();
-    expr->WriteClause(stream);
-    node = node->GetNext();
-  }
-  return (noErrors == 0);
-}
-
-void add_expr(wxExpr * expr)
-{
-  thewxExprDatabase->Append(expr);
-}
-
-// Checks functor
-bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
-{
-  if (expr && (expr->Type() == wxExprList))
-  {
-    wxExpr *first_expr = expr->value.first;
-
-    if (first_expr && (first_expr->Type() == wxExprWord) &&
-       (first_expr->WordValue() == functor))
-      return true;
-    else
-      return false;
-  }
-  else
-    return false;
-}
-
-/*
- * Called from parser
- *
- */
-
-char *wxmake_integer(char *str)
-{
-  wxExpr *x = new wxExpr(atol(str));
-
-  return (char *)x;
-}
-
-char *wxmake_real(char *str1, char *str2)
-{
-  char buf[50];
-
-  sprintf(buf, "%s.%s", str1, str2);
-  double f = (double)atof(buf);
-  wxExpr *x = new wxExpr(f);
-
-  return (char *)x;
-}
-
-// extern "C" double exp10(double);
-
-char *wxmake_exp(char *str1, char *str2)
-{
-  double mantissa = (double)atoi(str1);
-  double exponent = (double)atoi(str2);
-
-  double d = mantissa * pow(10.0, exponent);
-
-  wxExpr *x = new wxExpr(d);
-
-  return (char *)x;
-}
-
-char *wxmake_exp2(char *str1, char *str2, char *str3)
-{
-  char buf[50];
-
-  sprintf(buf, "%s.%s", str1, str2);
-  double mantissa = (double)atof(buf);
-  double exponent = (double)atoi(str3);
-
-  double d = mantissa * pow(10.0, exponent);
-
-  wxExpr *x = new wxExpr(d);
-
-  return (char *)x;
-}
-
-char *wxmake_word(char *str)
-{
-  wxExpr *x = new wxExpr(wxExprWord, wxString(str, wxConvLibc).c_str());
-  return (char *)x;
-}
-
-char *wxmake_string(char *str)
-{
-  wxChar *s, *t;
-  size_t len, i;
-  const wxMB2WXbuf sbuf = wxConvLibc.cMB2WX(str);
-
-//  str++;                    /* skip leading quote */
-  len = wxStrlen(sbuf) - 1;   /* ignore trailing quote */
-
-  s = new wxChar[len + 1];
-
-  t = s;
-  for(i=1; i<len; i++) // 1 since we want to skip leading quote
-  {
-    if (sbuf[i] == wxT('\\') && sbuf[i+1] == wxT('"'))
-    {
-      *t++ = wxT('"');
-      i ++;
-    }
-    else if (sbuf[i] == wxT('\\') && sbuf[i+1] == wxT('\\'))
-    {
-      *t++ = wxT('\\');
-      i ++;
-    }
-    else
-      *t++ = sbuf[i];
-  }
-
-  *t = wxT('\0');
-
-  wxExpr *x = new wxExpr(wxExprString, s, false);
-  return (char *)x;
-}
-
-char *proio_cons(char * ccar, char * ccdr)
-{
-  wxExpr *car = (wxExpr *)ccar;
-  wxExpr *cdr = (wxExpr *)ccdr;
-
-  if (cdr == NULL)
-  {
-    cdr = new wxExpr(wxExprList);
-  }
-  if (car)
-    cdr->Insert(car);
-  return (char *)cdr;
-}
-
-void process_command(char * cexpr)
-{
-  wxExpr *expr = (wxExpr *)cexpr;
-  add_expr(expr);
-}
-
-void syntax_error(char *WXUNUSED(s))
-{
-  if (currentwxExprErrorHandler)
-    (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, (char *)"syntax error");
-  if (thewxExprDatabase) thewxExprDatabase->noErrors += 1;
-}
-
-#if 0
-#ifdef _WINDLL
-// char *__cdecl strdup(const char *s)
-WXDLLEXPORT char *strdup(const char *s)
-{
-  int len = strlen(s);
-  char *new_s = (char *)malloc(sizeof(char)*(len+1));
-  strcpy(new_s, s);
-  return new_s;
-}
-#endif
-#endif
-
-#endif
-  // wxUSE_PROLOGIO
diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in
deleted file mode 100644
index 43315bbf52..0000000000
--- a/contrib/src/fl/Makefile.in
+++ /dev/null
@@ -1,418 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \
-	$(CPPFLAGS) $(CXXFLAGS)
-FLDLL_OBJECTS =  \
-	$(__fldll___win32rc) \
-	fldll_antiflickpl.o \
-	fldll_bardragpl.o \
-	fldll_barhintspl.o \
-	fldll_cbcustom.o \
-	fldll_controlbar.o \
-	fldll_dyntbar.o \
-	fldll_dyntbarhnd.o \
-	fldll_frmview.o \
-	fldll_garbagec.o \
-	fldll_gcupdatesmgr.o \
-	fldll_hintanimpl.o \
-	fldll_newbmpbtn.o \
-	fldll_panedrawpl.o \
-	fldll_rowdragpl.o \
-	fldll_rowlayoutpl.o \
-	fldll_toolwnd.o \
-	fldll_updatesmgr.o
-FLDLL_ODEP =  $(___pch_wxprec_fldll_wx_wxprec_h_gch___depname)
-FLLIB_CXXFLAGS = $(__fllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-FLLIB_OBJECTS =  \
-	fllib_antiflickpl.o \
-	fllib_bardragpl.o \
-	fllib_barhintspl.o \
-	fllib_cbcustom.o \
-	fllib_controlbar.o \
-	fllib_dyntbar.o \
-	fllib_dyntbarhnd.o \
-	fllib_frmview.o \
-	fllib_garbagec.o \
-	fllib_gcupdatesmgr.o \
-	fllib_hintanimpl.o \
-	fllib_newbmpbtn.o \
-	fllib_panedrawpl.o \
-	fllib_rowdragpl.o \
-	fllib_rowlayoutpl.o \
-	fllib_toolwnd.o \
-	fllib_updatesmgr.o
-FLLIB_ODEP =  $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___fldll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___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_fldll___depname = install_fldll
-@COND_SHARED_1@__uninstall_fldll___depname = uninstall_fldll
-COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___fldll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__fldll___importlib = $(COND_PLATFORM_OS2_1___fldll___importlib)
-COND_WINDOWS_IMPLIB_1___fldll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__fldll___importlib = $(COND_WINDOWS_IMPLIB_1___fldll___importlib)
-@COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll
-@COND_ICC_PCH_1@__fldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_fldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_fldll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___fldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__fldll___soname_flags = $(COND_USE_SOVERLINUX_1___fldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___fldll___soname_flags)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_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___fllib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
-@COND_SHARED_0@__install_fllib___depname = install_fllib
-@COND_SHARED_0@__uninstall_fllib___depname = uninstall_fllib
-@COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
-@COND_ICC_PCH_1@__fllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_fllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_fllib/wx/wxprec.h.gch
-@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: $(__fldll___depname) $(__fllib___depname)
-
-install: all $(__install_fldll___depname) $(__install_fllib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.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_fldll___depname) $(__uninstall_fllib___depname)
-	for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___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@	$(__fldll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_fldll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_fldll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(FLLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_fllib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_fllib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
-
-fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
-	$(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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/antiflickpl.cpp
-
-fldll_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/bardragpl.cpp
-
-fldll_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/barhintspl.cpp
-
-fldll_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/cbcustom.cpp
-
-fldll_controlbar.o: $(srcdir)/controlbar.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/controlbar.cpp
-
-fldll_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbar.cpp
-
-fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
-
-fldll_frmview.o: $(srcdir)/frmview.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/frmview.cpp
-
-fldll_garbagec.o: $(srcdir)/garbagec.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/garbagec.cpp
-
-fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
-
-fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/hintanimpl.cpp
-
-fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
-
-fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/panedrawpl.cpp
-
-fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowdragpl.cpp
-
-fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
-
-fldll_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/toolwnd.cpp
-
-fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLDLL_ODEP)
-	$(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/updatesmgr.cpp
-
-fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/antiflickpl.cpp
-
-fllib_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/bardragpl.cpp
-
-fllib_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/barhintspl.cpp
-
-fllib_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/cbcustom.cpp
-
-fllib_controlbar.o: $(srcdir)/controlbar.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/controlbar.cpp
-
-fllib_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbar.cpp
-
-fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
-
-fllib_frmview.o: $(srcdir)/frmview.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/frmview.cpp
-
-fllib_garbagec.o: $(srcdir)/garbagec.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/garbagec.cpp
-
-fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
-
-fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/hintanimpl.cpp
-
-fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
-
-fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/panedrawpl.cpp
-
-fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowdragpl.cpp
-
-fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
-
-fllib_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/toolwnd.cpp
-
-fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLLIB_ODEP)
-	$(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/updatesmgr.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_fldll uninstall_fldll install_fllib uninstall_fllib
diff --git a/contrib/src/fl/antiflickpl.cpp b/contrib/src/fl/antiflickpl.cpp
deleted file mode 100644
index 5b15365040..0000000000
--- a/contrib/src/fl/antiflickpl.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        antiflickpl.cpp
-// Purpose:     Double-buffering plugin class for reducing flickering.
-// Author:      Aleksandras Gluchovas (@Lithuania)
-// Modified by:
-// Created:     23/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/antiflickpl.h"
-
-/***** Implementation for class cbAntiflickerPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbAntiflickerPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbAntiflickerPlugin, cbPluginBase )
-
-    EVT_PL_START_DRAW_IN_AREA  ( cbAntiflickerPlugin::OnStartDrawInArea  )
-    EVT_PL_FINISH_DRAW_IN_AREA ( cbAntiflickerPlugin::OnFinishDrawInArea )
-
-END_EVENT_TABLE()
-
-// initialization of static members
-
-int cbAntiflickerPlugin::mRefCount    = 0;
-
-wxBitmap*   cbAntiflickerPlugin::mpVertBuf    = 0;
-wxBitmap*   cbAntiflickerPlugin::mpHorizBuf   = 0;
-wxMemoryDC* cbAntiflickerPlugin::mpVertBufDc  = 0;
-wxMemoryDC* cbAntiflickerPlugin::mpHorizBufDc = 0;
-
-// constructors
-
-cbAntiflickerPlugin::cbAntiflickerPlugin(void)
-    : mpLRUBufDc  ( NULL ),
-      mLRUArea    ( -1,-1, -1,-1 )
-{
-    ++mRefCount;
-}
-
-cbAntiflickerPlugin::cbAntiflickerPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask ),
-      mpLRUBufDc  ( NULL ),
-      mLRUArea    ( -1,-1, -1,-1 )
-{
-    ++mRefCount;
-}
-
-cbAntiflickerPlugin::~cbAntiflickerPlugin()
-{
-    if ( --mRefCount == 0 )
-    {
-        if ( mpHorizBuf )
-        {
-            mpHorizBufDc->SelectObject( wxNullBitmap );
-            delete mpHorizBuf;
-            delete mpHorizBufDc;
-            mpHorizBuf   = 0;
-            mpHorizBufDc = 0;
-        }
-
-        if ( mpVertBuf ) 
-        {
-            mpVertBufDc->SelectObject( wxNullBitmap );
-            delete mpVertBuf; 
-            delete mpVertBufDc;
-            mpVertBuf   = 0;
-            mpVertBufDc = 0;
-        }
-    }
-}
-
-wxDC* cbAntiflickerPlugin::FindSuitableBuffer( const wxRect& forArea )
-{
-    if ( mpVertBuf )
-    {
-        if ( mpVertBuf->GetHeight() >= forArea.height &&
-             mpVertBuf->GetWidth()  >= forArea.width )
-            return mpVertBufDc;
-    }
-    else
-        if ( mpHorizBuf )
-        {
-            if ( mpHorizBuf->GetHeight() >= forArea.height &&
-                 mpHorizBuf->GetWidth()  >= forArea.width )
-                return mpHorizBufDc;
-        }
-
-    return 0;
-}
-
-wxDC* cbAntiflickerPlugin::AllocNewBuffer( const wxRect& forArea )
-{
-    // TBD:: preallocate bit larger bitmap at once, to avoid
-    //       excessive realocations later
-
-    // check whether the given area is oriented horizontally
-    // or vertically and choose corresponding bitmap to create or
-    // recreate
-
-    if ( forArea.height > forArea.width )
-    {
-        wxSize prevDim( 0,0 );
-
-        if ( mpVertBuf ) 
-        {
-            prevDim.x = mpVertBuf->GetWidth();
-            prevDim.y = mpVertBuf->GetHeight();
-
-            mpVertBufDc->SelectObject( wxNullBitmap );
-            delete mpVertBuf;
-        }
-        else
-            mpVertBufDc = new wxMemoryDC();
-
-        mpVertBuf = new wxBitmap( int( wxMax(forArea.width,  prevDim.x ) ), 
-                                  int( wxMax(forArea.height, prevDim.y ) )
-                                );
-
-        mpVertBufDc->SelectObject( *mpVertBuf );
-
-        return mpVertBufDc;
-    }
-    else
-    {
-        wxSize prevDim( 0,0 );
-
-        if ( mpHorizBuf ) 
-        {
-            prevDim.x = mpHorizBuf->GetWidth();
-            prevDim.y = mpHorizBuf->GetHeight();
-
-            mpHorizBufDc->SelectObject( wxNullBitmap );
-            delete mpHorizBuf;
-        }
-        else
-            mpHorizBufDc = new wxMemoryDC();
-
-        mpHorizBuf = new wxBitmap( int( wxMax(forArea.width,  prevDim.x ) ), 
-                                   int( wxMax(forArea.height, prevDim.y ) )
-                                 );
-
-        mpHorizBufDc->SelectObject( *mpHorizBuf );
-
-        return mpHorizBufDc;
-    }
-}
-
-void cbAntiflickerPlugin::OnStartDrawInArea( cbStartDrawInAreaEvent& event )
-{
-    wxASSERT( mpLRUBufDc == NULL ); // DBG:: see comments in OnFinishDrawInArea(..) method
-
-    // short-cut
-    wxRect& area = event.mArea;
-
-    if ( event.mArea.width  < 0 || 
-         event.mArea.height < 0 ) return;
-
-    // memorize given area
-    mLRUArea.x      = area.x;
-    mLRUArea.y      = area.y;
-    mLRUArea.width  = area.width;
-    mLRUArea.height = area.height;
-
-    wxDC* pBufDc = FindSuitableBuffer( area );
-
-    if ( !pBufDc )
-        pBufDc = AllocNewBuffer( area );
-
-    pBufDc->SetDeviceOrigin( -area.x, -area.y );
-
-    pBufDc->SetClippingRegion( area.x,     area.y,
-                               area.width, area.height );
-
-    wxClientDC clntDc( &mpLayout->GetParentFrame() );
-
-    (*event.mppDc) = pBufDc;
-
-    mpLRUBufDc = pBufDc; // memorize buffer, which will be flushed to screen
-                         // upon "commiting" the drawing
-
-    /*
-    // OLD STUFF::
-    mpLRUBufDc->Blit( pos.x, pos.y, size.x, size.y,
-                      &clntDc, pos.x, pos.y, wxCOPY );
-                    */
-}
-
-void cbAntiflickerPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& event )
-{
-    wxRect& area = event.mArea;
-
-    if ( event.mArea.width  < 0 || 
-         event.mArea.height < 0 ) return;
-
-    wxASSERT( mpLRUBufDc ); // DBG:: OnStartDrawInArea should be called first
-
-    // FOR NOW:: OnStartDrawInArea(..) should be immediately followed
-    //           by OnFinishDrawInArea(..) for the same area
-
-    wxASSERT( mLRUArea.x      == area.x      );
-    wxASSERT( mLRUArea.y      == area.y      );
-    wxASSERT( mLRUArea.width  == area.width  );
-    wxASSERT( mLRUArea.height == area.height );
-
-    wxClientDC clntDc( &mpLayout->GetParentFrame() );
-
-    // "commit" drawings in one-shot
-    clntDc.Blit( area.x, area.y, area.width, area.height,
-                 mpLRUBufDc, area.x, area.y, wxCOPY );
-
-    mpLRUBufDc->DestroyClippingRegion();
-    mpLRUBufDc = 0;
-}
-
diff --git a/contrib/src/fl/bardragpl.cpp b/contrib/src/fl/bardragpl.cpp
deleted file mode 100644
index 3139bf3b1c..0000000000
--- a/contrib/src/fl/bardragpl.cpp
+++ /dev/null
@@ -1,934 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bardragpl.cpp
-// Purpose:     cbBarDragPlugin implementation
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     23/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/bardragpl.h"
-
-#define POS_UNDEFINED -32768
-
-// helpers, FOR NOW:: static
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
-    if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
-         ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-        if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
-             ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-            return true;
-    return false;
-}
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
-    return ( x >= rect.x &&
-             y >= rect.y &&
-             x <  rect.x + rect.width  &&
-             y <  rect.y + rect.height );
-}
-
-/***** Implementation for class cbBarDragPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarDragPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbBarDragPlugin, cbPluginBase )
-
-    //EVT_PL_LEFT_DOWN        ( cbBarDragPlugin::OnLButtonDown      )
-    EVT_PL_LEFT_UP            ( cbBarDragPlugin::OnLButtonUp        )
-    EVT_PL_MOTION             ( cbBarDragPlugin::OnMouseMove        )
-    EVT_PL_DRAW_HINT_RECT     ( cbBarDragPlugin::OnDrawHintRect     )
-    EVT_PL_START_BAR_DRAGGING ( cbBarDragPlugin::OnStartBarDragging )
-    EVT_PL_LEFT_DCLICK        ( cbBarDragPlugin::OnLDblClick        )
-
-END_EVENT_TABLE()
-
-cbBarDragPlugin::cbBarDragPlugin(void)
-
-    : mBarDragStarted    ( false ),
-      mCanStick          ( true ),
-      mpScrDc            ( NULL ),
-      mpCurCursor        ( NULL ),
-      mpDraggedBar       ( NULL ),
-      mInClientHintBorder( 4 )
-{}
-
-cbBarDragPlugin::cbBarDragPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask ),
-
-      mBarDragStarted    ( false ),
-      mCanStick          ( true ),
-      mpScrDc            ( NULL ),
-      mpCurCursor        ( NULL ),
-      mpDraggedBar       ( NULL ),
-      mInClientHintBorder( 4 )
-{}
-
-cbBarDragPlugin::~cbBarDragPlugin()
-{
-    // nothing
-}
-
-// helper methods (protected)
-
-// clips (top/bottom) or (right/left) edges against the frame's bounding rect.
-
-void do_clip_edges( int len, int& rectPos, int& rectLen )
-{
-    if ( rectPos < 0 )
-    {
-        rectLen += rectPos;
-        rectPos = 0;
-        if ( rectLen < 0 )
-            rectLen = 1;
-    }
-    else
-        if ( rectPos > len-1 )
-        {
-            rectPos = len-1;
-            rectLen = 1;
-        }
-        else
-            if ( rectPos + rectLen - 1 > len )
-                 rectLen -= (rectPos + rectLen) - len + 1;
-}
-
-void cbBarDragPlugin::ClipRectInFrame( wxRect& rect )
-{
-    int w, h;
-    mpLayout->GetParentFrame().GetClientSize( &w, &h );
-
-    do_clip_edges( w, rect.x, rect.width  );
-    do_clip_edges( h, rect.y, rect.height );
-}
-
-void cbBarDragPlugin::ClipPosInFrame( wxPoint& pos )
-{
-    int w, h;
-    mpLayout->GetParentFrame().GetClientSize( &w, &h );
-
-    if ( pos.x < 0 )
-        pos.x = 0;
-    if ( pos.y < 0 )
-        pos.y = 0;
-    if ( pos.x > w )
-        pos.x = w-1;
-    if ( pos.y > h )
-        pos.y = h-1;
-}
-
-void cbBarDragPlugin::AdjustHintRect( wxPoint& mousePos )
-{
-    mHintRect.x = mousePos.x - mMouseInRectX;
-    mHintRect.y = mousePos.y - mMouseInRectY;
-}
-
-cbDockPane* cbBarDragPlugin::HitTestPanes( wxRect& rect )
-{
-    //wxRect clipped = rect;
-
-    //ClipRectInFrame( clipped );
-
-    cbDockPane** pPanes = mpLayout->GetPanesArray();
-
-    for( int i = 0; i != MAX_PANES; ++i )
-        if ( rect_hits_rect( pPanes[i]->mBoundsInParent, rect ) )
-            return pPanes[i];
-
-    return NULL;
-}
-
-cbDockPane* cbBarDragPlugin::HitTestPanes( wxPoint& pos )
-{
-    wxPoint clipped = pos;
-
-    //ClipPosInFrame( pos );
-
-    cbDockPane** pPanes = mpLayout->GetPanesArray();
-
-    for( int i = 0; i != MAX_PANES; ++i )
-        if ( rect_contains_point( pPanes[i]->mBoundsInParent, clipped.x, clipped.y ) )
-            return pPanes[i];
-
-    return NULL;
-}
-
-bool cbBarDragPlugin::HitsPane( cbDockPane* pPane, wxRect& rect )
-{
-    return rect_hits_rect( pPane->mBoundsInParent, rect );
-}
-
-int cbBarDragPlugin::GetDistanceToPane( cbDockPane* pPane, wxPoint& mousePos )
-{
-    wxRect& bounds = pPane->mBoundsInParent;
-
-    switch( pPane->mAlignment )
-    {
-        case FL_ALIGN_TOP    : return mousePos.y - ( bounds.y + bounds.height );
-        case FL_ALIGN_BOTTOM : return bounds.y - mousePos.y;
-        case FL_ALIGN_LEFT   : return mousePos.x - ( bounds.x + bounds.width  );
-        case FL_ALIGN_RIGHT  : return bounds.x - mousePos.x;
-        default : return 0; // never reached
-    }
-
-//    return 0;
-}
-
-bool cbBarDragPlugin::IsInOtherPane( wxPoint& mousePos )
-{
-    cbDockPane* pPane = HitTestPanes( mousePos );
-
-    if ( pPane && pPane != mpCurPane ) return true;
-    else return false;
-}
-
-bool cbBarDragPlugin::IsInClientArea( wxPoint& mousePos )
-{
-    return  ( HitTestPanes( mousePos ) == NULL );
-}
-
-bool cbBarDragPlugin::IsInClientArea( wxRect& rect )
-{
-    return ( HitTestPanes( rect ) == NULL );
-}
-
-void cbBarDragPlugin::CalcOnScreenDims( wxRect& rect )
-{
-    if ( !mpCurPane || mpDraggedBar->IsFixed() ) return;
-
-    wxRect inPane = rect;
-
-    mpCurPane->FrameToPane( &inPane );
-
-    int rowNo = mpCurPane->GetRowAt( inPane.y, inPane.y + inPane.height );
-
-    bool isMaximized = ( rowNo >= (int)mpCurPane->GetRowList().Count() || rowNo < 0 );
-
-    if ( isMaximized )
-    {
-        inPane.x = 0;
-        inPane.width = mpCurPane->mPaneWidth;
-
-        mpCurPane->PaneToFrame( &inPane );
-
-        rect = inPane;
-    }
-}
-
-// helpers
-
-static inline void check_upper_overrun( int& pos, int width, int mousePos )
-{
-    if ( mousePos >= pos + width )
-        pos = mousePos - width/2;
-}
-
-static inline void check_lower_overrun( int& pos, int width, int mousePos )
-{
-    if ( mousePos <= pos )
-        pos = mousePos - width/2;
-}
-
-void cbBarDragPlugin::StickToPane( cbDockPane* pPane, wxPoint& mousePos )
-{
-    int wInPane = GetBarWidthInPane ( pPane );
-    int hInPane = GetBarHeightInPane( pPane );
-
-    // adjsut hint-rect horizontally (in pane's orientation)
-
-    if ( pPane->IsHorizontal() )
-    {
-        mHintRect.width  = wInPane;
-        mHintRect.height = hInPane;
-    }
-    else
-    {
-        mHintRect.height = wInPane;
-        mHintRect.width  = hInPane;
-    }
-
-    // adjsut hint-rect vertically (in pane's orientation)
-
-    wxRect& bounds = pPane->mBoundsInParent;
-
-    // true, if hint enters the pane through it's lower edge
-
-    bool fromLowerEdge = ( pPane->IsHorizontal() )
-                           ? mousePos.y > bounds.y
-                           : mousePos.x > bounds.x;
-
-    // NOTE:: about all the below min/max things: they are meant to ensure
-    //        that the mouse pointer doesn't overrun (leave) the hint-rectangle
-    //        when its dimensions are recalculated upon sticking it to the pane
-
-    if ( pPane->IsHorizontal() && fromLowerEdge )
-    {
-        int paneBottomEdgeY = bounds.y + bounds.height;
-
-        mHintRect.y = wxMin( paneBottomEdgeY, mousePos.y );
-
-        check_lower_overrun( mHintRect.y, hInPane, mousePos.y );
-
-    }
-    else
-        if ( pPane->IsHorizontal() && !fromLowerEdge )
-        {
-            int paneTopEdgeY = bounds.y;
-
-            mHintRect.y = wxMax( paneTopEdgeY - hInPane, mousePos.y - hInPane );
-
-            check_upper_overrun( mHintRect.y, hInPane, mousePos.y );
-        }
-        else
-            if ( !pPane->IsHorizontal() && fromLowerEdge )
-            {
-                int paneRightEdgeX = bounds.x + bounds.width;
-
-                mHintRect.x = wxMin( paneRightEdgeX, mousePos.x );
-
-                check_lower_overrun( mHintRect.x, hInPane, mousePos.x );
-            }
-            else
-                if ( !pPane->IsHorizontal() && !fromLowerEdge )
-                {
-                    int paneLeftEdgeX = bounds.x;
-
-                    mHintRect.x = wxMax( paneLeftEdgeX - hInPane, mousePos.x - hInPane );
-
-                    check_upper_overrun( mHintRect.x, hInPane, mousePos.x );
-                }
-
-    mMouseInRectX = mousePos.x - mHintRect.x;
-    mMouseInRectY = mousePos.y - mHintRect.y;
-
-    mpCurPane = pPane; // memorize pane to which the hint is currently sticked
-}
-
-void cbBarDragPlugin::UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos )
-{
-    // unsticking causes rectangle to get the shape in which
-    // dragged control-bar would be when floated
-
-    int newWidth  = mpDraggedBar->mDimInfo.mSizes[wxCBAR_FLOATING].x;
-    int newHeight = mpDraggedBar->mDimInfo.mSizes[wxCBAR_FLOATING].y;
-
-    wxRect& flBounds = mpDraggedBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
-    if ( flBounds.width != -1 )
-    {
-        newWidth  = flBounds.width;
-        newHeight = flBounds.height;
-    }
-
-    mHintRect.width  = newWidth;
-    mHintRect.height = newHeight;
-
-    wxRect& bounds = pPane->mBoundsInParent;
-
-    // true, if hint leaves the pane through it's lower edge
-
-    bool fromLowerEdge = ( pPane->IsHorizontal() )
-                           ? mousePos.y > bounds.y
-                           : mousePos.x > bounds.x;
-
-    // NOTE:: ...all the below min/max things - see comments about it in StickToPane(..)
-
-    if ( pPane->IsHorizontal() && fromLowerEdge )
-    {
-        // bool fromLowerEdge = mousePos.y > bounds.y;
-
-        mHintRect.y = wxMax( bounds.y + bounds.height + 1, mousePos.y - newHeight );
-
-        check_upper_overrun( mHintRect.y, newHeight, mousePos.y );
-
-        // this is how MFC's hint behaves:
-
-        if ( mMouseInRectX > newWidth )
-            mHintRect.x = mousePos.x - ( newWidth / 2 );
-    }
-    else
-        if ( pPane->IsHorizontal() && !fromLowerEdge )
-        {
-            mHintRect.y = wxMin( bounds.y - newHeight - 1, mousePos.y );
-
-            // -/-
-
-            if ( mMouseInRectX > newWidth )
-                mHintRect.x = mousePos.x - ( newWidth / 2 );
-
-            check_lower_overrun( mHintRect.y, newHeight, mousePos.y );
-        }
-        else
-            if ( !pPane->IsHorizontal() && fromLowerEdge )
-            {
-                mHintRect.x = wxMax( bounds.x + bounds.width, mousePos.x - newWidth );
-
-                // -/-
-
-                if ( mMouseInRectY > newHeight )
-                    mHintRect.y = mousePos.y - ( newHeight / 2 );
-
-                check_upper_overrun( mHintRect.x, newWidth, mousePos.x );
-            }
-            else
-                if ( !pPane->IsHorizontal() && !fromLowerEdge )
-                {
-                    mHintRect.x = wxMin( bounds.x - newWidth - 1, mousePos.x );
-
-                    // -/-
-
-                    if ( mMouseInRectY > newHeight )
-                        mHintRect.y = mousePos.y - ( newHeight / 2 );
-
-                    check_lower_overrun( mHintRect.x, newWidth, mousePos.x );
-                }
-
-    mMouseInRectX = mousePos.x - mHintRect.x;
-    mMouseInRectY = mousePos.y - mHintRect.y;
-
-    mpCurPane = NULL;
-}
-
-int cbBarDragPlugin::GetBarWidthInPane( cbDockPane* pPane )
-{
-    if ( pPane == mpSrcPane )
-        return mBarWidthInSrcPane;
-
-    // this is how MFC's bars behave:
-
-    if ( pPane->IsHorizontal() )
-        return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_HORIZONTALLY].x;
-    else
-        return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_VERTICALLY  ].x;
-}
-
-int cbBarDragPlugin::GetBarHeightInPane( cbDockPane* pPane )
-{
-    if ( pPane->IsHorizontal() )
-        return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_HORIZONTALLY].y;
-    else
-        return mpDraggedBar->mDimInfo.mSizes[wxCBAR_DOCKED_VERTICALLY  ].y;
-}
-
-void cbBarDragPlugin::ShowHint( bool prevWasInClient )
-{
-    bool wasDocked = false;
-
-    if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false )
-    {
-        // do heavy calculations first
-
-        wxRect actualRect = mHintRect; // will be adjusted depending on drag-settings
-
-        if ( mpSrcPane->mProps.mExactDockPredictionOn && mpCurPane )
-        {
-#ifdef  __WXDEBUG__
-            bool success =
-#endif
-                           mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
-            wxASSERT( success ); // DBG::
-
-            actualRect = mpDraggedBar->mBounds;
-
-            mpCurPane->PaneToFrame( &actualRect );
-        }
-        else
-            CalcOnScreenDims( actualRect );
-
-        // release previous hint
-
-        if ( mPrevHintRect.x != POS_UNDEFINED )
-        {
-            // erase previous rectangle
-
-            cbDrawHintRectEvent evt( mPrevHintRect, prevWasInClient, true, false );
-
-            mpLayout->FirePluginEvent( evt );
-        }
-
-        // draw new hint
-
-        cbDrawHintRectEvent evt( actualRect, mpCurPane == NULL, false, false );
-
-        mpLayout->FirePluginEvent( evt );
-
-        mPrevHintRect = actualRect;
-    }
-    else
-    {
-        // otherwise, if real-time updates option is ON
-
-        if ( mpDraggedBar->mState != wxCBAR_FLOATING && !mpCurPane )
-        {
-            mpLayout->SetBarState( mpDraggedBar, wxCBAR_FLOATING, true );
-        }
-        else
-            if ( mpDraggedBar->mState == wxCBAR_FLOATING && mpCurPane )
-            {
-                mpLayout->SetBarState( mpDraggedBar, wxCBAR_DOCKED_HORIZONTALLY, false );
-
-                wasDocked = true;
-            }
-
-        if ( mpCurPane )
-        {
-            mpLayout->GetUpdatesManager().OnStartChanges();
-
-            if ( wasDocked )
-
-            mpDraggedBar->mUMgrData.SetDirty( true );
-
-#ifdef  __WXDEBUG__
-            bool success =
-#endif
-                           mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
-            wxASSERT( success ); // DBG ::
-
-            mpLayout->GetUpdatesManager().OnFinishChanges();
-            mpLayout->GetUpdatesManager().UpdateNow();
-        }
-        else
-        {
-            if ( mpLayout->mFloatingOn )
-            {
-                // move the top-most floated bar around as user drags the hint
-
-                mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mHintRect;
-
-                mpLayout->ApplyBarProperties( mpDraggedBar );
-            }
-        }
-    }
-}
-
-/*** event handlers ***/
-
-void cbBarDragPlugin::OnMouseMove( cbMotionEvent& event )
-{
-    // calculate postion in frame's coordiantes
-
-    if ( !mBarDragStarted )
-    {
-        event.Skip(); // pass event to the next plugin
-        return;
-    }
-
-    wxPoint mousePos = event.mPos;
-
-    event.mpPane->PaneToFrame( &mousePos.x, &mousePos.y );
-
-    bool   prevIsInClient = ( mpCurPane == 0 );
-
-    AdjustHintRect( mousePos );
-
-    // if the hint-rect is not "tempted" to any pane yet
-
-    if ( mpCurPane == NULL )
-    {
-        cbDockPane* pPane = HitTestPanes( mHintRect );
-
-        // enable sticking again, if we've left the pane completely
-        if ( !pPane )
-            mCanStick = true;
-
-        if ( mCanStick && pPane &&
-             GetDistanceToPane( pPane, mousePos ) < GetBarHeightInPane( pPane ) )
-            StickToPane( pPane, mousePos );
-        else
-            if ( pPane && HitTestPanes( mousePos ) == pPane && 0 ) // FOR NOW:: disabled
-
-        StickToPane( pPane, mousePos );
-    }
-    else
-    {
-        // otherwise, when rect is now sticked to some of the panes
-        // check if it should still remain in this pane
-
-        mCanStick = true;
-
-        bool mouseInOther = IsInOtherPane( mousePos );
-
-        if ( mouseInOther )
-        {
-            cbDockPane* pPane = HitTestPanes( mousePos );
-
-            StickToPane( pPane, mousePos );
-        }
-        else
-        {
-            if ( IsInClientArea( mousePos ) )
-            {
-                cbDockPane* pPane = HitTestPanes( mHintRect );
-
-                if ( pPane &&
-                     pPane != mpCurPane &&
-                     GetDistanceToPane( pPane, mousePos ) < GetBarHeightInPane( pPane ) )
-                    StickToPane( pPane, mousePos );
-                else
-                    if ( !pPane )
-                    {
-                        UnstickFromPane( mpCurPane, mousePos );
-
-                        // FOR NOW:: disabled, would cause some mess
-                        // mCanStick = false; // prevents from sticking to this
-                        // pane again, flag is reset when hint-rect
-                        // leaves the pane completely
-                    }
-                    else
-                        if ( GetDistanceToPane( pPane, mousePos ) > GetBarHeightInPane( pPane ) )
-                        {
-                            if ( !HitsPane( mpCurPane, mHintRect ) )
-                            {
-                                UnstickFromPane( mpCurPane, mousePos );
-
-                                // FOR NOW:: disabled, would cause some mess
-                                // mCanStick = false; // prevents from sticking to this
-                                // pane again, flag is reset when hint-rect
-                                // leaves the pane completely
-                            }
-                        }
-
-            }
-        }
-    }
-
-    ShowHint( prevIsInClient );
-
-    wxCursor* pPrevCurs = mpCurCursor;
-
-    if ( mpCurPane )
-    {
-        mpCurCursor = mpLayout->mpNormalCursor;
-    }
-    else
-    {
-        // if floating is off, and we are in the client
-        // area, the cursor will be invalid, otherwise
-        // it will be the normal cursor
-
-        if (mpLayout->mFloatingOn)
-        {
-            mpCurCursor = mpLayout->mpNormalCursor;
-        }
-        else
-        {
-            mpCurCursor = mpLayout->mpNECursor;
-        }
-
-    }
-    if ( pPrevCurs != mpCurCursor )
-        mpLayout->GetParentFrame().SetCursor( *mpCurCursor );
-}
-
-void cbBarDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
-{
-    if ( mBarDragStarted  )
-    {
-        wxMessageBox(wxT("DblClick!"));
-    }
-
-    event.Skip();
-}
-
-void cbBarDragPlugin::OnLButtonUp( cbLeftUpEvent& event )
-{
-    if ( mBarDragStarted  )
-    {
-        if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false )
-        {
-            // erase current rectangle, and finsih on-screen drawing session
-
-            cbDrawHintRectEvent evt( mPrevHintRect, mpCurPane == NULL, true, true );
-
-            mpLayout->FirePluginEvent( evt );
-
-            if ( mpCurPane != NULL )
-            {
-                if ( mpSrcPane->mProps.mExactDockPredictionOn )
-                {
-                    mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane, false );
-
-                    mpLayout->GetUpdatesManager().OnFinishChanges();
-                    mpLayout->GetUpdatesManager().UpdateNow();
-                }
-                else
-                {
-                    if (mpDraggedBar->mState == wxCBAR_FLOATING)
-                    {
-                        mpLayout->SetBarState( mpDraggedBar, wxCBAR_DOCKED_HORIZONTALLY, true);
-                    }
-
-                    mpLayout->RedockBar( mpDraggedBar, mHintRect, mpCurPane );
-                }
-            }
-            else
-            {
-                if (mpDraggedBar->mState != wxCBAR_FLOATING)
-                {
-                    mpLayout->SetBarState(mpDraggedBar, wxCBAR_FLOATING, true);
-                }
-
-                mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mHintRect;
-                mpLayout->ApplyBarProperties( mpDraggedBar );
-            }
-        }
-
-        mHintRect.width = -1;
-
-        // In Windows, at least, the frame needs to have a null cursor
-        // else child windows (such as text windows) inherit the cursor
-#if 1
-        mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
-        mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
-        mpLayout->ReleaseEventsFromPane( event.mpPane );
-        mpLayout->ReleaseEventsFromPlugin( this );
-
-        mBarDragStarted = false;
-
-        if ( mBarWasFloating && mpDraggedBar->mState != wxCBAR_FLOATING )
-        {
-            // save bar's floating position before it was docked
-
-            mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ] = mFloatedBarBounds;
-        }
-    }
-    else
-        event.Skip(); // pass event to the next plugin
-}
-
-void cbBarDragPlugin::OnLDblClick( cbLeftDClickEvent& event )
-{
-    int avoidCompilerWarning = 1;
-    if ( avoidCompilerWarning )
-    {
-        cbBarInfo* pHittedBar;
-        cbRowInfo* pRow;
-
-        if ( event.mpPane->HitTestPaneItems( event.mPos,   // in pane's coordiantes
-                                             &pRow,
-                                             &pHittedBar ) == CB_BAR_CONTENT_HITTED
-           )
-        {
-            mpLayout->SetBarState( pHittedBar, wxCBAR_FLOATING, true );
-
-            mpLayout->RepositionFloatedBar( pHittedBar );
-
-            return; // event is "eaten" by this plugin
-        }
-
-        mBarDragStarted = false;
-
-        event.Skip();
-    }
-
-    //wxMessageBox("Hi, dblclick arrived!");
-}
-
-void cbBarDragPlugin::OnStartBarDragging( cbStartBarDraggingEvent& event )
-{
-    mpDraggedBar = event.mpBar;
-    mpSrcPane    = event.mpPane;
-
-    mpLayout->CaptureEventsForPane( event.mpPane );
-    mpLayout->CaptureEventsForPlugin( this );
-
-    mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-
-    mBarDragStarted = true;
-
-    wxRect inParent = mpDraggedBar->mBounds;
-
-    mBarWasFloating = mpDraggedBar->mState == wxCBAR_FLOATING;
-
-    if ( mBarWasFloating )
-    {
-        inParent = mpDraggedBar->mDimInfo.mBounds[ wxCBAR_FLOATING ];
-        mFloatedBarBounds = inParent;
-    }
-    else
-        event.mpPane->PaneToFrame( &inParent );
-
-    mHintRect.x = POS_UNDEFINED;
-
-    mHintRect.width  = inParent.width;
-    mHintRect.height = inParent.height;
-
-    mMouseInRectX = event.mPos.x - inParent.x;
-    mMouseInRectY = event.mPos.y - inParent.y;
-
-    mpSrcPane = event.mpPane;
-
-    if ( mpDraggedBar->mState == wxCBAR_FLOATING )
-
-        mpCurPane = NULL;
-    else
-        mpCurPane = event.mpPane;
-
-    mPrevHintRect.x = POS_UNDEFINED;
-
-    mCanStick = false; // we're not stuck into any pane now -
-                       // there's nowhere to "stick-twice"
-
-    mBarWidthInSrcPane = mpDraggedBar->mDimInfo.mSizes[ mpDraggedBar->mState ].x;
-
-    if ( mpSrcPane->mProps.mRealTimeUpdatesOn == false &&
-         mpSrcPane->mProps.mExactDockPredictionOn  )
-        mpLayout->GetUpdatesManager().OnStartChanges(); // capture initial state of layout
-
-    // simulate the first mouse movement
-
-    int x = event.mPos.x, y = event.mPos.y;
-    mpSrcPane->FrameToPane( &x, &y );
-
-    wxPoint pt(x,y);
-    cbMotionEvent motionEvt( pt, event.mpPane );
-    this->OnMouseMove( motionEvt );
-
-    return; // event is "eaten" by this plugin
-}
-
-/*** on-screen hint-tracking related methods ***/
-
-void cbBarDragPlugin::OnDrawHintRect( cbDrawHintRectEvent& event )
-{
-    if ( !mpScrDc ) StartTracking();
-
-    DoDrawHintRect( event.mRect, event.mIsInClient );
-
-    if ( event.mLastTime )
-        FinishTracking();
-}
-
-#define _IMG_A  0xAA    // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B  0x00    // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C  0x55    // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D  0x00    // Note: modified from _D to _IMG_D, for consistency reasons.
-
-// FOR NOW:: static
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D
-                                              };
-
-void cbBarDragPlugin::StartTracking()
-{
-    mpScrDc = new wxScreenDC;
-
-    wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-}
-
-void cbBarDragPlugin::DoDrawHintRect( wxRect& rect, bool isInClientRect)
-{
-    wxRect scrRect;
-
-    RectToScr( rect, scrRect );
-
-    int prevLF = mpScrDc->GetLogicalFunction();
-
-    mpScrDc->SetLogicalFunction( wxINVERT );
-
-    if ( isInClientRect )
-    {
-        // BUG BUG BUG (wx):: somehow stippled brush works only
-        // when the bitmap created on stack, not
-        // as a member of the class
-
-        wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
-        wxBrush checkerBrush( checker );
-
-        mpScrDc->SetPen( mpLayout->mNullPen );
-        mpScrDc->SetBrush( checkerBrush );
-
-        int half = mInClientHintBorder / 2;
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y - half,
-                                scrRect.width + 2*half, mInClientHintBorder );
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + scrRect.height - half,
-                                scrRect.width + 2*half, mInClientHintBorder );
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + half - 1,
-                                mInClientHintBorder, scrRect.height - 2*half + 2);
-
-        mpScrDc->DrawRectangle( scrRect.x + scrRect.width - half,
-                                scrRect.y + half - 1,
-                                mInClientHintBorder, scrRect.height - 2*half + 2);
-
-        mpScrDc->SetBrush( wxNullBrush );
-    }
-    else
-    {
-        mpScrDc->SetPen( mpLayout->mBlackPen );
-
-        mpScrDc->DrawLine( scrRect.x, scrRect.y,
-                           scrRect.x + scrRect.width, scrRect.y );
-
-        mpScrDc->DrawLine( scrRect.x, scrRect.y + 1,
-                           scrRect.x, scrRect.y + scrRect.height );
-
-        mpScrDc->DrawLine( scrRect.x+1, scrRect.y + scrRect.height,
-                           scrRect.x + scrRect.width, scrRect.y + scrRect.height );
-
-        mpScrDc->DrawLine( scrRect.x + scrRect.width , scrRect.y,
-                           scrRect.x + scrRect.width, scrRect.y + scrRect.height + 1);
-    }
-
-    mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void cbBarDragPlugin::DrawHintRect ( wxRect& rect, bool isInClientRect)
-{
-    DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbBarDragPlugin::EraseHintRect( wxRect& rect, bool isInClientRect)
-{
-    DoDrawHintRect( rect, isInClientRect );
-}
-
-void cbBarDragPlugin::FinishTracking()
-{
-    wxScreenDC::EndDrawingOnTop();
-
-    delete mpScrDc;
-
-    mpScrDc = NULL;
-}
-
-void cbBarDragPlugin::RectToScr( wxRect& frameRect, wxRect& scrRect )
-{
-    scrRect = frameRect;
-
-    int x = frameRect.x, y = frameRect.y;
-
-    mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
-    scrRect.x = x;
-    scrRect.y = y;
-}
-
diff --git a/contrib/src/fl/barhintspl.cpp b/contrib/src/fl/barhintspl.cpp
deleted file mode 100644
index 411a3e4fa3..0000000000
--- a/contrib/src/fl/barhintspl.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        barhintspl.h
-// Purpose:     Implementation for cbBarHintsPlugin
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     30/11/98 (my 22th birthday :-)
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/utils.h"
-#include "wx/fl/barhintspl.h"
-
-// fixed settings
-
-#define GROOVE_WIDTH         3  // left shade + middle line + right shade
-#define GROOVE_TO_GROOVE_GAP 1  
-#define BOX_T_BOX_GAP        2
-#define BOX_TO_GROOVE_GAP    3
-
-#define BOXES_IN_HINT        2
-#define CLOSE_BOX_IDX        0
-#define COLLAPSE_BOX_IDX     1
-
-// used interally 
-
-#define CLOSE_BOX_HITTED    1
-#define COLLAPSE_BOX_HITTED 2
-
-/***** Implementation fro class cbBarHintsPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarHintsPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbBarHintsPlugin, cbPluginBase )
-
-    EVT_PL_SIZE_BAR_WND  ( cbBarHintsPlugin::OnSizeBarWindow )
-    EVT_PL_DRAW_BAR_DECOR( cbBarHintsPlugin::OnDrawBarDecorations )
-
-    EVT_PL_LEFT_DOWN( cbBarHintsPlugin::OnLeftDown )
-    EVT_PL_LEFT_UP  ( cbBarHintsPlugin::OnLeftUp   )
-    EVT_PL_MOTION   ( cbBarHintsPlugin::OnMotion   )
-
-END_EVENT_TABLE()
-
-cbBarHintsPlugin::cbBarHintsPlugin(void)
-
-    : mpPane( 0 ),
-      mBtnPressed   ( false ),
-      mCloseBoxOn   ( true ),
-      mCollapseBoxOn( true ),
-      mGrooveCount  ( 2 ),
-      mHintGap      ( 4 ),
-      mXWeight      ( 2 )
-{
-    mBoxes[CLOSE_BOX_IDX]    = NULL;
-    mBoxes[COLLAPSE_BOX_IDX] = NULL;
-}
-
-cbBarHintsPlugin::cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask )
-
-    : cbPluginBase( pLayout, paneMask ),
-      mpPane( 0 ),
-      mBtnPressed   ( false ),
-      mCloseBoxOn   ( true ),
-      mCollapseBoxOn( true ),
-      mGrooveCount  ( 2 ),
-      mHintGap      ( 5 ),
-      mXWeight      ( 2 )
-{
-    mBoxes[CLOSE_BOX_IDX]    = NULL;
-    mBoxes[COLLAPSE_BOX_IDX] = NULL;
-}
-
-
-cbBarHintsPlugin::~cbBarHintsPlugin()
-{
-    if (mBoxes[CLOSE_BOX_IDX])
-        delete mBoxes[CLOSE_BOX_IDX];
-
-    if (mBoxes[COLLAPSE_BOX_IDX])
-        delete mBoxes[COLLAPSE_BOX_IDX];
-}  // cbBarHintsPlugin destructor
-
-
-void cbBarHintsPlugin::SetGrooveCount( int nGrooves )
-{
-    mGrooveCount = nGrooves;
-}
-
-void cbBarHintsPlugin::CreateBoxes()
-{
-    cbCloseBox*    box1 = new cbCloseBox();
-    cbCollapseBox* box2 = new cbCollapseBox();
-
-    mBoxes[CLOSE_BOX_IDX]    = box1;
-    mBoxes[COLLAPSE_BOX_IDX] = box2;
-
-    int i;
-    for ( i = 0; i != BOXES_IN_HINT; ++i )
-    {
-        mBoxes[i]->mpLayout = mpLayout;
-        mBoxes[i]->mpPlugin = this;
-        mBoxes[i]->mpWnd    = NULL;
-    }
-}
-
-
-void cbBarHintsPlugin::Draw3DBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawCloseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawCollapseBox( wxDC& WXUNUSED(dc), const wxPoint& WXUNUSED(pos), 
-                                        bool WXUNUSED(atLeft), bool WXUNUSED(disabled), bool WXUNUSED(pressed) )
-{
-}
-
-void cbBarHintsPlugin::DrawGrooves( wxDC& dc, const wxPoint& pos, int length )
-{
-    int ofs = 0;
-
-    int i;
-    for ( i = 0; i != mGrooveCount; ++i, ofs += ( GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP ) )
-    {
-        if ( mpPane->IsHorizontal() )
-        {
-            dc.SetPen( mpLayout->mLightPen );
-            dc.DrawLine( pos.x + ofs, pos.y, pos.x + ofs, pos.y + length - 1 );
-            dc.DrawPoint( pos.x + ofs + 1, pos.y );
-
-            dc.SetPen( mpLayout->mDarkPen );
-            dc.DrawLine( pos.x + ofs + 2, pos.y, pos.x + ofs + 2, pos.y + length );
-            dc.DrawPoint( pos.x + ofs + 1, pos.y + length - 1 );
-            dc.DrawPoint( pos.x + ofs,     pos.y + length - 1 );
-        }
-        else
-        {
-            dc.SetPen( mpLayout->mLightPen );
-            dc.DrawLine( pos.x, pos.y + ofs, pos.x + length - 1, pos.y + ofs );
-            dc.DrawPoint( pos.x, pos.y + ofs + 1 );
-
-            dc.SetPen( mpLayout->mDarkPen );
-            dc.DrawLine( pos.x, pos.y + ofs + 2, pos.x + length, pos.y + ofs + 2 );
-            dc.DrawPoint( pos.x + length - 1, pos.y + ofs + 1 );
-            dc.DrawPoint( pos.x + length - 1, pos.y + ofs );
-        }
-    }
-}
-
-void cbBarHintsPlugin::ExcludeHints( wxRect& rect, cbBarInfo& info )
-{
-    int boxHeight = BTN_BOX_HEIGHT;
-
-    // collapse and close box are not placed on fixed bars
-
-    if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
-
-        boxHeight = 0;
-
-    int height = wxMax( mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
-                        - GROOVE_TO_GROOVE_GAP, 
-                        boxHeight 
-                      );
-
-    if ( mpPane->IsHorizontal() )
-    {
-        rect.x     += ( mHintGap*2 + height );
-        rect.width -= (height + 2*mHintGap);
-
-        rect.x     -= info.mDimInfo.mHorizGap + 2;
-        rect.width += info.mDimInfo.mHorizGap + 2;
-    }
-    else
-    {
-        rect.y      += (mHintGap*2 + height);
-        rect.height -= (height + 2*mHintGap);
-
-        rect.y      -= info.mDimInfo.mVertGap + 2;
-        rect.height += info.mDimInfo.mVertGap + 2;
-    }
-}
-
-void cbBarHintsPlugin::DoDrawHint( wxDC& dc, wxRect& rect, 
-                                   int pos, int WXUNUSED(boxOfs), int grooveOfs,
-                                   bool isFixed )
-{
-    if ( !isFixed )
-    {
-        if ( mpPane->IsHorizontal() )
-        {
-            if ( mCloseBoxOn )
-
-                mBoxes[CLOSE_BOX_IDX]->Draw( dc );
-
-            if ( mCollapseBoxOn )
-            
-                mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
-        }
-        else
-        {
-            if ( mCloseBoxOn )
-            
-                mBoxes[CLOSE_BOX_IDX]->Draw( dc );
-
-            if ( mCollapseBoxOn )
-            
-                mBoxes[COLLAPSE_BOX_IDX]->Draw( dc );
-        }
-    }
-
-    if ( mpPane->IsHorizontal() )
-    
-        DrawGrooves( dc, wxPoint( rect.x + mHintGap + grooveOfs, pos ), 
-                     rect.height - (pos - rect.y) - mHintGap );
-    else
-        DrawGrooves( dc, wxPoint( rect.x + mHintGap, rect.y + mHintGap + grooveOfs ), 
-                     (pos - rect.x) - mHintGap );
-}
-
-void cbBarHintsPlugin::GetHintsLayout( wxRect& rect, cbBarInfo& info, 
-                                       int& boxOfs, int& grooveOfs, int& pos )
-{
-    int boxHeight = BTN_BOX_HEIGHT;
-//  int boxWidth  = BTN_BOX_WIDTH + BOX_TO_GROOVE_GAP + BTN_BOX_WIDTH;
-
-    // collapse and close box are not placed on fixed bars
-
-    if ( info.IsFixed() || ( !mCloseBoxOn && !mCollapseBoxOn ) )
-    {
-        boxHeight = 0;
-//      boxWidth = 0;
-    }
-/*
-    else
-    if ( !mCloseBoxOn || !mCollapseBoxOn )
-
-        boxWidth = BTN_BOX_WIDTH;
-*/
-    int grooveHeight = mGrooveCount*(GROOVE_WIDTH + GROOVE_TO_GROOVE_GAP) 
-                       - GROOVE_TO_GROOVE_GAP;
-
-    int height = wxMax( grooveHeight, boxHeight );
-
-    // center boxs and groves with respect to each other
-
-    boxOfs    = ( height - boxHeight    ) / 2;
-    grooveOfs = ( height - grooveHeight ) / 2;
-
-    pos = ( mpPane->IsHorizontal() ) ? rect.y + mHintGap
-                                     : rect.x + rect.width - mHintGap;
-
-    // setup positions for boxes
-
-    if ( !info.IsFixed() )
-    {
-        // what direction "collapse-triangle" should look at?
-
-        bool& isAtLeft = ((cbCollapseBox*)(mBoxes[COLLAPSE_BOX_IDX]))->mIsAtLeft;
-         
-        isAtLeft= info.mBounds.x <= mpPane->mPaneWidth - ( info.mBounds.x + info.mBounds.width );
-
-        if ( info.IsExpanded() )
-        {
-            isAtLeft = false;
-
-            cbBarInfo* pCur = info.mpPrev;
-
-            while( pCur )
-            {
-                if ( !pCur->IsFixed() )
-                {
-                    isAtLeft = true; break;
-                }
-
-                pCur = pCur->mpPrev;
-            }
-        }
-
-        // collapse/expand works only when more not-fixed bars are present in the same row
-
-        mBoxes[COLLAPSE_BOX_IDX]->Enable( info.mpRow->mNotFixedBarsCnt > 1 );
-
-        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->mpPane = mpPane;
-        }
-
-        if ( mpPane->IsHorizontal() )
-        {
-            if ( mCloseBoxOn )
-            {
-                mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
-
-                pos += BTN_BOX_HEIGHT;
-            }
-
-            if ( mCollapseBoxOn )
-            {
-                if ( mCloseBoxOn ) pos += BOX_T_BOX_GAP;
-
-                mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( rect.x + mHintGap + boxOfs, pos );
-
-                pos += BTN_BOX_HEIGHT;
-
-                pos += BOX_TO_GROOVE_GAP;
-            }
-        }
-        else
-        {
-            if ( mCloseBoxOn )
-            {
-                pos -= BTN_BOX_WIDTH;
-
-                mBoxes[CLOSE_BOX_IDX]->mPos = wxPoint( pos , rect.y + mHintGap + boxOfs );
-            }
-
-            if ( mCollapseBoxOn )
-            {
-                if ( mCloseBoxOn ) pos -= BOX_T_BOX_GAP;
-
-                pos -= BTN_BOX_WIDTH;
-
-                mBoxes[COLLAPSE_BOX_IDX]->mPos = wxPoint( pos, rect.y + mHintGap + boxOfs );
-
-                pos -= BOX_TO_GROOVE_GAP;
-            }
-        }
-    }
-}
-
-static inline bool is_in_box( const wxPoint& rectPos, const wxPoint& mousePos )
-{
-    return ( mousePos.x >= rectPos.x &&
-             mousePos.y >= rectPos.y &&
-             mousePos.x < rectPos.x + BTN_BOX_WIDTH &&
-             mousePos.y < rectPos.y + BTN_BOX_HEIGHT );
-}
-
-int cbBarHintsPlugin::HitTestHints( cbBarInfo& info, const wxPoint& pos )
-{
-    wxPoint inPane = pos;
-    mpPane->PaneToFrame( &inPane.x, &inPane.y );
-
-    wxRect& rect = info.mBoundsInParent;
-
-    if ( info.IsFixed() ) return false;
-
-    int boxOfs, grooveOfs, coord;
-
-    GetHintsLayout( rect, info, boxOfs, grooveOfs, coord );
-
-    if ( mpPane->IsHorizontal() )
-    {
-        if ( mCloseBoxOn )
-        {
-            if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
-
-                return CLOSE_BOX_HITTED;
-
-            coord += BTN_BOX_HEIGHT;
-        }
-
-        if ( mCollapseBoxOn )
-        {
-            if ( mCloseBoxOn ) coord += BOX_T_BOX_GAP;
-
-            if ( is_in_box( wxPoint( rect.x + mHintGap + boxOfs, coord ), inPane ) )
-
-                return COLLAPSE_BOX_HITTED;
-
-            coord += BTN_BOX_HEIGHT;
-        }
-    }
-    else
-    {
-        if ( mCloseBoxOn )
-        {
-            coord -= BTN_BOX_WIDTH;
-
-            if ( is_in_box( wxPoint( coord , rect.y + mHintGap + boxOfs ), inPane ) )
-
-                return CLOSE_BOX_HITTED;
-        }
-
-        if ( mCollapseBoxOn )
-        {
-            if ( mCloseBoxOn ) coord -= BOX_T_BOX_GAP;
-            coord -= BTN_BOX_WIDTH;
-
-            if ( is_in_box( wxPoint( coord, rect.y + mHintGap + boxOfs ), inPane ) )
-
-                return COLLAPSE_BOX_HITTED;
-        }
-    }
-
-    return false;
-}
-
-// handlers for plugin-events
-
-void cbBarHintsPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
-{
-    wxRect& rect     = event.mBoundsInParent;
-    mpPane           = event.mpPane;
-
-    ExcludeHints( rect, *event.mpBar );
-
-    event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbBarHintsPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
-{
-    wxRect& rect     = event.mBoundsInParent;
-    mpPane           = event.mpPane;
-
-    int boxOfs, grooveOfs, pos;
-
-    GetHintsLayout( rect, *event.mpBar, boxOfs, grooveOfs, pos );
-
-    DoDrawHint( *event.mpDc, rect, pos, boxOfs, grooveOfs, event.mpBar->IsFixed() );
-
-    // let other plugins add on their decorations
-
-    event.Skip();
-}
-
-void cbBarHintsPlugin::OnLeftDown( cbLeftDownEvent& event )
-{
-    mpPane           = event.mpPane;
-    wxPoint inFrame = event.mPos;
-
-    mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
-    wxBarIterator iter( mpPane->GetRowList() );
-
-    mpClickedBar = NULL;
-
-    while ( iter.Next() )
-    {
-        cbBarInfo& bar = iter.BarInfo();
-
-        int boxOfs, grooveOfs, pos;
-
-        GetHintsLayout( bar.mBoundsInParent, bar, boxOfs, grooveOfs, pos );
-
-        if ( !bar.IsFixed() )
-        {
-            int i;
-            for ( i = 0; i != BOXES_IN_HINT; ++i )
-            {
-                mBoxes[i]->mPressed = false;
-                mBoxes[i]->mWasClicked = false;
-            }
-            for ( i = 0; i != BOXES_IN_HINT; ++i )
-            {
-                mBoxes[i]->OnLeftDown( inFrame );
-
-                if ( mBoxes[i]->mPressed )
-                {
-                    mBtnPressed = true;
-                    mpClickedBar = &bar;
-
-                    return; // event handled
-                }
-            }
-        }
-    }
-
-    event.Skip();
-}
-
-void cbBarHintsPlugin::OnLeftUp( cbLeftUpEvent&   event )
-{
-    if ( mBtnPressed )
-    {
-        wxPoint inFrame = event.mPos;
-        mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
-        int boxOfs, grooveOfs, pos;
-
-        GetHintsLayout( mpClickedBar->mBoundsInParent, *mpClickedBar, boxOfs, grooveOfs, pos );
-
-        HitTestHints( *mpClickedBar, event.mPos );
-
-        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->OnLeftUp( inFrame );
-
-            if ( mBoxes[i]->WasClicked() )
-            {
-                if ( i == 0 )
-                {
-                    mpLayout->SetBarState( mpClickedBar, wxCBAR_HIDDEN, true );
-                    // Notify bar child window of close event:
-                    if(mpClickedBar->mpBarWnd!=NULL)
-                        mpClickedBar->mpBarWnd->Close();
-                }
-                else
-                {
-                    if ( mpClickedBar->IsExpanded() )
-                        mpPane->ContractBar( mpClickedBar );
-                    else
-                        mpPane->ExpandBar( mpClickedBar );
-                }
-            }
-        }
-
-        mBtnPressed = false;
-        return;
-    }
-    else
-        event.Skip();
-}
-
-void cbBarHintsPlugin::OnMotion( cbMotionEvent&   event )
-{
-    if ( mBtnPressed )
-    {
-        wxPoint inFrame = event.mPos;
-        mpPane->PaneToFrame( &inFrame.x, &inFrame.y );
-
-        mpPane = event.mpPane;
-
-        int i;
-        for ( i = 0; i != BOXES_IN_HINT; ++i )
-        {
-            mBoxes[i]->OnMotion( inFrame );
-        }
-    }
-    else
-        event.Skip();
-}
-
-void cbBarHintsPlugin::OnInitPlugin()
-{
-    cbPluginBase::OnInitPlugin();
-
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {    
-        if ( panes[i]->MatchesMask( mPaneMask ) )
-        {
-            panes[i]->mProps.mMinCBarDim.x = 25;
-            panes[i]->mProps.mMinCBarDim.y = 16;
-        }
-    }
-    CreateBoxes();
-}
diff --git a/contrib/src/fl/cbcustom.cpp b/contrib/src/fl/cbcustom.cpp
deleted file mode 100644
index 42dd52651d..0000000000
--- a/contrib/src/fl/cbcustom.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        cbcustom.cpp
-// Purpose:     cbSimpleCustomizationPlugin class declaration
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/cbcustom.h"
-
-// helper class to receive menu customization event
-
-class cbContextMenuHandler : public wxEvtHandler
-{
-public:
-    cbSimpleCustomizationPlugin* mpBackRef;
-
-public:
-    void OnCommandEvents( wxCommandEvent& evt );
-
-    DECLARE_EVENT_TABLE()
-};
-
-// FIXME:: is this "safe" ?
-
-#define CB_CUSTOMIZE_MENU_FIRST_ITEM_ID 17500
-
-/***** Implementation for helper class cbContextMenuHandler *****/
-
-BEGIN_EVENT_TABLE( cbContextMenuHandler, wxEvtHandler )
-
-    // FIXME:: what is the right range for these ids ? so that they
-    //         would not collide with user commands?
-
-    EVT_COMMAND_RANGE( CB_CUSTOMIZE_MENU_FIRST_ITEM_ID,
-                       CB_CUSTOMIZE_MENU_FIRST_ITEM_ID + 300,
-                       wxEVT_COMMAND_MENU_SELECTED,
-                       cbContextMenuHandler::OnCommandEvents )
-
-END_EVENT_TABLE()
-
-void cbContextMenuHandler::OnCommandEvents( wxCommandEvent& evt )
-{
-    //wxMessageBox("Wowwwww, Yeah!");
-
-    mpBackRef->OnMenuItemSelected( evt );
-}
-
-/***** Implementation for class cbSimpleCustomizationPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbSimpleCustomizationPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbSimpleCustomizationPlugin, cbPluginBase )
-
-    EVT_PL_CUSTOMIZE_BAR   ( cbSimpleCustomizationPlugin::OnCustomizeBar    )
-    EVT_PL_CUSTOMIZE_LAYOUT( cbSimpleCustomizationPlugin::OnCustomizeLayout )
-
-END_EVENT_TABLE()
-
-cbSimpleCustomizationPlugin::cbSimpleCustomizationPlugin(void)
-{}
-
-cbSimpleCustomizationPlugin::cbSimpleCustomizationPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask )
-{}
-
-void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )
-{
-    // ingnore bar customization, treat it
-    // as layout-customization...ugly, eh?
-
-    cbCustomizeLayoutEvent clEvt( event.mClickPos );
-
-    OnCustomizeLayout( clEvt );
-}
-
-void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
-{
-    wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
-    wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
-
-    int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;
-
-    wxMenu* pMenu = new wxMenu();
-
-    BarArrayT& bars = mpLayout->GetBars();
-
-    for( size_t i = 0; i != bars.GetCount(); ++i )
-    {
-        cbBarInfo& bar = *bars[i];
-
-        bool isHidden = ( bar.mState == wxCBAR_HIDDEN );
-
-        wxString* pHelpStr = ( isHidden ) ? &helpStr1 : &helpStr2;
-
-        pMenu->Append( id, bar.mName, *pHelpStr, true );
-
-        pMenu->Check( id, (isHidden == false) );
-
-        ++id;
-    }
-
-    // Customization dialog not implemented, so don't show the menu item
-#if 0
-    pMenu->AppendSeparator();
-    pMenu->Append( id, "Customize...", "Show layout customization dialog", false );
-#endif
-    mCustMenuItemId = id;
-
-    cbContextMenuHandler* pHandler = new cbContextMenuHandler();
-    pHandler->mpBackRef            = this;
-
-    wxWindow* pFrm = &mpLayout->GetParentFrame();
-
-    // FOR NOW FOR NOW:: to work-around wxFrame's (MSW) nasty event-handling bugs!!!
-
-    wxWindow* pTmpWnd = new wxWindow( pFrm, wxID_ANY, event.mClickPos, wxSize(0,0) );
-
-    pMenu->SetEventHandler( pHandler );
-
-    pTmpWnd->PopupMenu( pMenu, 0,0 );
-
-    pTmpWnd->Destroy();
-
-    delete pMenu;
-    delete pHandler;
-
-    // event is "eaten" by this plugin
-}
-
-void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
-{
-    if ( event.GetId() == mCustMenuItemId )
-    {
-        wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
-
-        return;
-    }
-    else
-    {
-        cbBarInfo* pBar = mpLayout->GetBars()[ event.GetId() -  CB_CUSTOMIZE_MENU_FIRST_ITEM_ID ];
-
-        wxASSERT( pBar ); // DBG::
-
-        // "inverse" bar-visibility of the selected bar
-
-        int newState;
-
-        if ( pBar->mState == wxCBAR_HIDDEN )
-        {
-            if ( pBar->mAlignment == -1 )
-            {
-                pBar->mAlignment = 0;       // just remove "-1" marking
-                newState = wxCBAR_FLOATING;
-            }
-            else
-                if ( pBar->mAlignment == FL_ALIGN_TOP ||
-                     pBar->mAlignment == FL_ALIGN_BOTTOM )
-
-                    newState = wxCBAR_DOCKED_HORIZONTALLY;
-                else
-                    newState = wxCBAR_DOCKED_VERTICALLY;
-        }
-        else
-        {
-            newState = wxCBAR_HIDDEN;
-
-            if ( pBar->mState == wxCBAR_FLOATING )
-
-                pBar->mAlignment = -1;
-        }
-
-        mpLayout->SetBarState( pBar, newState, true );
-
-        if ( newState == wxCBAR_FLOATING )
-            mpLayout->RepositionFloatedBar( pBar );
-    }
-
-    // menu-item-selected event is "eaten"
-}
diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
deleted file mode 100644
index 4023c60b19..0000000000
--- a/contrib/src/fl/controlbar.cpp
+++ /dev/null
@@ -1,3515 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        controlbar.cpp
-// Purpose:     Implementation for main controlbar classes.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "wx/string.h"
-#include "wx/utils.h"     // import wxMin,wxMax macros
-#include "wx/minifram.h"
-
-#include "wx/fl/controlbar.h"
-
-// import classes of default plugins
-
-#include "wx/fl/panedrawpl.h"
-#include "wx/fl/rowlayoutpl.h"
-#include "wx/fl/antiflickpl.h"
-#include "wx/fl/bardragpl.h"
-#include "wx/fl/cbcustom.h"
-
-#include "wx/fl/gcupdatesmgr.h"   // import default updates manager class ("garbage-collecting" one)
-#include "wx/fl/updatesmgr.h"
-
-#include "wx/fl/toolwnd.h"
-
-// These are the event IDs being initialized to a value to
-// meet the new event paradigm as of wx2.3.0.  Probably we
-// should find a way to make these be non-global, but this
-// works for right now.
-    wxEventType cbEVT_PL_LEFT_DOWN = wxNewEventType();
-    wxEventType cbEVT_PL_LEFT_UP = wxNewEventType();
-    wxEventType cbEVT_PL_RIGHT_DOWN = wxNewEventType();
-    wxEventType cbEVT_PL_RIGHT_UP = wxNewEventType();
-    wxEventType cbEVT_PL_MOTION = wxNewEventType();
-
-    wxEventType cbEVT_PL_LEFT_DCLICK = wxNewEventType();
-
-    wxEventType cbEVT_PL_LAYOUT_ROW = wxNewEventType();
-    wxEventType cbEVT_PL_RESIZE_ROW = wxNewEventType();
-    wxEventType cbEVT_PL_LAYOUT_ROWS = wxNewEventType();
-    wxEventType cbEVT_PL_INSERT_BAR = wxNewEventType();
-    wxEventType cbEVT_PL_RESIZE_BAR = wxNewEventType();
-    wxEventType cbEVT_PL_REMOVE_BAR = wxNewEventType();
-    wxEventType cbEVT_PL_SIZE_BAR_WND = wxNewEventType();
-
-    wxEventType cbEVT_PL_DRAW_BAR_DECOR = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_ROW_DECOR = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_PANE_DECOR = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_BAR_HANDLES = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_ROW_HANDLES = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_ROW_BKGROUND = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_PANE_BKGROUND = wxNewEventType();
-
-    wxEventType cbEVT_PL_START_BAR_DRAGGING = wxNewEventType();
-    wxEventType cbEVT_PL_DRAW_HINT_RECT = wxNewEventType();
-
-    wxEventType cbEVT_PL_START_DRAW_IN_AREA = wxNewEventType();
-    wxEventType cbEVT_PL_FINISH_DRAW_IN_AREA = wxNewEventType();
-
-    wxEventType cbEVT_PL_CUSTOMIZE_BAR = wxNewEventType();
-    wxEventType cbEVT_PL_CUSTOMIZE_LAYOUT = wxNewEventType();
-
-    wxEventType wxCUSTOM_CB_PLUGIN_EVENTS_START_AT = wxNewEventType();
-
-// some ascii-art, still can't get these *nice* cursors working on wx... :-(
-
-/*
-// FIXME:: see places where _gHorizCursorImg is used
-
-static const char* _gHorizCursorImg[] =
-{
-    "............XX....XX............",
-    "............XX....XX............",
-    "............XX....XX............",
-    "............XX....XX............",
-    "............XX....XX............",
-    "...X........XX....XX........X...",
-    "..XX........XX....XX........XX..",
-    ".XXX........XX....XX........XXX.",
-    "XXXXXXXXXXXXXX....XXXXXXXXXXXXXX",
-    ".XXX........XX....XX........XXX.",
-    "..XX........XX....XX........XX..",
-    "...X........XX....XX........X...",
-    "............XX....XX............",
-    "............XX....XX............",
-    "............XX....XX............",
-    "............XX....XX............"
-};
-
-static const char* _gVertCursorImg[] =
-{
-    "................X...............",
-    "...............XXX..............",
-    "..............XXXXX.............",
-    ".............XXXXXXX............",
-    "................X...............",
-    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "................................",
-    "................................",
-    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "................X...............",
-    ".............XXXXXXX............",
-    "..............XXXXX.............",
-    "...............XXX..............",
-    "................X..............."
-};
-*/
-
-// helper inline functions
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
-    return ( x >= rect.x &&
-             y >= rect.y &&
-             x <  rect.x + rect.width  &&
-             y <  rect.y + rect.height );
-}
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
-    if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
-         ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
-        if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
-             ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-
-            return 1;
-
-    return 0;
-}
-
-static inline void hide_rect( wxRect& r )
-{
-    r.x = 32768;
-    r.y = 32768;
-    r.width  = 1;
-    r.height = 1;
-}
-
-static inline void clip_rect_against_rect( wxRect& r1, const wxRect& r2 )
-{
-    if ( r1.x < r2.x              ||
-         r1.y < r2.y              ||
-         r1.x >= r2.x + r2.width  ||
-         r1.y >= r2.y + r2.height
-       )
-    {
-        hide_rect( r1 );
-        return;
-    }
-    else
-    {
-        if ( r1.x + r1.width  > r2.x + r2.width )
-
-            r1.width = r2.x + r2.width - r1.x;
-
-        if ( r1.y + r1.height > r2.y + r2.height )
-
-            r1.height = r2.y + r2.height - r1.y;
-    }
-}
-
-/***** Implementation for class cbBarSpy *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarSpy, wxEvtHandler )
-
-cbBarSpy::cbBarSpy(void)
-    : mpLayout(0),
-      mpBarWnd(0)
-{}
-
-cbBarSpy::cbBarSpy( wxFrameLayout* pPanel )
-
-    : mpLayout(pPanel),
-      mpBarWnd(0)
-{}
-
-void cbBarSpy::SetBarWindow( wxWindow* pWnd )
-{
-    mpBarWnd = pWnd;
-}
-
-bool cbBarSpy::ProcessEvent(wxEvent& event)
-{
-    bool handled = wxEvtHandler::ProcessEvent( event );
-
-    int type = event.GetEventType();
-
-    if ( !handled && ( type == wxEVT_LEFT_DOWN ||
-                       type == wxEVT_LEFT_DCLICK ) )
-    {
-        wxMouseEvent& mevent = *((wxMouseEvent*)&event);
-
-        int x = mevent.m_x;
-        int y = mevent.m_y;
-
-        mpBarWnd->ClientToScreen( &x, &y );
-        mpLayout->GetParentFrame().ScreenToClient( &x, &y );
-
-        mevent.m_x = x;
-        mevent.m_y = y;
-
-        // forwared not-handled event to frame-layout
-
-        if ( type == wxEVT_LEFT_DOWN )
-        {
-            //mpLayout->OnLButtonDown( mevent );
-            event.Skip();
-        }
-        else
-            mpLayout->OnLDblClick( mevent );
-
-        //event.Skip(false);
-    }
-
-    return handled;
-}
-
-/***** Implementation for class wxFrameLayout *****/
-
-IMPLEMENT_DYNAMIC_CLASS( wxFrameLayout, wxEvtHandler )
-
-BEGIN_EVENT_TABLE( wxFrameLayout, wxEvtHandler )
-
-    EVT_PAINT      ( wxFrameLayout::OnPaint       )
-    EVT_SIZE       ( wxFrameLayout::OnSize        )
-    EVT_LEFT_DOWN  ( wxFrameLayout::OnLButtonDown )
-    EVT_LEFT_UP    ( wxFrameLayout::OnLButtonUp   )
-    EVT_RIGHT_DOWN ( wxFrameLayout::OnRButtonDown )
-    EVT_RIGHT_UP   ( wxFrameLayout::OnRButtonUp   )
-    EVT_MOTION     ( wxFrameLayout::OnMouseMove   )
-
-    EVT_LEFT_DCLICK( wxFrameLayout::OnLDblClick   )
-
-    EVT_IDLE       ( wxFrameLayout::OnIdle        )
-
-    EVT_ERASE_BACKGROUND( wxFrameLayout::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-// FIXME:: how to eliminate these cut&pasted constructors?
-
-wxFrameLayout::wxFrameLayout(void)
-
-    : mpFrame      ( NULL ),
-      mpFrameClient( NULL ),
-
-      mDarkPen  ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
-      mLightPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
-      mGrayPen  ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-      mBlackPen ( wxColour(  0,  0,  0), 1, wxSOLID ),
-      mBorderPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-
-      mNullPen( wxColour(0,0,0), 1, wxTRANSPARENT ),
-
-      mpPaneInFocus( NULL ),
-      mpLRUPane    ( NULL ),
-
-
-      mpTopPlugin   ( NULL ),
-      mpCaputesInput( NULL ),
-
-      mClientWndRefreshPending( false ),
-      mRecalcPending( true ),
-      mCheckFocusWhenIdle( false )
-{
-    CreateCursors();
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-        mPanes[i]  = NULL;
-
-    mFloatingOn = CanReparent();
-}
-
-wxFrameLayout::wxFrameLayout( wxWindow* pParentFrame, wxWindow* pFrameClient, bool activateNow )
-
-    : mpFrame( pParentFrame ),
-      mpFrameClient(pFrameClient),
-
-      mDarkPen  ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
-      mLightPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
-      mGrayPen  ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-      mBlackPen ( wxColour(  0,  0,  0), 1, wxSOLID ),
-      mBorderPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-
-      mNullPen( wxColour(0,0,0), 1, wxTRANSPARENT ),
-
-      mpPaneInFocus( NULL ),
-      mpLRUPane    ( NULL ),
-
-      mFloatingOn   ( true ),
-
-      mpTopPlugin   ( NULL ),
-      mpCaputesInput( NULL ),
-
-      mClientWndRefreshPending( false ),
-      mRecalcPending( true ),
-      mCheckFocusWhenIdle( false ),
-
-      mpUpdatesMgr( NULL )
-{
-    CreateCursors();
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-        mPanes[i]  = new cbDockPane( i, this );
-
-    if ( activateNow )
-    {
-        HookUpToFrame();
-
-        // FOR NOW::
-        // DBG:: set RED color of frame's background for the
-        //       prurpose of tracking engine bugs "visually"
-
-        GetParentFrame().SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) );
-    }
-
-    mFloatingOn = CanReparent();
-}
-
-// NOTE:: below are the only platform-check "ifdef"s in the docking system!
-
-bool wxFrameLayout::CanReparent()
-{
-#ifdef __WXMSW__
-    return true;
-#elif defined(__WXGTK20__)
-    return true;
-#elif defined (__WXGTK__)
-    //return true;
-    return false;
-#else
-
-    return false; // reparenting is not yet supported by Motif and others
-#endif
-}
-
-/*
-#ifdef __WXMSW__
-    #inlcude "windows.h"
-#endif
-*/
-
-void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
-{
-#if defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXMAC__)
-    pChild->Reparent(pNewParent);
-
-    return;
-#elif defined(__WXGTK__) || defined(__WXX11__)
-    // FOR NOW:: floating with wxGtk still very buggy
-
-    return;
-
-    //pChild->ReParent( pNewParent );
-
-    //return;
-#else
-    wxUnusedVar(pChild);
-    wxUnusedVar(pNewParent);
-    wxMessageBox( _("Sorry, docking is not supported for ports other than wxMSW, wxMac and wxGTK") );
-#endif
-}
-
-void wxFrameLayout::DestroyBarWindows()
-{
-    wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();
-
-    while( pSpy )
-    {
-        cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());
-
-        if ( spy.mpBarWnd->GetEventHandler() == &spy )
-
-            spy.mpBarWnd->PopEventHandler();
-
-        delete &spy;
-
-        pSpy = pSpy->GetNext();
-    }
-
-    mBarSpyList.Clear();
-
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
-    {
-        if ( mAllBars[i]->mpBarWnd )
-        {
-            mAllBars[i]->mpBarWnd->Destroy();
-            mAllBars[i]->mpBarWnd = NULL;
-        }
-    }
-}
-
-void wxFrameLayout::ShowFloatedWindows( bool show )
-{
-    wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
-    while( pNode )
-    {
-        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
-        pFFrm->Show( show );
-
-        pNode = pNode->GetNext();
-    }
-}
-
-wxFrameLayout::~wxFrameLayout()
-{
-    size_t i;
-
-    UnhookFromFrame();
-
-    if ( mpUpdatesMgr )
-        delete mpUpdatesMgr;
-
-    PopAllPlugins();
-
-    // destoy the chain of plugins from left to right
-
-    wxEvtHandler* pCur = mpTopPlugin;
-
-    if ( pCur )
-
-        while ( pCur->GetPreviousHandler() )
-
-            pCur = pCur->GetPreviousHandler();
-
-    while ( pCur )
-    {
-        wxEvtHandler* pNext = pCur->GetNextHandler();
-
-        delete pCur;
-
-        pCur = pNext;
-    }
-
-    // destroy contents of arrays and lists
-
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
-        if ( mPanes[i] )
-            delete mPanes[i];
-    }
-    if ( mpHorizCursor  )
-        delete mpHorizCursor;
-    if ( mpVertCursor   )
-        delete mpVertCursor;
-    if ( mpNormalCursor )
-        delete mpNormalCursor;
-    if ( mpDragCursor   )
-        delete mpDragCursor;
-    if ( mpNECursor     )
-        delete mpNECursor;
-
-    wxObjectList::compatibility_iterator pSpy = mBarSpyList.GetFirst();
-
-    while( pSpy )
-    {
-        cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());
-
-        if ( spy.mpBarWnd->GetEventHandler() == &spy )
-
-            spy.mpBarWnd->PopEventHandler();
-
-        delete &spy;
-
-        pSpy = pSpy->GetNext();
-    }
-
-    for ( i = 0; i != mAllBars.Count(); ++i )
-        delete mAllBars[i];
-}
-
-void wxFrameLayout::EnableFloating( bool enable )
-{
-    mFloatingOn = enable && CanReparent();
-}
-
-void wxFrameLayout::Activate()
-{
-    HookUpToFrame();
-
-    RefreshNow( true );
-
-    ShowFloatedWindows( true );
-}
-
-void wxFrameLayout::Deactivate()
-{
-    ShowFloatedWindows( false );
-
-    UnhookFromFrame();
-
-    HideBarWindows();
-}
-
-void wxFrameLayout::SetFrameClient( wxWindow* pFrameClient )
-{
-    mpFrameClient = pFrameClient;
-}
-
-wxWindow* wxFrameLayout::GetFrameClient()
-{
-    return mpFrameClient;
-}
-
-cbUpdatesManagerBase& wxFrameLayout::GetUpdatesManager()
-{
-    if ( !mpUpdatesMgr )
-        mpUpdatesMgr = CreateUpdatesManager();
-
-    return *mpUpdatesMgr;
-}
-
-void wxFrameLayout::SetUpdatesManager( cbUpdatesManagerBase* pUMgr )
-{
-    if ( mpUpdatesMgr )
-        delete mpUpdatesMgr;
-
-    mpUpdatesMgr = pUMgr;
-
-    mpUpdatesMgr->SetLayout( this );
-}
-
-cbUpdatesManagerBase* wxFrameLayout::CreateUpdatesManager()
-{
-    return new cbGCUpdatesMgr( this );
-    //return new cbSimpleUpdatesMgr( this );
-}
-
-void wxFrameLayout::AddBar( wxWindow*        pBarWnd,
-                            const cbDimInfo& dimInfo,
-                            int              alignment,
-                            int              rowNo,
-                            int              columnPos,
-                            const wxString&  name,
-                            bool             spyEvents,
-                            int              state
-                          )
-{
-    if ( pBarWnd && spyEvents )
-    {
-        // hook up spy to bar window
-        cbBarSpy* pSpy = new cbBarSpy( this );
-
-        pSpy->SetBarWindow( pBarWnd );
-        pBarWnd->PushEventHandler( pSpy );
-
-        mBarSpyList.Append( pSpy );
-    }
-
-    cbBarInfo* pInfo = new cbBarInfo();
-
-    pInfo->mName      = name;
-    pInfo->mpBarWnd   = pBarWnd;
-    pInfo->mDimInfo   = dimInfo;
-    pInfo->mDimInfo.mLRUPane = alignment;
-    pInfo->mState     = state;
-    pInfo->mAlignment = alignment;
-    pInfo->mRowNo     = rowNo;
-    pInfo->mBounds.x  = columnPos;
-
-    mAllBars.Add( pInfo );
-
-    DoSetBarState( pInfo );
-}
-
-bool wxFrameLayout::RedockBar( cbBarInfo*    pBar,
-                               const wxRect& shapeInParent,
-                               cbDockPane*   pToPane,
-                               bool          updateNow )
-{
-    if ( !pToPane )
-
-        pToPane = HitTestPanes( shapeInParent, NULL );
-
-    if ( !pToPane )
-
-        return false; // bar's shape does not hit any pane
-                     // - redocking is NOT possible
-
-    cbDockPane* pBarPane = GetBarPane( pBar );
-
-    if ( updateNow )
-
-        GetUpdatesManager().OnStartChanges();
-
-    pBarPane->RemoveBar( pBar );
-
-    // FIXME FIXME:: the recalculation below may be a *huge* performance
-    //               hit, it could be eliminated though...
-    //               but first the "pane-postion-changed" problem
-    //               has to be fixed
-
-    RecalcLayout( false );
-
-    pToPane->InsertBar( pBar, shapeInParent );
-
-    RecalcLayout( false );
-
-    // finish update "transaction"
-
-    if ( updateNow )
-    {
-        GetUpdatesManager().OnFinishChanges();
-        GetUpdatesManager().UpdateNow();
-    }
-
-    return true;
-}
-
-cbBarInfo* wxFrameLayout::FindBarByName( const wxString& name )
-{
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
-        if ( mAllBars[i]->mName == name )
-            return mAllBars[i];
-
-    return NULL;
-}
-
-cbBarInfo* wxFrameLayout::FindBarByWindow( const wxWindow* pWnd )
-{
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
-        if ( mAllBars[i]->mpBarWnd == pWnd )
-            return mAllBars[i];
-
-    return NULL;
-}
-
-BarArrayT& wxFrameLayout::GetBars()
-{
-    return mAllBars;
-}
-
-void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
-{
-    if ( newState == wxCBAR_FLOATING && !(mFloatingOn && pBar->mFloatingOn))
-
-        return;
-
-    if ( updateNow )
-
-        GetUpdatesManager().OnStartChanges();
-
-    pBar->mUMgrData.SetDirty(true);
-
-    // check bar's previous state
-
-    if ( pBar->mState != wxCBAR_HIDDEN && pBar->mState != wxCBAR_FLOATING )
-    {
-        cbDockPane* pPane;
-        cbRowInfo*  pRow;
-
-        #ifdef  __WXDEBUG__
-        bool success =
-        #endif
-                       LocateBar( pBar, &pRow, &pPane );
-
-        wxASSERT( success ); // DBG::
-
-        // save LRU-dim info before removing bar
-
-        pBar->mDimInfo.mLRUPane = pPane->GetAlignment();
-        pBar->mDimInfo.mBounds[ pPane->GetAlignment() ] = pBar->mBounds;
-
-        // remove it from the pane it was docked on
-
-        pPane->RemoveBar( pBar );
-
-    }
-
-    if ( pBar->mState == wxCBAR_FLOATING && newState != wxCBAR_FLOATING )
-    {
-        // remove bar's window from the containing mini-frame
-        // and set its parent to be layout's parent frame
-
-        if ( pBar->mpBarWnd )
-        {
-            pBar->mpBarWnd->Show(false); // to avoid flicker upon reparenting
-
-            wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
-            while( pNode )
-            {
-                cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
-                if ( pFFrm->GetBar() == pBar )
-                {
-                    pFFrm->Show( false ); // reduces flicker sligthly
-
-                    ReparentWindow( pBar->mpBarWnd, &GetParentFrame() );
-
-                    pBar->mBounds = pBar->mDimInfo.mBounds[ pBar->mDimInfo.mLRUPane ];
-
-                    if ( newState != wxCBAR_HIDDEN )
-
-                        pBar->mAlignment = pBar->mDimInfo.mLRUPane;
-
-                    mFloatedFrames.Erase( pNode );
-
-                    pFFrm->Show( false );
-                    pFFrm->Destroy(); break;
-                }
-
-                pNode = pNode->GetNext();
-            }
-
-            // FOR NOW:: excessive!
-            //if ( mpFrameClient ) mpFrameClient->Refresh();
-            if ( mpFrameClient )
-                mClientWndRefreshPending = true;
-        }
-    }
-
-    if ( pBar->mDimInfo.GetDimHandler() )
-    {
-        pBar->mDimInfo.GetDimHandler()->OnChangeBarState( pBar, newState );
-    }
-
-    pBar->mState = newState;
-
-    DoSetBarState( pBar );
-
-    if ( updateNow )
-    {
-        RecalcLayout(false);
-
-        GetUpdatesManager().OnFinishChanges();
-        GetUpdatesManager().UpdateNow();
-    }
-}
-
-void wxFrameLayout::InverseVisibility( cbBarInfo* pBar )
-{
-    wxASSERT( pBar ); // DBG::
-
-    // "inverse" bar-visibility of the selected bar
-
-    int newState;
-
-    if ( pBar->mState == wxCBAR_HIDDEN )
-    {
-        if ( pBar->mAlignment == -1 )
-        {
-            pBar->mAlignment = 0;       // just remove "-1" marking
-            newState = wxCBAR_FLOATING;
-        }
-        else
-        if ( pBar->mAlignment == FL_ALIGN_TOP ||
-             pBar->mAlignment == FL_ALIGN_BOTTOM )
-
-            newState = wxCBAR_DOCKED_HORIZONTALLY;
-        else
-            newState = wxCBAR_DOCKED_VERTICALLY;
-    }
-    else
-    {
-        newState = wxCBAR_HIDDEN;
-
-        if ( pBar->mState == wxCBAR_FLOATING )
-
-            pBar->mAlignment = -1;
-    }
-
-    this->SetBarState( pBar, newState, true );
-
-    if ( newState == wxCBAR_FLOATING )
-
-        this->RepositionFloatedBar( pBar );
-}
-
-void wxFrameLayout::ApplyBarProperties( cbBarInfo* pBar )
-{
-    if ( pBar->mState == wxCBAR_FLOATING )
-    {
-        RepositionFloatedBar( pBar );
-    }
-    else
-    if ( pBar->mState == wxCBAR_DOCKED_HORIZONTALLY ||
-         pBar->mState == wxCBAR_DOCKED_VERTICALLY
-       )
-    {
-        // FOR NOW:: nothing
-    }
-
-}
-
-void wxFrameLayout::RepositionFloatedBar( cbBarInfo* pBar )
-{
-    if ( !(mFloatingOn && pBar->mFloatingOn)) return;
-
-    wxObjectList::compatibility_iterator pNode = mFloatedFrames.GetFirst();
-
-    while( pNode )
-    {
-        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());
-
-        if ( pFFrm->GetBar() == pBar )
-        {
-            wxRect& bounds = pBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
-            int x = bounds.x,
-                y = bounds.y;
-
-            GetParentFrame().ClientToScreen( &x, &y );
-
-            pFFrm->PositionFloatedWnd( x,y,
-                                       bounds.width,
-                                       bounds.height );
-
-            break;
-        }
-
-        pNode = pNode->GetNext();
-    }
-}
-
-void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
-{
-    if ( pBar->mState != wxCBAR_FLOATING &&
-         pBar->mState != wxCBAR_HIDDEN )
-
-        // dock it
-
-        mPanes[pBar->mAlignment]->InsertBar( pBar );
-    else
-    if ( pBar->mState == wxCBAR_HIDDEN )
-    {
-        // hide it
-
-        if ( pBar->mpBarWnd )
-
-            pBar->mpBarWnd->Show( false );
-    }
-    else
-    {
-        if ( !(mFloatingOn && pBar->mFloatingOn) )
-          return;
-
-        // float it
-
-        if ( pBar->mpBarWnd == NULL || !CanReparent() )
-        {
-            // FOR NOW:: just hide it
-
-            if ( pBar->mpBarWnd )
-
-                pBar->mpBarWnd->Show( false );
-
-            pBar->mState = wxCBAR_HIDDEN;
-
-            return;
-        }
-
-        cbFloatedBarWindow* pMiniFrm = new cbFloatedBarWindow();
-
-        pMiniFrm->SetBar( pBar );
-        pMiniFrm->SetLayout( this );
-
-        pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
-                          wxPoint( 50,50 ),
-                          wxSize ( 0, 0  ),
-                          wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
-                        );
-
-        pMiniFrm->SetClient( pBar->mpBarWnd );
-
-        ReparentWindow( pBar->mpBarWnd, pMiniFrm );
-
-        mFloatedFrames.Append( pMiniFrm );
-
-        wxRect& bounds = pBar->mDimInfo.mBounds[wxCBAR_FLOATING];
-
-        // check if it wasn't floated anytime before
-
-        if ( bounds.width == -1 )
-        {
-            wxRect& clntRect = GetClientRect();
-
-            // adjust position into which the next floated bar will be placed
-
-            if ( mNextFloatedWndPos.x + bounds.width > clntRect.width )
-
-                mNextFloatedWndPos.x = mFloatingPosStep.x;
-
-            if ( mNextFloatedWndPos.y + bounds.height > clntRect.height )
-
-                mNextFloatedWndPos.y = mFloatingPosStep.y;
-
-            bounds.x = mNextFloatedWndPos.x + clntRect.x;
-            bounds.y = mNextFloatedWndPos.y + clntRect.y;
-
-            bounds.width  = pBar->mDimInfo.mSizes[wxCBAR_FLOATING].x;
-            bounds.height = pBar->mDimInfo.mSizes[wxCBAR_FLOATING].y;
-
-            mNextFloatedWndPos.x += mFloatingPosStep.x;
-            mNextFloatedWndPos.y += mFloatingPosStep.y;
-        }
-
-        pMiniFrm->Show( true );
-        RepositionFloatedBar(pMiniFrm->GetBar());
-
-        // FIXME:: this is excessive
-        pBar->mpBarWnd->Show(true);
-    }
-}
-
-void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
-{
-    // first, try to "guess" what was the perviouse state of the bar
-
-    cbDockPane* pPane;
-    cbRowInfo*  pRow;
-
-    if ( LocateBar( pBarInfo, &pRow, &pPane ) )
-    {
-        // ...aha, bar was docked into one of the panes,
-        // remove it from there
-
-        pPane->RemoveBar( pBarInfo );
-    }
-
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
-    {
-        if ( mAllBars[i] == pBarInfo )
-        {
-#if wxCHECK_VERSION(2,3,2)
-            mAllBars.RemoveAt(i);
-#else
-            mAllBars.Remove(i);
-#endif
-            if ( pBarInfo->mpBarWnd ) // hides it's window
-
-                pBarInfo->mpBarWnd->Show( false );
-
-            delete pBarInfo;
-
-            return;
-        }
-    }
-    wxFAIL_MSG(wxT("bar info should be present in the list of all bars of all panes"));
-}
-
-bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo,
-                               cbRowInfo**  ppRow,
-                               cbDockPane** ppPane )
-{
-    (*ppRow)  = NULL;
-    (*ppPane) = NULL;
-
-    int n;
-    for ( n = 0; n != MAX_PANES; ++n )
-    {
-        wxBarIterator i( mPanes[n]->GetRowList() );
-
-        while ( i.Next() )
-
-            if ( &i.BarInfo() == pBarInfo )
-            {
-                (*ppPane) = mPanes[n];
-                (*ppRow ) = &i.RowInfo();
-
-                return true;
-            }
-    }
-
-    return false;
-}
-
-void wxFrameLayout::RecalcLayout( bool repositionBarsNow )
-{
-    mRecalcPending = false;
-
-    int frmWidth, frmHeight;
-    mpFrame->GetClientSize( &frmWidth, &frmHeight );
-
-    int curY = 0;
-    int curX = 0;
-    wxRect rect;
-
-    // pane positioning priorities in decreasing order:
-    // top, bottom, left, right
-
-    // setup TOP pane
-
-    cbDockPane* pPane = mPanes[ FL_ALIGN_TOP ];
-
-    pPane->SetPaneWidth( frmWidth );
-    pPane->RecalcLayout();
-
-    int paneHeight = pPane->GetPaneHeight();
-
-    rect.x      = curX;
-    rect.y      = curY;
-    rect.width  = frmWidth;
-    rect.height = wxMin( paneHeight, frmHeight - curY );
-
-    pPane->SetBoundsInParent( rect );
-
-    curY += paneHeight;
-
-    // setup BOTTOM pane
-
-    pPane = mPanes[ FL_ALIGN_BOTTOM ];
-
-    pPane->SetPaneWidth( frmWidth );
-    pPane->RecalcLayout();
-
-    paneHeight = pPane->GetPaneHeight();
-
-    rect.x      = curX;
-    rect.y      = wxMax( frmHeight - paneHeight, curY );
-    rect.width  = frmWidth;
-    rect.height = frmHeight - rect.y;
-
-    pPane->SetBoundsInParent( rect );
-
-    // setup LEFT pane
-
-    pPane = mPanes[ FL_ALIGN_LEFT ];
-
-                         // bottom pane's y
-    pPane->SetPaneWidth( rect.y - curY );
-
-    pPane->RecalcLayout();
-    paneHeight = pPane->GetPaneHeight();
-
-                  // bottom rect's y
-    rect.height = rect.y - curY;
-    rect.x = curX;
-    rect.y = curY;
-    rect.width  = wxMin( paneHeight, frmWidth );
-
-    pPane->SetBoundsInParent( rect );
-
-    curX += rect.width;
-
-    // setup RIGHT pane
-
-    pPane = mPanes[ FL_ALIGN_RIGHT ];
-
-                         // left pane's height
-    pPane->SetPaneWidth( rect.height );
-
-    pPane->RecalcLayout();
-    paneHeight = pPane->GetPaneHeight();
-
-                  // left pane's height
-    rect.height = rect.height;
-    rect.x = wxMax( frmWidth - paneHeight, curX );
-    rect.y = curY;
-    rect.width  = frmWidth - rect.x;
-
-    pPane->SetBoundsInParent( rect );
-
-    // recalc bounds of the client-window
-
-    mClntWndBounds.x = mPanes[FL_ALIGN_LEFT]->mBoundsInParent.x +
-                       mPanes[FL_ALIGN_LEFT]->mBoundsInParent.width;
-    mClntWndBounds.y = mPanes[FL_ALIGN_TOP ]->mBoundsInParent.y +
-                       mPanes[FL_ALIGN_TOP ]->mBoundsInParent.height;
-
-    mClntWndBounds.width  = mPanes[FL_ALIGN_RIGHT]->mBoundsInParent.x -
-                            mClntWndBounds.x;
-    mClntWndBounds.height = mPanes[FL_ALIGN_BOTTOM]->mBoundsInParent.y -
-                            mClntWndBounds.y;
-
-    if ( repositionBarsNow )
-
-        PositionPanes();
-}
-
-int wxFrameLayout::GetClientHeight()
-{
-    // for better portablility wxWindow::GetSzie() is not used here
-
-    return mClntWndBounds.height;
-}
-
-int wxFrameLayout::GetClientWidth()
-{
-    // for better portablility wxWindow::GetSzie() is not used here
-
-    return mClntWndBounds.width;
-}
-
-void wxFrameLayout::PositionClientWindow()
-{
-    if ( mpFrameClient )
-    {
-        if ( mClntWndBounds.width >= 1 && mClntWndBounds.height >= 1 )
-        {
-            mpFrameClient->SetSize( mClntWndBounds.x,     mClntWndBounds.y,
-                                    mClntWndBounds.width, mClntWndBounds.height, 0 );
-
-            if ( !mpFrameClient->IsShown() )
-
-                mpFrameClient->Show( true );
-        }
-        else
-            mpFrameClient->Show( false );
-    }
-}
-
-void wxFrameLayout::PositionPanes()
-{
-    PositionClientWindow();
-
-    // FOR NOW:: excessive updates!
-    // reposition bars within all panes
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-        mPanes[i]->SizePaneObjects();
-}
-
-void wxFrameLayout::OnSize( wxSizeEvent& event )
-{
-    mpFrame->ProcessEvent( event );
-    event.Skip( false ); // stop its progpagation
-
-    if ( event.GetEventObject() == (wxObject*) mpFrame )
-    {
-        GetUpdatesManager().OnStartChanges();
-        RecalcLayout(true);
-        GetUpdatesManager().OnFinishChanges();
-        GetUpdatesManager().UpdateNow();
-    }
-
-}
-
-/*** protected members ***/
-
-void wxFrameLayout::HideBarWindows()
-{
-    size_t i;
-    for ( i = 0; i != mAllBars.Count(); ++i )
-        if ( mAllBars[i]->mpBarWnd && mAllBars[i]->mState != wxCBAR_FLOATING )
-            mAllBars[i]->mpBarWnd->Show( false );
-
-    // then floated frames
-
-    ShowFloatedWindows( false );
-
-    if ( mpFrameClient )
-
-        mpFrameClient->Show( false );
-}
-
-void wxFrameLayout::UnhookFromFrame()
-{
-    // NOTE:: the SetEvtHandlerEnabled() method is not used
-    //        here, since it is assumed that unhooking layout
-    //        from window may result destroying of the layout itself
-    //
-    //        BUG BUG BUG (wx):: this would not be a problem if
-    //                           wxEvtHandler's destructor checked if
-    //                           this handler is currently the top-most
-    //                           handler of some window, and additionally
-    //                           to the reconnecting itself from the chain.
-    //                           It would also re-setup current event handler
-    //                           of the window using wxWindow::SetEventHandler()
-
-    // FOR NOW::
-
-    if ( mpFrame->GetEventHandler() == this )
-    {
-        mpFrame->PopEventHandler();
-        return;
-    }
-
-    if ( mpFrame )
-    {
-        if ( this == mpFrame->GetEventHandler() )
-        {
-            mpFrame->SetEventHandler( this->GetNextHandler() );
-        }
-        else
-        {
-            wxEvtHandler* pCur = mpFrame->GetEventHandler();
-
-            while ( pCur )
-            {
-                if ( pCur == this )
-                    break;
-
-                pCur = pCur->GetNextHandler();
-            }
-
-            // do not try to unhook ourselves if we're not hooked yet
-            if ( !pCur )
-                return;
-        }
-
-        if ( GetPreviousHandler() )
-            GetPreviousHandler()->SetNextHandler( GetNextHandler() );
-        else
-        {
-            mpFrame->PopEventHandler();
-            return;
-        }
-
-        if ( GetNextHandler() )
-            GetNextHandler()->SetPreviousHandler( GetPreviousHandler() );
-
-        SetNextHandler( NULL );
-        SetPreviousHandler( NULL );
-    }
-}
-
-void wxFrameLayout::HookUpToFrame()
-{
-    // unhook us first, we're already hooked up
-
-    UnhookFromFrame();
-
-    // put ourselves on top
-
-    mpFrame->PushEventHandler( this );
-}
-
-cbDockPane* wxFrameLayout::GetBarPane( cbBarInfo* pBar )
-{
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-        if ( mPanes[i]->BarPresent( pBar ) )
-            return mPanes[i];
-
-    return NULL;
-}
-
-void wxFrameLayout::CreateCursors()
-{
-    /*
-    // FIXME:: The below code somehow doesn't work - cursors remain unchanged
-    char bits[64];
-
-    set_cursor_bits( _gHorizCursorImg, bits, 32, 16 );
-
-    mpHorizCursor = new wxCursor( bits, 32, 16 );
-
-    set_cursor_bits( _gVertCursorImg, bits, 32, 16 );
-
-    mpVertCursor  = new wxCursor( bits, 32, 16 );
-    */
-
-    // FOR NOW:: use standard ones
-
-    mpHorizCursor  = new wxCursor(wxCURSOR_SIZEWE);
-    mpVertCursor   = new wxCursor(wxCURSOR_SIZENS);
-    mpNormalCursor = new wxCursor(wxCURSOR_ARROW );
-    mpDragCursor   = new wxCursor(wxCURSOR_CROSS );
-    mpNECursor     = new wxCursor(wxCURSOR_NO_ENTRY);
-
-    mFloatingPosStep.x = 25;
-    mFloatingPosStep.y = 25;
-
-    mNextFloatedWndPos.x = mFloatingPosStep.x;
-    mNextFloatedWndPos.y = mFloatingPosStep.y;
-}
-
-bool wxFrameLayout::HitTestPane( cbDockPane* pPane, int x, int y )
-{
-    return rect_contains_point( pPane->GetRealRect(), x, y );
-}
-
-cbDockPane* wxFrameLayout::HitTestPanes( const wxRect& rect,
-                                         cbDockPane* pCurPane )
-{
-    // first, give the privilege to the current pane
-
-    if ( pCurPane && rect_hits_rect( pCurPane->GetRealRect(), rect ) )
-
-        return pCurPane;
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
-        if ( pCurPane != mPanes[i] &&
-             rect_hits_rect( mPanes[i]->GetRealRect(), rect ) )
-        {
-            return mPanes[i];
-        }
-    }
-    return 0;
-}
-
-void wxFrameLayout::ForwardMouseEvent( wxMouseEvent& event,
-                                           cbDockPane*   pToPane,
-                                           int           eventType )
-{
-    wxPoint pos( event.m_x, event.m_y );
-    pToPane->FrameToPane( &pos.x, &pos.y );
-
-    if ( eventType == cbEVT_PL_LEFT_DOWN )
-    {
-        cbLeftDownEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-    else if ( eventType == cbEVT_PL_LEFT_DCLICK )
-    {
-        cbLeftDClickEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-    else if ( eventType == cbEVT_PL_LEFT_UP )
-    {
-        cbLeftUpEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-    else if ( eventType == cbEVT_PL_RIGHT_DOWN )
-    {
-        cbRightDownEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-    else if ( eventType == cbEVT_PL_RIGHT_UP )
-    {
-        cbRightUpEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-    else if ( eventType == cbEVT_PL_MOTION )
-    {
-        cbMotionEvent evt( pos, pToPane );
-        FirePluginEvent( evt );
-    }
-}  // wxFrameLayout::ForwardMouseEvent()
-
-
-void wxFrameLayout::RouteMouseEvent( wxMouseEvent& event, int pluginEvtType )
-{
-    if ( mpPaneInFocus )
-
-        ForwardMouseEvent( event, mpPaneInFocus, pluginEvtType );
-    else
-    {
-        int i;
-        for ( i = 0; i != MAX_PANES; ++i )
-        {
-            if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
-            {
-                ForwardMouseEvent( event, mPanes[i], pluginEvtType );
-                return;
-            }
-        }
-    }
-}
-
-/*** event handlers ***/
-
-void wxFrameLayout::OnRButtonDown( wxMouseEvent& event )
-{
-    RouteMouseEvent( event, cbEVT_PL_RIGHT_DOWN );
-}
-
-void wxFrameLayout::OnRButtonUp( wxMouseEvent& event )
-{
-    RouteMouseEvent( event, cbEVT_PL_RIGHT_UP );
-}
-
-void wxFrameLayout::OnLButtonDown( wxMouseEvent& event )
-{
-    RouteMouseEvent( event, cbEVT_PL_LEFT_DOWN );
-}
-
-void wxFrameLayout::OnLDblClick( wxMouseEvent& event )
-{
-    RouteMouseEvent( event, cbEVT_PL_LEFT_DCLICK );
-}
-
-void wxFrameLayout::OnLButtonUp( wxMouseEvent& event )
-{
-    RouteMouseEvent( event, cbEVT_PL_LEFT_UP );
-}
-
-void wxFrameLayout::OnMouseMove( wxMouseEvent& event )
-{
-    if ( mpPaneInFocus )
-
-        ForwardMouseEvent( event, mpPaneInFocus, cbEVT_PL_MOTION );
-    else
-    {
-        int i;
-        for ( i = 0; i != MAX_PANES; ++i )
-        {
-            if ( HitTestPane( mPanes[i], event.m_x, event.m_y ) )
-            {
-                if ( mpLRUPane && mpLRUPane != mPanes[i] )
-                {
-                    // simulate "mouse-leave" event
-                    ForwardMouseEvent( event, mpLRUPane, cbEVT_PL_MOTION );
-                }
-
-                ForwardMouseEvent( event, mPanes[i], cbEVT_PL_MOTION );
-
-                mpLRUPane = mPanes[i];
-
-                return;
-            }
-        }
-    }
-
-    if ( mpLRUPane )
-    {
-        // simulate "mouse-leave" event
-        ForwardMouseEvent( event, mpLRUPane, cbEVT_PL_MOTION );
-        mpLRUPane = 0;
-    }
-}
-
-void wxFrameLayout::OnPaint( wxPaintEvent& event )
-{
-    if ( mRecalcPending  )
-        RecalcLayout( true );
-
-    wxPaintDC dc(mpFrame);
-
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
-        wxRect& rect = mPanes[i]->mBoundsInParent;
-
-        dc.SetClippingRegion( rect.x, rect.y, rect.width, rect.height );
-
-        mPanes[i]->PaintPane(dc);
-
-        dc.DestroyClippingRegion();
-    }
-
-    event.Skip();
-}
-
-void wxFrameLayout::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
-    // do nothing
-}
-
-void wxFrameLayout::OnIdle( wxIdleEvent& event )
-{
-    wxWindow* focus = wxWindow::FindFocus();
-
-    if ( !focus && mCheckFocusWhenIdle )
-    {
-        wxMessageBox(wxT("Hi, no more focus in this app!"));
-
-        mCheckFocusWhenIdle = false;
-        //ShowFloatedWindows( false );
-    }
-
-    mCheckFocusWhenIdle = false;
-
-    event.Skip();
-}
-
-void wxFrameLayout::GetPaneProperties( cbCommonPaneProperties& props, int alignment )
-{
-    props = mPanes[alignment]->mProps;
-}
-
-void wxFrameLayout::SetPaneProperties( const cbCommonPaneProperties& props, int paneMask )
-{
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
-        if ( mPanes[i]->MatchesMask( paneMask ) )
-            mPanes[i]->mProps = props;
-    }
-}
-
-void wxFrameLayout::SetMargins( int top, int bottom, int left, int right,
-                                int paneMask )
-{
-    int i;
-    for ( i = 0; i != MAX_PANES; ++i )
-    {
-        cbDockPane& pane = *mPanes[i];
-
-        if ( pane.MatchesMask( paneMask ) )
-        {
-            pane.mTopMargin = top;
-            pane.mBottomMargin = bottom;
-            pane.mLeftMargin = left;
-            pane.mRightMargin = right;
-        }
-    }
-}
-
-void wxFrameLayout::SetPaneBackground( const wxColour& colour )
-{
-    mBorderPen.SetColour( colour );
-}
-
-void wxFrameLayout::RefreshNow( bool recalcLayout )
-{
-    if ( recalcLayout )
-        RecalcLayout( true );
-
-    if ( mpFrame )
-        mpFrame->Refresh();
-}
-
-/*** plugin-related methods ***/
-
-void wxFrameLayout::FirePluginEvent( cbPluginEvent& event )
-{
-    // check state of input capture, before processing the event
-
-    if ( mpCaputesInput )
-    {
-        bool isInputEvt = true;
-#if wxCHECK_VERSION(2,3,0)
-        if ( event.GetEventType() != cbEVT_PL_LEFT_DOWN &&
-             event.GetEventType() != cbEVT_PL_LEFT_UP &&
-             event.GetEventType() != cbEVT_PL_RIGHT_DOWN &&
-             event.GetEventType() != cbEVT_PL_RIGHT_UP &&
-             event.GetEventType() != cbEVT_PL_MOTION )
-            isInputEvt = false;
-#else
-        switch ( event.m_eventType )
-        {
-            case cbEVT_PL_LEFT_DOWN  : break;
-            case cbEVT_PL_LEFT_UP    : break;
-            case cbEVT_PL_RIGHT_DOWN : break;
-            case cbEVT_PL_RIGHT_UP   : break;
-            case cbEVT_PL_MOTION     : break;
-
-            default : isInputEvt = false; break;
-        }
-#endif  // #if wxCHECK_VERSION(2,3,0)
-
-        if ( isInputEvt )
-        {
-            mpCaputesInput->ProcessEvent( event );
-            return;
-        }
-    }
-
-    GetTopPlugin().ProcessEvent( event );
-}
-
-void wxFrameLayout::CaptureEventsForPlugin ( cbPluginBase* pPlugin )
-{
-    // cannot capture events for more than one plugin at a time
-    wxASSERT( mpCaputesInput == NULL );
-
-    mpCaputesInput = pPlugin;
-
-}
-
-void wxFrameLayout::ReleaseEventsFromPlugin( cbPluginBase* WXUNUSED(pPlugin) )
-{
-    // events should be captured first
-    wxASSERT( mpCaputesInput != NULL );
-
-    mpCaputesInput = NULL;
-}
-
-void wxFrameLayout::CaptureEventsForPane( cbDockPane* toPane )
-{
-    // cannot capture events twice (without releasing)
-    wxASSERT( mpPaneInFocus == NULL );
-
-    mpFrame->CaptureMouse();
-
-    mpPaneInFocus = toPane;
-}
-
-void wxFrameLayout::ReleaseEventsFromPane( cbDockPane* WXUNUSED(fromPane) )
-{
-    // cannot release events without capturing them
-    wxASSERT( mpPaneInFocus != NULL );
-
-    mpFrame->ReleaseMouse();
-
-    mpPaneInFocus = NULL;
-}
-
-cbPluginBase& wxFrameLayout::GetTopPlugin()
-{
-    if ( !mpTopPlugin )
-
-        PushDefaultPlugins(); // automatic configuration
-
-    return *mpTopPlugin;
-}
-
-void wxFrameLayout::SetTopPlugin( cbPluginBase* pPlugin )
-{
-    mpTopPlugin = pPlugin;
-}
-
-bool wxFrameLayout::HasTopPlugin()
-{
-    return ( mpTopPlugin != NULL );
-}
-
-void wxFrameLayout::PushPlugin( cbPluginBase* pPlugin )
-{
-    if ( !mpTopPlugin )
-
-        mpTopPlugin = pPlugin;
-    else
-    {
-        pPlugin->SetNextHandler( mpTopPlugin );
-
-        mpTopPlugin->SetPreviousHandler( pPlugin );
-
-        mpTopPlugin = pPlugin;
-    }
-
-    mpTopPlugin->OnInitPlugin(); // notification
-}
-
-void wxFrameLayout::PopPlugin()
-{
-    wxASSERT( mpTopPlugin ); // DBG:: at least one plugin should be present
-
-    cbPluginBase* pPopped = mpTopPlugin;
-
-    mpTopPlugin = (cbPluginBase*)mpTopPlugin->GetNextHandler();
-
-    delete pPopped;
-}
-
-void wxFrameLayout::PopAllPlugins()
-{
-    while( mpTopPlugin ) PopPlugin();
-}
-
-void wxFrameLayout::PushDefaultPlugins()
-{
-    // FIXME:: to much of the stuff for the default...
-
-    AddPlugin( CLASSINFO( cbRowLayoutPlugin       ) );
-    AddPlugin( CLASSINFO( cbBarDragPlugin         ) );
-    AddPlugin( CLASSINFO( cbPaneDrawPlugin ) );
-}
-
-void wxFrameLayout::AddPlugin( wxClassInfo* pPlInfo, int paneMask )
-{
-    if ( FindPlugin ( pPlInfo ) ) return; // same type of plugin cannot be added twice
-
-    cbPluginBase* pObj = (cbPluginBase*)pPlInfo->CreateObject();
-
-    wxASSERT(pObj); // DBG:: plugin's class should be dynamic
-
-    pObj->mPaneMask = paneMask;
-    pObj->mpLayout  = this;
-
-    PushPlugin( pObj );
-}
-
-void wxFrameLayout::AddPluginBefore( wxClassInfo* pNextPlInfo, wxClassInfo* pPlInfo,
-                                       int paneMask )
-{
-    wxASSERT( pNextPlInfo != pPlInfo ); // DBG:: no sense
-
-    cbPluginBase* pNextPl = FindPlugin( pNextPlInfo );
-
-    if ( !pNextPl )
-    {
-        AddPlugin( pPlInfo, paneMask );
-
-        return;
-    }
-
-    // remove existing one if present
-
-    cbPluginBase* pExistingPl = FindPlugin( pPlInfo );
-
-    if ( pExistingPl ) RemovePlugin( pPlInfo );
-
-    // create an instance
-
-    cbPluginBase* pNewPl = (cbPluginBase*)pPlInfo->CreateObject();
-
-    wxASSERT(pNewPl); // DBG:: plugin's class should be dynamic
-
-    // insert it to the chain
-
-    if ( pNextPl->GetPreviousHandler() )
-        pNextPl->GetPreviousHandler()->SetNextHandler( pNewPl );
-    else
-        mpTopPlugin = pNewPl;
-
-    pNewPl->SetNextHandler( pNextPl );
-
-    pNewPl->SetPreviousHandler( pNextPl->GetPreviousHandler() );
-
-    pNextPl->SetPreviousHandler( pNewPl );
-
-    // set it up
-
-    pNewPl->mPaneMask = paneMask;
-    pNewPl->mpLayout  = this;
-
-    pNewPl->OnInitPlugin();
-}
-
-void wxFrameLayout::RemovePlugin( wxClassInfo* pPlInfo )
-{
-    cbPluginBase* pPlugin = FindPlugin( pPlInfo );
-
-    if ( !pPlugin ) return; // it's OK to remove not-existing plugin ;-)
-
-    if ( pPlugin->GetPreviousHandler() == NULL )
-
-        mpTopPlugin = (cbPluginBase*)pPlugin->GetNextHandler();
-
-    delete pPlugin;
-}
-
-cbPluginBase* wxFrameLayout::FindPlugin( wxClassInfo* pPlInfo )
-{
-    cbPluginBase *pCur = mpTopPlugin;
-
-    while( pCur )
-    {
-        // NOTE:: it might appear useful matching plugin
-        //        classes "polymorphically":
-
-        if ( pCur->GetClassInfo()->IsKindOf( pPlInfo ) )
-
-            return pCur;
-
-        pCur = (cbPluginBase*)pCur->GetNextHandler();
-    }
-
-    return NULL;
-}
-
-/***** Implementation for class cbUpdateMgrData *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbUpdateMgrData, wxObject )
-
-cbUpdateMgrData::cbUpdateMgrData()
-
-    : mPrevBounds( -1,-1,0,0 ),
-      mIsDirty( true ),           // inidicate initial change
-      mpCustomData(0)
-{}
-
-void cbUpdateMgrData::StoreItemState( const wxRect& boundsInParent )
-{
-    mPrevBounds = boundsInParent;
-}
-
-void cbUpdateMgrData::SetDirty( bool isDirty )
-{
-    mIsDirty = isDirty;
-}
-
-void cbUpdateMgrData::SetCustomData( wxObject* pCustomData )
-{
-    mpCustomData = pCustomData;
-}
-
-/***** Implementation for class cbDockPane *****/
-
-void wxBarIterator::Reset()
-{
-    mpRow = ( mpRows->Count() ) ? (*mpRows)[0] : NULL;
-    mpBar = NULL;
-}
-
-wxBarIterator::wxBarIterator( RowArrayT& rows )
-
-    : mpRows( &rows ),
-      mpRow ( NULL  ),
-      mpBar ( NULL  )
-{
-    Reset();
-}
-
-bool wxBarIterator::Next()
-{
-    if ( mpRow )
-    {
-        if ( mpBar )
-            mpBar = mpBar->mpNext;
-        else
-        {
-            if ( mpRow->mBars.GetCount() == 0 )
-            {
-                return false;
-            }
-
-            mpBar = mpRow->mBars[0];
-        }
-
-        if ( !mpBar )
-        {
-            // skip to the next row
-
-            mpRow = mpRow->mpNext;
-
-            if ( mpRow )
-                mpBar = mpRow->mBars[0];
-            else
-                return false;
-        }
-
-        return true;
-    }
-    else
-        return false;
-}
-
-cbBarInfo& wxBarIterator::BarInfo()
-{
-    return *mpBar;
-}
-
-cbRowInfo& wxBarIterator::RowInfo()
-{
-    return *mpRow;
-}
-
-/***** Implementation for class cbBarDimHandlerBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbBarDimHandlerBase, wxObject )
-
-cbBarDimHandlerBase::cbBarDimHandlerBase()
-    : mRefCount(0)
-{}
-
-void cbBarDimHandlerBase::AddRef()
-{
-    ++mRefCount;
-}
-
-void cbBarDimHandlerBase::RemoveRef()
-{
-    if ( --mRefCount <= 0 ) delete this;
-}
-
-/***** Implementation for class cbDimInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDimInfo, wxObject )
-
-cbDimInfo::cbDimInfo()
-
-    : mVertGap ( 0 ),
-      mHorizGap( 0 ),
-
-      mIsFixed(true),
-      mpHandler( NULL )
-{
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
-    {
-        mSizes[i].x = 20;
-        mSizes[i].y = 20;
-
-        mBounds[i] = wxRect( -1,-1,-1,-1 );
-    }
-}
-
-cbDimInfo::cbDimInfo( cbBarDimHandlerBase* pDimHandler,
-                      bool                 isFixed  )
-
-    : mVertGap ( 0 ),
-      mHorizGap( 0 ),
-      mIsFixed ( isFixed  ),
-
-      mpHandler( pDimHandler )
-{
-    if ( mpHandler )
-    {
-        // int vtad = *((int*)mpHandler);
-        mpHandler->AddRef();
-    }
-
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
-    {
-        mSizes[i].x = -1;
-        mSizes[i].y = -1;
-
-        mBounds[i] = wxRect( -1,-1,-1,-1 );
-    }
-}
-
-cbDimInfo::cbDimInfo( int dh_x, int dh_y,
-                      int dv_x, int dv_y,
-                      int f_x,  int f_y,
-
-                      bool isFixed,
-                      int horizGap,
-                      int vertGap,
-
-                      cbBarDimHandlerBase* pDimHandler
-                    )
-    : mVertGap  ( vertGap   ),
-      mHorizGap ( horizGap  ),
-      mIsFixed  ( isFixed   ),
-      mpHandler( pDimHandler )
-{
-    if ( mpHandler )
-    {
-        // int vtad = *((int*)mpHandler);
-        mpHandler->AddRef();
-    }
-
-    mSizes[wxCBAR_DOCKED_HORIZONTALLY].x = dh_x;
-    mSizes[wxCBAR_DOCKED_HORIZONTALLY].y = dh_y;
-    mSizes[wxCBAR_DOCKED_VERTICALLY  ].x = dv_x;
-    mSizes[wxCBAR_DOCKED_VERTICALLY  ].y = dv_y;
-    mSizes[wxCBAR_FLOATING           ].x = f_x;
-    mSizes[wxCBAR_FLOATING           ].y = f_y;
-
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
-        mBounds[i] = wxRect( -1,-1,-1,-1 );
-}
-
-cbDimInfo::cbDimInfo( int x, int y,
-                      bool isFixed, int gap,
-                      cbBarDimHandlerBase* pDimHandler)
-  : mVertGap  ( gap ),
-    mHorizGap ( gap ),
-    mIsFixed  ( isFixed ),
-    mpHandler( pDimHandler )
-{
-    if ( mpHandler )
-    {
-        // int vtad = *((int*)mpHandler);
-        mpHandler->AddRef();
-    }
-
-    mSizes[wxCBAR_DOCKED_HORIZONTALLY].x = x;
-    mSizes[wxCBAR_DOCKED_HORIZONTALLY].y = y;
-    mSizes[wxCBAR_DOCKED_VERTICALLY  ].x = x;
-    mSizes[wxCBAR_DOCKED_VERTICALLY  ].y = y;
-    mSizes[wxCBAR_FLOATING           ].x = x;
-    mSizes[wxCBAR_FLOATING           ].y = y;
-
-    size_t i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
-        mBounds[i] = wxRect( -1,-1,-1,-1 );
-}
-
-cbDimInfo::~cbDimInfo()
-{
-    if ( mpHandler )
-
-        mpHandler->RemoveRef();
-}
-
-const cbDimInfo& cbDimInfo::operator=( const cbDimInfo& other )
-{
-    if ( this == &other )
-        return *this;
-
-    int i;
-    for ( i = 0; i != MAX_BAR_STATES; ++i )
-        mSizes[i] = other.mSizes[i];
-
-    mIsFixed  = other.mIsFixed;
-    mpHandler = other.mpHandler;
-
-    mVertGap  = other.mVertGap;
-    mHorizGap = other.mHorizGap;
-
-    if ( mpHandler )
-
-        mpHandler->AddRef();
-
-    return *this;
-}
-
-/***** Implementation for structure cbCommonPaneProperties *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbCommonPaneProperties, wxObject )
-
-cbCommonPaneProperties::cbCommonPaneProperties(void)
-
-    : mRealTimeUpdatesOn    ( true  ),
-      mOutOfPaneDragOn      ( true  ),
-      mExactDockPredictionOn( false ),
-      mNonDestructFrictionOn( false ),
-      mShow3DPaneBorderOn   ( true  ),
-      mBarFloatingOn        ( false ),
-      mRowProportionsOn     ( false ),
-      mColProportionsOn     ( true  ),
-      mBarCollapseIconsOn   ( false ),
-      mBarDragHintsOn       ( false ),
-
-      mMinCBarDim( 16, 16 ),
-      mResizeHandleSize( 4 )
-{}
-
-cbCommonPaneProperties::cbCommonPaneProperties(const cbCommonPaneProperties& props)
-
-    : wxObject(),
-      mRealTimeUpdatesOn    (props.mRealTimeUpdatesOn),
-      mOutOfPaneDragOn      (props.mOutOfPaneDragOn),
-      mExactDockPredictionOn(props.mExactDockPredictionOn),
-      mNonDestructFrictionOn(props.mNonDestructFrictionOn),
-      mShow3DPaneBorderOn   (props.mShow3DPaneBorderOn),
-      mBarFloatingOn        (props.mBarFloatingOn),
-      mRowProportionsOn     (props.mRowProportionsOn),
-      mColProportionsOn     (props.mColProportionsOn),
-      mBarCollapseIconsOn   (props.mBarCollapseIconsOn),
-      mBarDragHintsOn       (props.mBarDragHintsOn),
-
-      mMinCBarDim(props.mMinCBarDim),
-      mResizeHandleSize(props.mResizeHandleSize)
-{}
-
-cbCommonPaneProperties& cbCommonPaneProperties::operator=(const cbCommonPaneProperties& props)
-{
-    mRealTimeUpdatesOn     = props.mRealTimeUpdatesOn;
-    mOutOfPaneDragOn       = props.mOutOfPaneDragOn;
-    mExactDockPredictionOn = props.mExactDockPredictionOn;
-    mNonDestructFrictionOn = props.mNonDestructFrictionOn;
-    mShow3DPaneBorderOn    = props.mShow3DPaneBorderOn;
-    mBarFloatingOn         = props.mBarFloatingOn;
-    mRowProportionsOn      = props.mRowProportionsOn;
-    mColProportionsOn      = props.mColProportionsOn;
-    mBarCollapseIconsOn    = props.mBarCollapseIconsOn;
-    mBarDragHintsOn        = props.mBarDragHintsOn;
-
-    mMinCBarDim            = props.mMinCBarDim;
-    mResizeHandleSize      = props.mResizeHandleSize;
-
-    return *this;
-}
-
-/***** Implementation for class cbRowInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowInfo, wxObject )
-
-cbRowInfo::cbRowInfo(void)
-
-    : mNotFixedBarsCnt( false ),
-      mpNext          ( NULL ),
-      mpPrev          ( NULL ),
-      mpExpandedBar   ( NULL )
-{}
-
-cbRowInfo::~cbRowInfo()
-{
-    // nothing! all bars are removed using global bar
-    // list in wxFrameLayout class
-}
-
-/***** Implementation for class cbBarInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbBarInfo, wxObject )
-
-cbBarInfo::cbBarInfo(void)
-
-    : mpRow( NULL ),
-      mFloatingOn( true ),
-      mpNext( NULL ),
-      mpPrev( NULL )
-{}
-
-cbBarInfo::~cbBarInfo()
-{
-    // nothing
-}
-
-/***** Implementation for class cbDockPane *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDockPane, wxObject )
-
-// FIXME:: how to eliminate these cut&pasted constructors?
-
-cbDockPane::cbDockPane(void)
-    : mLeftMargin  ( 1 ),
-      mRightMargin ( 1 ),
-      mTopMargin   ( 1 ),
-      mBottomMargin( 1 ),
-      mPaneWidth ( 32768     ), // fake-up very large pane dims,
-                                // since the real dimensions of the pane may not
-                                // be known, while inserting bars initially
-      mPaneHeight( 32768     ),
-      mAlignment ( -1   ),
-      mpLayout   ( 0 ),
-      mpStoredRow( NULL )
-{}
-
-cbDockPane::cbDockPane( int alignment, wxFrameLayout* pPanel )
-
-    :  mLeftMargin  ( 1 ),
-      mRightMargin ( 1 ),
-      mTopMargin   ( 1 ),
-      mBottomMargin( 1 ),
-      mPaneWidth ( 32768     ), // fake-up very large pane dims,
-                                // since the real dimensions of the pane may not
-                                // be known, while inserting bars initially
-      mPaneHeight( 32768     ),
-      mAlignment ( alignment ),
-      mpLayout   ( pPanel    ),
-      mpStoredRow( NULL )
-{}
-
-cbDockPane::~cbDockPane()
-{
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-        delete mRows[i];
-
-    WX_CLEAR_LIST(wxList,mRowShapeData)
-
-    // NOTE:: control bar infromation structures are cleaned-up
-    //        in wxFrameLayout's destructor, using global control-bar list
-}
-
-void cbDockPane::SetMargins( int top, int bottom, int left, int right )
-{
-    mTopMargin    = top;
-    mBottomMargin = bottom;
-    mLeftMargin   = left;
-    mRightMargin  = right;
-}
-
-/*** helpers of cbDockPane ***/
-
-void cbDockPane::PaintBarDecorations( cbBarInfo* pBar, wxDC& dc )
-{
-    cbDrawBarDecorEvent evt( pBar, dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintBarHandles( cbBarInfo* pBar, wxDC& dc )
-{
-    cbDrawBarHandlesEvent evt( pBar, dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintBar( cbBarInfo* pBar, wxDC& dc )
-{
-    PaintBarDecorations( pBar, dc );
-    PaintBarHandles( pBar, dc );
-}
-
-void cbDockPane::PaintRowHandles( cbRowInfo* pRow, wxDC& dc )
-{
-    cbDrawRowHandlesEvent evt( pRow, dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-
-    cbDrawRowDecorEvent evt1( pRow, dc, this );
-
-    mpLayout->FirePluginEvent( evt1 );
-}
-
-void cbDockPane::PaintRowBackground ( cbRowInfo* pRow, wxDC& dc )
-{
-    cbDrawRowBkGroundEvent evt( pRow, dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintRowDecorations( cbRowInfo* pRow, wxDC& dc )
-{
-    size_t i;
-
-    // decorations first
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-
-        PaintBarDecorations( pRow->mBars[i], dc );
-
-    // then handles if present
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-
-        PaintBarHandles( pRow->mBars[i], dc );
-}
-
-void cbDockPane::PaintRow( cbRowInfo* pRow, wxDC& dc )
-{
-    PaintRowBackground ( pRow, dc );
-    PaintRowDecorations( pRow, dc );
-    PaintRowHandles    ( pRow, dc );
-}
-
-void cbDockPane::PaintPaneBackground( wxDC& dc )
-{
-    cbDrawPaneBkGroundEvent evt( dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintPaneDecorations( wxDC& dc )
-{
-    cbDrawPaneDecorEvent evt( dc, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::PaintPane( wxDC& dc )
-{
-    size_t i;
-
-    PaintPaneBackground( dc );
-
-    // first decorations
-    for ( i = 0; i != mRows.Count(); ++i )
-    {
-        PaintRowBackground( mRows[i], dc );
-        PaintRowDecorations( mRows[i], dc );
-    }
-
-    // than handles
-    for ( i = 0; i != mRows.Count(); ++i )
-        PaintRowHandles( mRows[i], dc );
-
-    // and finally
-    PaintPaneDecorations( dc );
-}
-
-void cbDockPane::SizeBar( cbBarInfo* pBar )
-{
-    cbSizeBarWndEvent evt( pBar, this );
-
-    mpLayout->FirePluginEvent( evt );
-    return;
-}
-
-void cbDockPane::SizeRowObjects( cbRowInfo* pRow )
-{
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-        SizeBar( pRow->mBars[i] );
-}
-
-void cbDockPane::SizePaneObjects()
-{
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-        SizeRowObjects( mRows[i] );
-}
-
-wxDC* cbDockPane::StartDrawInArea( const wxRect& area )
-{
-    wxDC* pDc = 0;
-
-    cbStartDrawInAreaEvent evt( area, &pDc, this );
-
-    mpLayout->FirePluginEvent( evt );
-
-    return pDc;
-}
-
-void cbDockPane::FinishDrawInArea( const wxRect& area )
-{
-    cbFinishDrawInAreaEvent evt( area, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-bool cbDockPane::IsFixedSize( cbBarInfo* pInfo )
-{
-    return ( pInfo->mDimInfo.mIsFixed );
-}
-
-int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow )
-{
-    int cnt = 0;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            ++cnt;
-    }
-
-    return cnt;
-}
-
-void cbDockPane::RemoveBar( cbBarInfo* pBar )
-{
-    bool needsRestoring = mProps.mNonDestructFrictionOn &&
-                          mpStoredRow == pBar->mpRow;
-
-    cbRemoveBarEvent evt( pBar, this );
-
-    mpLayout->FirePluginEvent( evt );
-
-    if ( needsRestoring )
-    {
-        SetRowShapeData( mpStoredRow, &mRowShapeData );
-
-        mpStoredRow = NULL;
-    }
-}
-
-void cbDockPane::SyncRowFlags( cbRowInfo* pRow )
-{
-    // setup mHasOnlyFixedBars flag for the row information
-    pRow->mHasOnlyFixedBars = true;
-
-    pRow->mNotFixedBarsCnt = 0;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        bar.mpRow = pRow;
-
-        if ( !bar.IsFixed() )
-        {
-            pRow->mHasOnlyFixedBars = false;
-            ++pRow->mNotFixedBarsCnt;
-        }
-    }
-}
-
-void cbDockPane::FrameToPane( int* x, int* y )
-{
-    *x -= mLeftMargin;
-    *y -= mTopMargin;
-
-    if ( mAlignment == FL_ALIGN_TOP ||
-         mAlignment == FL_ALIGN_BOTTOM
-       )
-    {
-        *x -= mBoundsInParent.x;
-        *y -= mBoundsInParent.y;
-    }
-    else
-    {
-        int rx = *x, ry = *y;
-
-        *x = ry - mBoundsInParent.y;
-
-        *y = rx - mBoundsInParent.x;
-    }
-}
-
-void cbDockPane::PaneToFrame( int* x, int* y )
-{
-    if ( mAlignment == FL_ALIGN_TOP ||
-         mAlignment == FL_ALIGN_BOTTOM
-       )
-    {
-        *x += mBoundsInParent.x;
-        *y += mBoundsInParent.y;
-    }
-    else
-    {
-        int rx = *x, ry = *y;
-
-        *x = ry + mBoundsInParent.x;
-
-        *y = mBoundsInParent.y + rx;
-    }
-
-    *x += mLeftMargin;
-    *y += mTopMargin;
-}
-
-void cbDockPane::FrameToPane( wxRect* pRect )
-{
-    wxPoint upperLeft ( pRect->x, pRect->y );
-    wxPoint lowerRight( pRect->x + pRect->width,
-                        pRect->y + pRect->height );
-
-    FrameToPane( &upperLeft.x,  &upperLeft.y  );
-    FrameToPane( &lowerRight.x, &lowerRight.y );
-
-    pRect->x = wxMin(upperLeft.x,lowerRight.x);
-    pRect->y = wxMin(upperLeft.y,lowerRight.y);
-
-    pRect->width  = abs( lowerRight.x - upperLeft.x );
-    pRect->height = abs( lowerRight.y - upperLeft.y );
-}
-
-void cbDockPane::PaneToFrame( wxRect* pRect )
-{
-    wxPoint upperLeft ( pRect->x, pRect->y );
-    wxPoint lowerRight( pRect->x + pRect->width,
-                        pRect->y + pRect->height );
-
-    PaneToFrame( &upperLeft.x,  &upperLeft.y  );
-    PaneToFrame( &lowerRight.x, &lowerRight.y );
-
-    //wxRect newRect = wxRect( upperLeft, lowerRight );
-
-    pRect->x = wxMin(upperLeft.x,lowerRight.x);
-    pRect->y = wxMin(upperLeft.y,lowerRight.y);
-
-    pRect->width  = abs( lowerRight.x - upperLeft.x );
-    pRect->height = abs( lowerRight.y - upperLeft.y );
-}
-
-int cbDockPane::GetRowAt( int paneY )
-{
-    if ( paneY < 0 )
-        return -1;
-
-    int curY = 0;
-
-    size_t i = 0;
-
-    for ( ; i != mRows.Count(); ++i )
-    {
-        int rowHeight = mRows[i]->mRowHeight;
-
-        int third = rowHeight/3;
-
-        if ( paneY >= curY && paneY < curY + third )
-            return i-1;
-
-        if ( paneY >= curY + third && paneY < curY + rowHeight - third )
-            return i;
-
-        curY += rowHeight;
-    }
-
-    return i;
-}
-
-int cbDockPane::GetRowAt( int upperY, int lowerY )
-{
-    /*
-    // OLD STUFF::
-    int range    = lowerY - upperY;
-    int oneThird = range / 3;
-
-    wxNode* pRow = mRows.GetFirst();
-    int row = 0;
-    int curY = 0;
-
-    if ( lowerY <= 0 ) return -1;
-
-    while( pRow )
-    {
-        int rowHeight = GetRowHeight( (wxList*)pRow->GetData() );
-
-        if ( upperY >= curY &&
-             lowerY < curY ) return row;
-
-        if ( upperY <= curY &&
-             lowerY >= curY &&
-             curY - upperY >= oneThird ) return row-1;
-
-        if ( ( upperY <  curY + rowHeight &&
-               lowerY >= curY + rowHeight &&
-               curY + rowHeight - lowerY >= oneThird )
-           )
-            return row+1;
-
-        if ( lowerY <= curY + rowHeight ) return row;
-
-        ++row;
-        curY += rowHeight;
-        pRow = pRow->GetNext();
-    }
-    */
-
-    int mid = upperY + (lowerY - upperY)/2;
-
-    if ( mid < 0 )
-        return -1;
-
-    int curY = 0;
-    size_t i = 0;
-
-    for ( ; i != mRows.Count(); ++i )
-    {
-        int rowHeight = mRows[i]->mRowHeight;
-
-        if ( mid >= curY && mid < curY + rowHeight ) return i;
-
-        curY += rowHeight;
-    }
-
-    return i;
-}
-
-int cbDockPane::GetRowY( cbRowInfo* pRow )
-{
-    int curY = 0;
-
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-    {
-        if ( mRows[i] == pRow )
-            break;
-
-        curY += mRows[i]->mRowHeight;
-    }
-
-    return curY;
-}
-
-bool cbDockPane::HasNotFixedRowsAbove( cbRowInfo* pRow )
-{
-    while ( pRow->mpPrev )
-    {
-        pRow = pRow->mpPrev;
-
-        if ( pRow->mHasOnlyFixedBars )
-
-            return true;
-    }
-
-    return false;
-}
-
-bool cbDockPane::HasNotFixedRowsBelow( cbRowInfo* pRow )
-{
-    while( pRow->mpNext )
-    {
-        pRow = pRow->mpNext;
-
-        if ( pRow->mHasOnlyFixedBars )
-
-            return true;
-    }
-
-    return false;
-}
-
-bool cbDockPane::HasNotFixedBarsLeft( cbBarInfo* pBar )
-{
-    while( pBar->mpPrev )
-    {
-        pBar = pBar->mpPrev;
-
-        if ( pBar->IsFixed() )
-
-            return true;
-    }
-
-    return false;
-}
-
-bool cbDockPane::HasNotFixedBarsRight( cbBarInfo* pBar )
-{
-    while( pBar->mpNext )
-    {
-        pBar = pBar->mpNext;
-
-        if ( pBar->IsFixed() )
-
-            return true;
-    }
-
-    return false;
-}
-
-void cbDockPane::CalcLengthRatios( cbRowInfo* pInRow )
-{
-    size_t i;
-
-    int totalWidth = 0;
-
-    // calc current-maximal-total-length of all maximized bars
-
-    for ( i = 0; i != pInRow->mBars.GetCount(); ++i )
-    {
-        cbBarInfo& bar = *pInRow->mBars[i];
-
-        if ( !bar.IsFixed() )
-            totalWidth += bar.mBounds.width;
-    }
-
-    // set up percentages of occupied space for each maximized bar
-
-    for ( i = 0; i != pInRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pInRow->mBars[i];
-
-        if ( !bar.IsFixed() )
-            bar.mLenRatio = double(bar.mBounds.width)/double(totalWidth);
-    }
-}
-
-void cbDockPane::RecalcRowLayout( cbRowInfo* pRow )
-{
-    cbLayoutRowEvent evt( pRow, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::ExpandBar( cbBarInfo* pBar )
-{
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    if ( !pBar->mpRow->mpExpandedBar )
-    {
-        // save ratios only when there arent any bars expanded yet
-
-        cbArrayFloat& ratios = pBar->mpRow->mSavedRatios;
-
-        ratios.Clear();
-        ratios.Alloc( pBar->mpRow->mNotFixedBarsCnt );
-
-        cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
-        while( pCur )
-        {
-            if ( !pCur->IsFixed() )
-            {
-                ratios.Add( 0.0 );
-                ratios[ ratios.GetCount() - 1 ] = pCur->mLenRatio;
-            }
-
-            pCur = pCur->mpNext;
-        }
-    }
-
-    cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
-    while( pCur )
-    {
-        pCur->mLenRatio = 0.0; // minimize the rest
-
-        pCur = pCur->mpNext;
-    }
-
-    pBar->mLenRatio     = 1.0; // 100%
-    pBar->mBounds.width = 0;
-
-    pBar->mpRow->mpExpandedBar = pBar;
-
-    mpLayout->RecalcLayout( false );
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbDockPane::ContractBar( cbBarInfo* pBar )
-{
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    // FIXME: What's the purpose of this???
-    // double ratio = 1.0/ double( pBar->mpRow->mNotFixedBarsCnt );
-
-    // restore ratios which were present before expansion
-
-    cbBarInfo* pCur = pBar->mpRow->mBars[0];
-
-    cbArrayFloat& ratios = pBar->mpRow->mSavedRatios;
-
-    size_t i = 0;
-
-    while( pCur )
-    {
-        if ( !pCur->IsFixed() )
-        {
-            pCur->mLenRatio = ratios[i];
-            ++i;
-        }
-
-        pCur = pCur->mpNext;
-    }
-
-    ratios.Clear();
-    ratios.Shrink();
-
-    pBar->mpRow->mpExpandedBar = NULL;
-
-    mpLayout->RecalcLayout( false );
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbDockPane::InitLinksForRow( cbRowInfo* pRow )
-{
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        if ( i == 0 )
-            bar.mpPrev = NULL;
-        else
-            bar.mpPrev = pRow->mBars[i-1];
-
-        if ( i == pRow->mBars.Count() - 1 )
-            bar.mpNext = NULL;
-        else
-            bar.mpNext = pRow->mBars[i+1];
-    }
-}
-
-void cbDockPane::InitLinksForRows()
-{
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-    {
-        cbRowInfo& row = *mRows[i];
-
-        if ( i == 0 )
-            row.mpPrev = NULL;
-        else
-            row.mpPrev = mRows[i-1];
-
-        if ( i == mRows.Count() - 1 )
-            row.mpNext = NULL;
-        else
-            row.mpNext = mRows[i+1];
-    }
-}
-
-void cbDockPane::DoInsertBar( cbBarInfo* pBar, int rowNo )
-{
-    cbRowInfo* pRow;
-
-    if ( rowNo == -1 || rowNo >= (int)mRows.Count() )
-    {
-        pRow = new cbRowInfo();
-
-        if ( rowNo == -1 && mRows.Count() )
-
-            mRows.Insert( pRow, 0 );
-        else
-            mRows.Add( pRow );
-
-        InitLinksForRows();
-    }
-    else
-    {
-        pRow = mRows[rowNo];
-
-        if ( mProps.mNonDestructFrictionOn == true )
-        {
-            // store original shape of the row (before the bar is inserted)
-
-            mpStoredRow = pRow;
-
-            GetRowShapeData( mpStoredRow, &mRowShapeData );
-        }
-    }
-
-    if ( pRow->mBars.Count() )
-
-        pRow->mpExpandedBar = NULL;
-
-    cbInsertBarEvent insEvt( pBar, pRow, this );
-
-    mpLayout->FirePluginEvent( insEvt );
-
-    mpLayout->GetUpdatesManager().OnRowWillChange( pRow, this );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBarInfo, const wxRect& atRect )
-{
-    wxRect rect = atRect;
-    FrameToPane( &rect );
-
-    pBarInfo->mBounds.x      = rect.x;
-    pBarInfo->mBounds.width  = rect.width;
-    pBarInfo->mBounds.height = rect.height;
-
-    int row = GetRowAt( rect.y, rect.y + rect.height );
-
-    DoInsertBar( pBarInfo, row );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBar, cbRowInfo* pIntoRow )
-{
-    cbInsertBarEvent insEvt( pBar, pIntoRow, this );
-
-    mpLayout->FirePluginEvent( insEvt );
-
-    mpLayout->GetUpdatesManager().OnRowWillChange( pIntoRow, this );
-}
-
-void cbDockPane::InsertBar( cbBarInfo* pBarInfo )
-{
-    // set transient properties
-
-    pBarInfo->mpRow           = NULL;
-    pBarInfo->mHasLeftHandle  = false;
-    pBarInfo->mHasRightHandle = false;
-    pBarInfo->mLenRatio       = 0.0;
-
-    // set preferred bar dimensions, according to the state in which
-    // the bar is being inserted
-
-    pBarInfo->mBounds.width   = pBarInfo->mDimInfo.mSizes[ pBarInfo->mState ].x;
-    pBarInfo->mBounds.height  = pBarInfo->mDimInfo.mSizes[ pBarInfo->mState ].y;
-
-    DoInsertBar( pBarInfo, pBarInfo->mRowNo );
-}
-
-void cbDockPane::RemoveRow( cbRowInfo* pRow )
-{
-    size_t i;
-    // first, hide all bar-windows in the removed row
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( pRow->mBars[i]->mpBarWnd )
-            pRow->mBars[i]->mpBarWnd->Show( false );
-    }
-
-    mRows.Remove( pRow );
-
-    pRow->mUMgrData.SetDirty(true);
-}
-
-void cbDockPane::InsertRow( cbRowInfo* pRow, cbRowInfo* pBeforeRow )
-{
-    if ( !pBeforeRow )
-
-        mRows.Add( pRow );
-    else
-        mRows.Insert( pRow, mRows.Index( pBeforeRow ) );
-
-    InitLinksForRows();
-
-    pRow->mUMgrData.SetDirty(true);
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-        pRow->mBars[i]->mUMgrData.SetDirty( true );
-
-    SyncRowFlags( pRow );
-}
-
-void cbDockPane::SetPaneWidth(int width)
-{
-    if ( IsHorizontal() )
-        mPaneWidth = width - mLeftMargin - mRightMargin;
-    else
-        mPaneWidth = width - mTopMargin - mBottomMargin;
-}
-
-
-void cbDockPane::SetBoundsInParent( const wxRect& rect )
-{
-    mBoundsInParent = rect;
-
-    // set pane dimensions in local coordinates
-
-    if ( IsHorizontal() )
-    {
-        mPaneWidth  = mBoundsInParent.width  - ( mRightMargin + mLeftMargin   );
-        mPaneHeight = mBoundsInParent.height - ( mTopMargin   + mBottomMargin );
-    }
-    else
-    {
-        mPaneWidth  = mBoundsInParent.height - ( mTopMargin   + mBottomMargin );
-        mPaneHeight = mBoundsInParent.width  - ( mRightMargin + mLeftMargin   );
-    }
-
-    // convert bounding rectangles of all pane items into parent frame's coordinates
-
-    wxBarIterator i( mRows );
-
-    wxRect noMarginsRect = mBoundsInParent;
-
-    noMarginsRect.x      += mLeftMargin;
-    noMarginsRect.y      += mTopMargin;
-    noMarginsRect.width  -= ( mLeftMargin + mRightMargin  );
-    noMarginsRect.height -= ( mTopMargin  + mBottomMargin );
-
-    // hide the whole pane, if it's bounds became reverted (i.e. pane vanished)
-
-    if ( mBoundsInParent.width < 0 ||
-         mBoundsInParent.height < 0 )
-
-         hide_rect( mBoundsInParent );
-
-    if ( noMarginsRect.width < 0 ||
-         noMarginsRect.height < 0 )
-
-        hide_rect( noMarginsRect   );
-
-    // calculate mBoundsInParent for each item in the pane
-
-    while( i.Next() )
-    {
-        cbBarInfo& bar = i.BarInfo();
-
-        cbRowInfo* pRowInfo = bar.mpRow;
-
-        // set up row info, if this is first bar in the row
-
-        if ( pRowInfo && bar.mpPrev == NULL )
-        {
-            pRowInfo->mBoundsInParent.y      = pRowInfo->mRowY;
-            pRowInfo->mBoundsInParent.x      = 0;
-            pRowInfo->mBoundsInParent.width  = mPaneWidth;
-            pRowInfo->mBoundsInParent.height = pRowInfo->mRowHeight;
-
-            PaneToFrame( &pRowInfo->mBoundsInParent );
-
-            clip_rect_against_rect( pRowInfo->mBoundsInParent, noMarginsRect );
-        }
-
-        wxRect bounds = bar.mBounds;
-
-        // exclude dimensions of handles, when calculating
-        // bar's bounds in parent (i.e. "visual bounds")
-
-        if ( bar.mHasLeftHandle )
-        {
-            bounds.x     += mProps.mResizeHandleSize;
-            bounds.width -= mProps.mResizeHandleSize;
-        }
-
-        if ( bar.mHasRightHandle )
-
-            bounds.width -= mProps.mResizeHandleSize;
-
-        PaneToFrame( &bounds );
-
-        clip_rect_against_rect( bounds, noMarginsRect );
-
-        bar.mBoundsInParent = bounds;
-    }
-}
-
-bool cbDockPane::BarPresent( cbBarInfo* pBar )
-{
-    wxBarIterator iter( mRows );
-
-    while( iter.Next() )
-
-        if ( &iter.BarInfo() == pBar ) return true;
-
-    return false;
-}
-
-cbRowInfo* cbDockPane::GetRow( int row )
-{
-    if ( row >= (int)mRows.Count() ) return NULL;
-
-    return mRows[ row ];
-}
-
-int cbDockPane::GetRowIndex( cbRowInfo* pRow )
-{
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-    {
-        if ( mRows[i] == pRow )
-            return i;
-    }
-
-    wxFAIL_MSG(wxT("Row must be present to call cbDockPane::GetRowIndex()"));
-
-    return 0;
-}
-
-int cbDockPane::GetPaneHeight()
-{
-    // first, recalculate row heights and the Y-positions
-
-    cbLayoutRowsEvent evt( this );
-    mpLayout->FirePluginEvent( evt );
-
-    int height = 0;
-
-    if ( IsHorizontal() )
-        height += mTopMargin  + mBottomMargin;
-    else
-        height += mLeftMargin + mRightMargin;
-
-    int count = mRows.Count();
-
-    if ( count )
-        height += mRows[count-1]->mRowY + mRows[count-1]->mRowHeight;
-
-    return height;
-}
-
-int cbDockPane::GetAlignment()
-{
-    return mAlignment;
-}
-
-bool cbDockPane::MatchesMask( int paneMask )
-{
-    int thisMask = 0;
-
-    // FIXME:: use array instead of switch()
-
-    switch (mAlignment)
-    {
-        case FL_ALIGN_TOP    : thisMask = FL_ALIGN_TOP_PANE;   break;
-        case FL_ALIGN_BOTTOM : thisMask = FL_ALIGN_BOTTOM_PANE;break;
-        case FL_ALIGN_LEFT   : thisMask = FL_ALIGN_LEFT_PANE;  break;
-        case FL_ALIGN_RIGHT  : thisMask = FL_ALIGN_RIGHT_PANE; break;
-
-        default:
-            wxFAIL_MSG(wxT("Bad FL alignment type detected in cbDockPane::MatchesMask()"));
-    }
-
-    return ( thisMask & paneMask ) != 0;
-}
-
-void cbDockPane::RecalcLayout()
-{
-    // first, reposition rows and items vertically
-
-    cbLayoutRowsEvent evt( this );
-    mpLayout->FirePluginEvent( evt );
-
-    // then horizontally in each row
-
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-        RecalcRowLayout( mRows[i] );
-}
-
-int cbDockPane::GetDockingState()
-{
-    if ( mAlignment == FL_ALIGN_TOP ||
-         mAlignment == FL_ALIGN_BOTTOM )
-    {
-        return wxCBAR_DOCKED_HORIZONTALLY;
-    }
-    else
-        return wxCBAR_DOCKED_VERTICALLY;
-}
-
-inline bool cbDockPane::HasPoint( const wxPoint& pos, int x, int y,
-                                  int width, int height )
-{
-    return ( pos.x >= x &&
-             pos.y >= y &&
-             pos.x < x + width &&
-             pos.y < y + height   );
-}
-
-int cbDockPane::HitTestPaneItems( const wxPoint& pos,
-                                  cbRowInfo**    ppRow,
-                                  cbBarInfo**    ppBar
-                                )
-{
-    (*ppRow) = NULL;
-    (*ppBar) = NULL;
-
-    size_t i;
-    for ( i = 0; i != mRows.Count(); ++i )
-    {
-        cbRowInfo& row = *mRows[i];
-
-        *ppRow = &row;
-
-        // hit-test handles of the row, if present
-
-        if ( row.mHasUpperHandle )
-        {
-            if ( HasPoint( pos, 0, row.mRowY,
-                           row.mRowWidth, mProps.mResizeHandleSize ) )
-
-                return CB_UPPER_ROW_HANDLE_HITTED;
-        }
-        else
-        if ( row.mHasLowerHandle )
-        {
-            if ( HasPoint( pos, 0, row.mRowY + row.mRowHeight - mProps.mResizeHandleSize,
-                           row.mRowWidth, mProps.mResizeHandleSize ) )
-
-                    return CB_LOWER_ROW_HANDLE_HITTED;
-        }
-
-        // hit-test bar handles and bar content
-
-        size_t k;
-        for ( k = 0; k != row.mBars.Count(); ++k )
-        {
-            cbBarInfo& bar    = *row.mBars[k];
-            wxRect&    bounds = bar.mBounds;
-
-            *ppBar = &bar;
-
-            if ( bar.mHasLeftHandle )
-            {
-                if ( HasPoint( pos, bounds.x, bounds.y,
-                               mProps.mResizeHandleSize, bounds.height ) )
-
-                    return CB_LEFT_BAR_HANDLE_HITTED;
-            }
-            else
-            if ( bar.mHasRightHandle )
-            {
-                if ( HasPoint( pos, bounds.x + bounds.width - mProps.mResizeHandleSize, bounds.y,
-                               mProps.mResizeHandleSize, bounds.height ) )
-
-                    return CB_RIGHT_BAR_HANDLE_HITTED;
-            }
-
-            if ( HasPoint( pos, bounds.x, bounds.y, bounds.width, bounds.height ) )
-                return CB_BAR_CONTENT_HITTED;
-
-        } // hit-test next bar
-
-    } // next row
-
-    return CB_NO_ITEMS_HITTED;
-}
-
-void cbDockPane::GetBarResizeRange( cbBarInfo* pBar, int* from, int *till,
-                                    bool forLeftHandle )
-{
-    cbBarInfo* pGivenBar = pBar;
-
-    int notFree = 0;
-
-    // calc unavailable space from the left
-
-    while( pBar->mpPrev )
-    {
-        pBar = pBar->mpPrev;
-
-        if ( !pBar->IsFixed() ) notFree += mProps.mMinCBarDim.x;
-                                else notFree += pBar->mBounds.width;
-    }
-
-    *from = notFree;
-
-    pBar = pGivenBar;
-
-    notFree = 0;
-
-    // calc unavailable space from the right
-
-    while( pBar->mpNext )
-    {
-        pBar = pBar->mpNext;
-
-        if ( pBar->mBounds.x >= mPaneWidth ) break;
-
-        // treat not-fixed bars as minimized
-
-        if ( !pBar->IsFixed() )
-            notFree += mProps.mMinCBarDim.x;
-        else
-        {
-            if ( pBar->mBounds.x + pBar->mBounds.width >= mPaneWidth )
-            {
-                notFree += mPaneWidth - pBar->mBounds.x;
-                break;
-            }
-            else
-                notFree += pBar->mBounds.width;
-        }
-
-    }
-
-    *till = mPaneWidth - notFree;
-
-    // do not let resizing totally deform the bar itself
-
-    if ( forLeftHandle )
-        (*till) -= mProps.mMinCBarDim.x;
-    else
-        (*from) += mProps.mMinCBarDim.x;
-}
-
-int cbDockPane::GetMinimalRowHeight( cbRowInfo* pRow )
-{
-    int height = mProps.mMinCBarDim.y;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( pRow->mBars[i]->IsFixed() )
-            height = wxMax( height, pRow->mBars[i]->mBounds.height );
-    }
-
-    if ( pRow->mHasUpperHandle )
-        height += mProps.mResizeHandleSize;
-
-    if ( pRow->mHasLowerHandle )
-        height += mProps.mResizeHandleSize;
-
-    return height;
-}
-
-void cbDockPane::SetRowHeight( cbRowInfo* pRow, int newHeight )
-{
-    if ( pRow->mHasUpperHandle )
-
-        newHeight -= mProps.mResizeHandleSize;
-
-    if ( pRow->mHasLowerHandle )
-
-        newHeight -= mProps.mResizeHandleSize;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            pRow->mBars[i]->mBounds.height = newHeight;
-    }
-}
-
-void cbDockPane::GetRowResizeRange( cbRowInfo* pRow, int* from, int* till,
-                                    bool forUpperHandle )
-{
-    cbRowInfo* pGivenRow = pRow;
-
-    // calc unavailable space from above
-
-    int notFree = 0;
-
-    while( pRow->mpPrev )
-    {
-        pRow = pRow->mpPrev;
-
-        notFree += GetMinimalRowHeight( pRow );
-
-    };
-
-    *from = notFree;
-
-    // allow accupy the client window space by resizing pane rows
-    if ( mAlignment == FL_ALIGN_BOTTOM )
-
-        *from -= mpLayout->GetClientHeight();
-    else
-    if ( mAlignment == FL_ALIGN_RIGHT )
-
-        *from -= mpLayout->GetClientWidth();
-
-    // calc unavailable space from below
-
-    pRow = pGivenRow;
-
-    notFree = 0;
-
-    while( pRow->mpNext )
-    {
-        pRow = pRow->mpNext;
-
-        notFree += GetMinimalRowHeight( pRow );
-
-    }
-
-    *till = mPaneHeight - notFree;
-
-    // allow adjustinig pane space vs. client window space by resizing pane row heights
-
-    if ( mAlignment == FL_ALIGN_TOP )
-
-        *till += mpLayout->GetClientHeight();
-    else
-    if ( mAlignment == FL_ALIGN_LEFT )
-
-        *till += mpLayout->GetClientWidth();
-
-    // do not let the resizing of the row totally squeeze the row itself
-
-    cbRowInfo& row = *pGivenRow;
-
-    if ( forUpperHandle )
-    {
-        *till = row.mRowY + row.mRowHeight - GetMinimalRowHeight( pGivenRow );
-
-        if ( row.mHasUpperHandle )
-
-            *till -= mProps.mResizeHandleSize;
-    }
-    else
-    {
-        *from += GetMinimalRowHeight( pGivenRow );
-
-        if ( row.mHasLowerHandle )
-
-            *from -= mProps.mResizeHandleSize;
-    }
-}
-
-void cbDockPane::ResizeRow( cbRowInfo* pRow, int ofs,
-                            bool forUpperHandle )
-{
-    cbResizeRowEvent evt( pRow, ofs, forUpperHandle, this );
-
-    mpLayout->FirePluginEvent( evt );
-}
-
-void cbDockPane::ResizeBar( cbBarInfo* pBar, int ofs,
-                            bool forLeftHandle )
-{
-    pBar->mpRow->mpExpandedBar = NULL;
-
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    wxRect&  bounds = pBar->mBounds;
-
-    if ( forLeftHandle )
-    {
-        // do not allow bar width become less then minimal
-        if ( bounds.x + ofs > bounds.x + bounds.width - mProps.mMinCBarDim.x )
-        {
-            bounds.width = mProps.mMinCBarDim.x;
-            bounds.x += ofs;
-        }
-        else
-        {
-            bounds.x     += ofs;
-            bounds.width -= ofs;
-        }
-    }
-    else
-    {
-        // move bar left if necessary
-        if ( bounds.width + ofs < mProps.mMinCBarDim.x )
-        {
-            bounds.x     = bounds.x + bounds.width + ofs - mProps.mMinCBarDim.x;
-            bounds.width = mProps.mMinCBarDim.x;
-        }
-        else
-            // resize right border only
-            bounds.width += ofs;
-    }
-
-
-    cbRowInfo* pToRow = pBar->mpRow;
-
-    this->RemoveBar( pBar );
-
-    InsertBar( pBar, pToRow );
-
-    mpLayout->RecalcLayout(false);
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-
-/*** row/bar resizing related methods ***/
-
-void cbDockPane::DrawVertHandle( wxDC& dc, int x, int y, int height )
-{
-    int lower = y + height;
-
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( x,y, x, lower );
-
-    dc.SetPen( mpLayout->mGrayPen );
-    int i;
-    for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
-    {
-        ++x;
-        dc.DrawLine( x,y, x, lower );
-    }
-
-    dc.SetPen( mpLayout->mDarkPen );
-    ++x;
-    dc.DrawLine( x,y, x, lower );
-
-    dc.SetPen( mpLayout->mBlackPen );
-    ++x;
-    dc.DrawLine( x,y, x, lower );
-}
-
-void cbDockPane::DrawHorizHandle( wxDC& dc, int x, int y, int width  )
-{
-    int right = x + width;
-
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( x,y, right, y );
-
-    dc.SetPen( mpLayout->mGrayPen );
-
-    int i;
-    for ( i = 0; i != mProps.mResizeHandleSize-1; ++i )
-    {
-        ++y;
-        dc.DrawLine( x,y, right, y );
-    }
-
-    ++y;
-    dc.SetPen( mpLayout->mDarkPen );
-    dc.DrawLine( x,y, right, y );
-
-    ++y;
-    dc.SetPen( mpLayout->mBlackPen );
-    dc.DrawLine( x,y, right, y );
-}
-
-cbBarInfo* cbDockPane::GetBarInfoByWindow( wxWindow* pBarWnd )
-{
-    wxBarIterator i( mRows );
-
-    while( i.Next() )
-
-        if ( i.BarInfo().mpBarWnd == pBarWnd )
-
-            return &i.BarInfo();
-
-    return NULL;
-}
-
-void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
-{
-    if(pLst)
-    {
-        WX_CLEAR_LIST(wxList,*pLst);
-    }
-
-    pLst->Clear();
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        cbBarShapeData* pData = new cbBarShapeData();
-
-        pLst->Append( (wxObject*)pData );
-
-        pData->mBounds   = bar.mBounds;
-        pData->mLenRatio = bar.mLenRatio;
-    }
-}
-
-void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
-{
-    if ( pLst->GetFirst() == NULL )
-        return;
-
-    wxObjectList::compatibility_iterator pData = pLst->GetFirst();
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        wxASSERT( pData ); // DBG::
-
-        cbBarInfo& bar = *pRow->mBars[i];;
-
-        cbBarShapeData& data = *((cbBarShapeData*)pData->GetData());
-
-        bar.mBounds   = data.mBounds;
-        bar.mLenRatio = data.mLenRatio;
-
-        pData = pData->GetNext();
-    }
-}
-
-/***** Implementation for class cbUpdatesManagerBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbUpdatesManagerBase, wxObject )
-
-/***** Implementation for class cbPluginBase *****/
-
-IMPLEMENT_ABSTRACT_CLASS( cbPluginBase, wxEvtHandler )
-
-cbPluginBase::~cbPluginBase()
-{
-    // nothing
-}
-
-bool cbPluginBase::ProcessEvent(wxEvent& event)
-{
-    if ( mPaneMask == wxALL_PANES )
-
-        return wxEvtHandler::ProcessEvent( event );
-
-    // extract mask info. from received event
-
-    cbPluginEvent& evt = *( (cbPluginEvent*)&event );
-
-    if ( evt.mpPane == 0 &&
-         mPaneMask  == wxALL_PANES )
-
-         return wxEvtHandler::ProcessEvent( event );
-
-    int mask = 0;
-
-    switch ( evt.mpPane->mAlignment )
-    {
-        case FL_ALIGN_TOP    : mask = FL_ALIGN_TOP_PANE;   break;
-        case FL_ALIGN_BOTTOM : mask = FL_ALIGN_BOTTOM_PANE;break;
-        case FL_ALIGN_LEFT   : mask = FL_ALIGN_LEFT_PANE;  break;
-        case FL_ALIGN_RIGHT  : mask = FL_ALIGN_RIGHT_PANE; break;
-    }
-
-    // if event's pane maks matches the plugin's mask
-
-    if ( mPaneMask & mask )
-
-        return wxEvtHandler::ProcessEvent( event );
-
-    // otherwise pass to the next handler if present
-
-    if ( GetNextHandler() && GetNextHandler()->ProcessEvent( event ) )
-
-        return true;
-    else
-        return false;
-}
diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
deleted file mode 100644
index f0f7d0779f..0000000000
--- a/contrib/src/fl/dyntbar.cpp
+++ /dev/null
@@ -1,614 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dyntbar.cpp
-// Purpose:     wxDynamicToolBar implementation
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     ??/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// 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/utils.h"     // import wxMin,wxMax macros
-
-#include "wx/fl/dyntbar.h"
-#include "wx/fl/newbmpbtn.h"
-
-IMPLEMENT_DYNAMIC_CLASS( wxDynamicToolBar, wxObject )
-
-BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )
-
-    EVT_SIZE ( wxDynamicToolBar::OnSize  )
-    EVT_PAINT( wxDynamicToolBar::OnPaint )
-    //EVT_ERASE_BACKGROUND( wxDynamicToolBar::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-/***** Implementation for class wxToolLayoutItem *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
-
-
-/***** Implementation for class wxDynToolInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
-
-/***** Implementation for class wxDynamicToolBar *****/
-
-wxDynamicToolBar::wxDynamicToolBar()
-    : mpLayoutMan( NULL ),
-      mSepartorSize( 8 ),
-      mVertGap ( 0 ),
-      mHorizGap( 0 )
-{
-}
-
-wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,
-                                   const wxPoint& pos, const wxSize& size,
-                                   const long style, const int orientation,
-                                   const int RowsOrColumns, const wxString& name )
-    : mpLayoutMan( NULL ),
-      mSepartorSize( 8 ),
-      mVertGap ( 0 ),
-      mHorizGap( 0 )
-{
-    Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
-
-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );
-}
-
-bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              const long style,
-                              const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns),
-                              const wxString& name)
-{
-    // cut&pasted from wxtbatsmpl.h
-
-    if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
-        return false;
-
-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
-
-    return true;
-}
-
-bool wxDynamicToolBar::Realize(void)
-{
-    // FOR NOW:: nothing
-    return true;
-}
-
-wxDynamicToolBar::~wxDynamicToolBar(void)
-{
-    if ( mpLayoutMan )
-        delete mpLayoutMan;
-
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        delete mTools[i];
-    }
-}
-
-void wxDynamicToolBar::AddTool( int toolIndex,
-                                wxWindow* pToolWindow,
-                                const wxSize& WXUNUSED(size)
-                              )
-{
-    wxDynToolInfo* pInfo = new wxDynToolInfo();
-
-    pInfo->mpToolWnd    = pToolWindow;
-    pInfo->mIndex       = toolIndex;
-    pInfo->mIsSeparator    = false;
-
-    int x,y;
-    pToolWindow->GetSize( &x, &y );
-    pInfo->mRealSize.x = x;
-    pInfo->mRealSize.y = y;
-    pInfo->mRect.width = x;
-    pInfo->mRect.height = y;
-
-    mTools.Add( pInfo );
-}
-
-void wxDynamicToolBar::AddTool( int toolIndex,
-                                const wxString& imageFileName,
-                                wxBitmapType imageFileType,
-                                const wxString& labelText, bool alignTextRight,
-                                bool isFlat )
-{
-    wxNewBitmapButton* pBtn =
-
-      new wxNewBitmapButton( imageFileName, imageFileType,
-                             labelText,
-                             ( alignTextRight )
-                             ? NB_ALIGN_TEXT_RIGHT
-                             : NB_ALIGN_TEXT_BOTTOM,
-                             isFlat
-                           );
-
-    pBtn->Create( this, toolIndex );
-
-    pBtn->Reshape();
-
-    AddTool( toolIndex, pBtn );
-}
-void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
-                                const wxString& labelText, bool alignTextRight,
-                                bool isFlat )
-{
-    wxNewBitmapButton* pBtn =
-
-      new wxNewBitmapButton( labelBmp,
-                             labelText,
-                             ( alignTextRight )
-                             ? NB_ALIGN_TEXT_RIGHT
-                             : NB_ALIGN_TEXT_BOTTOM,
-                             isFlat
-                           );
-
-    pBtn->Create( this, toolIndex );
-
-    pBtn->Reshape();
-
-    AddTool( toolIndex, pBtn );
-}
-
-
-wxToolBarToolBase*
-      wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap,
-                                const wxBitmap& WXUNUSED(pushedBitmap),
-                                const bool WXUNUSED(toggle), const long WXUNUSED(xPos),
-                                const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
-                                const wxString& helpString1, const wxString& WXUNUSED(helpString2))
-{
-    wxNewBitmapButton* pBmpBtn = new wxNewBitmapButton( bitmap );
-
-    pBmpBtn->Create( this, toolIndex );
-
-    pBmpBtn->Reshape();
-
-#if wxUSE_TOOLTIPS
-    pBmpBtn->SetToolTip( helpString1 );
-#else
-    wxUnusedVar( helpString1 );
-#endif  // wxUSE_TOOLTIPS
-
-    AddTool( toolIndex, pBmpBtn );
-
-    return NULL;
-}
-
-
-wxDynToolInfo* wxDynamicToolBar::GetToolInfo( int toolIndex )
-{
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        if ( mTools[i]->mIndex == toolIndex )
-            return mTools[i];
-    }
-
-    return NULL;
-}
-
-void wxDynamicToolBar::RemveTool( int toolIndex )
-{
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        if ( mTools[i]->mIndex == toolIndex )
-        {
-            if ( mTools[i]->mpToolWnd )
-            {
-                mTools[i]->mpToolWnd->Destroy();
-            }
-            delete mTools[i]; // HVL To be tested!!!
-#if wxCHECK_VERSION(2,3,2)
-            mTools.RemoveAt(i);
-#else
-            mTools.Remove(i);
-#endif
-            Layout();
-
-            return;
-        }
-    }
-    // TODO:: if not found, should it be an assertion?
-}
-
-void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
-{
-    wxDynToolInfo* pInfo = new wxDynToolInfo();
-
-    pInfo->mpToolWnd    = pSepartorWnd;
-    pInfo->mIndex       = -1;
-    pInfo->mIsSeparator = true;
-
-    // Do we draw a separator or is a other object?
-    if ( pSepartorWnd )
-    {
-        // hvl => Is there a way to know if it was already created?
-        // hvl => shouldn't the pSepartorWnd be created? (like one should expect?)
-        // pSepartorWnd->Create( this, -1 );
-
-        int x,y;
-        pSepartorWnd->GetSize( &x, &y );
-        pInfo->mRealSize.x = x;
-        pInfo->mRealSize.y = y;
-
-        pInfo->mRect.width = x;
-        pInfo->mRect.height = y;
-    }
-    else
-    {
-        // Init x and y to the default.
-        pInfo->mRealSize.x = 0;
-        pInfo->mRealSize.y = 0;
-
-        // Init height and width to the normal size of a separator.
-        pInfo->mRect.width  = mSepartorSize;
-        pInfo->mRect.height = mSepartorSize;
-    }
-
-    mTools.Add( pInfo );
-}
-
-void wxDynamicToolBar::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
-    // FOR NOW:: nothing
-}
-
-void wxDynamicToolBar::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-    //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) );
-
-    Layout();
-}
-
-void wxDynamicToolBar::DrawSeparator( wxDynToolInfo& info, wxDC& dc )
-{
-    // check the orientation of separator
-    if ( info.mRect.width < info.mRect.height )
-    {
-        int midX = info.mRect.x + info.mRect.width/2 - 1;
-
-        dc.SetPen( *wxGREY_PEN );
-        dc.DrawLine( midX, info.mRect.y,
-                     midX, info.mRect.y + info.mRect.height+1 );
-
-        dc.SetPen( *wxWHITE_PEN );
-        dc.DrawLine( midX+1, info.mRect.y,
-                     midX+1, info.mRect.y + info.mRect.height+1 );
-    }
-    else
-    {
-        int midY = info.mRect.y + info.mRect.height/2 - 1;
-
-        dc.SetPen( *wxGREY_PEN );
-        dc.DrawLine( info.mRect.x, midY,
-                     info.mRect.x + info.mRect.width+1, midY );
-
-        dc.SetPen( *wxWHITE_PEN );
-        dc.DrawLine( info.mRect.x, midY + 1,
-                     info.mRect.x + info.mRect.width+1, midY + 1 );
-    }
-}
-
-void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    // draw separators if any
-    wxPaintDC dc(this);
-
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        if ( mTools[i]->mIsSeparator )
-        {
-            // check if separator doesn't have it's own window
-            // if so, then draw it using built-in drawing method
-            if ( !mTools[i]->mpToolWnd )
-                DrawSeparator( *mTools[i], dc );
-        }
-    }
-}
-
-// FOR NOW:: quick fix
-#include "wx/choice.h"
-
-void wxDynamicToolBar::SizeToolWindows()
-{
-    bool bStateCheckDone = false;
-    bool bHorzSeparator  = false;
-    int maxWidth         = 0;
-    int maxHeight        = 0;
-
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        wxDynToolInfo& info = *mTools[i];
-
-        if ( !info.mIsSeparator )
-        {
-            // center real rectangle within the rectangle
-            // provided by the layout manager
-
-            int x = info.mRect.x;
-            int y = info.mRect.y + (info.mRect.height - info.mRealSize.y)/2;
-
-            // FOR NOW FOR NOW:: quick & dirty fix
-            if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
-            {
-                info.mpToolWnd->SetSize( x, y,
-                                         info.mRealSize.x - 3,
-                                         info.mRealSize.y);
-            }
-            else
-            {
-                info.mpToolWnd->SetSize( x, y,
-                                         info.mRealSize.x,
-                                         info.mRealSize.y );
-            }
-        }
-        else
-        {
-            // We performer this code here, so we only execute it when we have
-            // separators and we do it only once (all to do with performance...)
-            if (!bStateCheckDone)
-            {
-                bStateCheckDone = true;
-
-                size_t j;
-                wxDynToolInfo *pInfo;
-                wxDynToolInfo *pPrevInfo = NULL;
-                int nVertSeparators = 0;
-
-                for( j = 0; j != mTools.Count(); ++j )
-                {
-                    pInfo = mTools[j];
-
-                    // Count all Vert Separators.
-                    if ( pInfo->mIsSeparator )
-                        nVertSeparators++;
-
-                    // Check if the new row starts with a Separator.
-                    if ( pPrevInfo && pInfo->mIsSeparator &&
-                         // pPrevInfo->mRect.x >= pInfo->mRect.x &&
-                         pPrevInfo->mRect.y < pInfo->mRect.y)
-                    {
-                        // If the Separator is shown on the next row and it's
-                        // the only object on the row it would mean that the
-                        // Separator should be shown as Horizontal one.
-                        if (j+1 != mTools.Count())
-                        {
-                            if (pInfo->mRect.y < mTools[j+1]->mRect.y)
-                                nVertSeparators--;
-                        }
-                        else
-                        {
-                            nVertSeparators--;
-                        }
-                    }
-
-                    pPrevInfo = pInfo;
-
-                    maxWidth = wxMax(pInfo->mRect.width, maxWidth);
-                    maxHeight = wxMax(pInfo->mRect.height, maxHeight);
-                }
-
-                bHorzSeparator = nVertSeparators == 0;
-            }
-
-            // Check if we should draw Horz or Vert...
-            if ( !bHorzSeparator )
-            {
-                info.mRect.width = mSepartorSize;
-                info.mRect.height = maxHeight;
-            }
-            else
-            {
-                info.mRect.width = maxWidth;
-                info.mRect.height = mSepartorSize;
-            }
-
-            // Do we need to set a new size to a separator object?
-            if ( info.mpToolWnd )
-            {
-                info.mpToolWnd->SetSize( info.mRect.x,
-                                         info.mRect.y,
-                                         info.mRect.width,
-                                         info.mRect.height);
-            }
-
-        }
-    }
-}
-
-bool wxDynamicToolBar::Layout()
-{
-    int x,y;
-    GetSize( &x, &y );
-    wxSize wndDim(x,y);
-    wxSize result;
-    size_t i;
-    wxDynToolInfo *pInfo;
-
-    // Reset the size of separators...
-    for( i = 0; i != mTools.Count(); ++i )
-    {
-        pInfo = mTools[i];
-
-        if ( pInfo->mIsSeparator )
-        {
-            pInfo->mRect.width  = mSepartorSize;
-            pInfo->mRect.height = mSepartorSize;
-        }
-    }
-
-    // Calc and set the best layout
-    GetPreferredDim( wndDim, result );
-
-    SizeToolWindows();
-    return true;
-}
-
-void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
-{
-    if ( !mpLayoutMan )
-        mpLayoutMan = CreateDefaultLayout();
-
-    wxLayoutItemArrayT items;
-
-    // safe conversion
-    size_t i;
-    for( i = 0; i != mTools.Count(); ++i )
-        items.Add( mTools[i] );
-
-    mpLayoutMan->Layout( givenDim, prefDim, items, mVertGap, mHorizGap );
-}
-
-void wxDynamicToolBar::SetLayout( LayoutManagerBase* pLayout )
-{
-    if ( mpLayoutMan )
-        delete mpLayoutMan;
-
-    mpLayoutMan = pLayout;
-
-    Layout();
-}
-
-void wxDynamicToolBar::EnableTool(int toolIndex, bool enable )
-{
-    wxDynToolInfo* pInfo = GetToolInfo( toolIndex );
-
-    if ( !pInfo )
-        return;
-
-    if ( pInfo->mIsSeparator || !pInfo->mpToolWnd )
-        return;
-
-    pInfo->mpToolWnd->Enable( enable );
-}
-
-/***** Implementation for class BagLayout *****/
-
-void BagLayout::Layout(  const wxSize&       parentDim,
-                         wxSize&             resultingDim,
-                         wxLayoutItemArrayT& items,
-                         int                 horizGap,
-                         int                 vertGap
-                      )
-{
-    int maxWidth = 0;
-    int curY  = 0;
-    int nRows = 0;
-
-    size_t i = 0;
-
-    while( i < items.Count() )
-    {
-        int curX   = 0;
-        int height = 0;
-        // int nItems = 0;
-
-        // int firstItem  = i;
-        int itemsInRow = 0;
-
-        if ( nRows > 0 )
-            curY += vertGap;
-
-        // step #1 - arrange horizontal positions of items in the row
-
-        do
-        {
-            if ( itemsInRow > 0 )
-                curX += horizGap;
-
-            wxRect& r = items[i]->mRect;
-
-            if ( curX + r.width > parentDim.x )
-            {
-                if ( itemsInRow > 0 )
-                    break;
-            }
-            r.x = curX;
-            r.y = curY;
-
-            curX += r.width;
-
-            height = wxMax( height, r.height );
-
-            ++itemsInRow;
-            ++i;
-
-        } while( i < items.Count() );
-
-        curY += height;
-
-        maxWidth = wxMax( maxWidth, curX );
-    }
-
-    resultingDim.x = maxWidth;
-    resultingDim.y = curY;
-}
-
-//////// stuff from 2.1.15 ///////////
-
-wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) const
-{
-    return NULL;
-}
-
-bool wxDynamicToolBar::DoInsertTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
-{
-    return true;
-}
-
-bool wxDynamicToolBar::DoDeleteTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
-{
-    return true;
-}
-
-void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(enable) )
-{
-}
-
-void wxDynamicToolBar::DoToggleTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(toggle) )
-{
-}
-
-void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(toggle) )
-{
-}
-
-wxToolBarToolBase* wxDynamicToolBar::CreateTool( int WXUNUSED(id),
-                                                 const wxString& WXUNUSED(label),
-                                                 const wxBitmap& WXUNUSED(bmpNormal),
-                                                 const wxBitmap& WXUNUSED(bmpDisabled),
-                                                 wxItemKind WXUNUSED(kind),
-                                                 wxObject *WXUNUSED(clientData),
-                                                 const wxString& WXUNUSED(shortHelp),
-                                                 const wxString& WXUNUSED(longHelp)
-                                                )
-{
-    return NULL;
-}
-
-wxToolBarToolBase* wxDynamicToolBar::CreateTool( wxControl* WXUNUSED(control) )
-{
-    return NULL;
-}
-
diff --git a/contrib/src/fl/dyntbarhnd.cpp b/contrib/src/fl/dyntbarhnd.cpp
deleted file mode 100644
index ca0a886278..0000000000
--- a/contrib/src/fl/dyntbarhnd.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dyntbarhnd.cpp
-// Purpose:     cbDynToolBarDimHandler implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     23/01/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/fl/dyntbarhnd.h"
-/***** Implementation for class cbDynToolBarDimHandler *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbDynToolBarDimHandler, cbBarDimHandlerBase )
-
-void cbDynToolBarDimHandler::OnChangeBarState(cbBarInfo* WXUNUSED(pBar), int WXUNUSED(newState) )
-{
-    // nothing
-}
-
-void cbDynToolBarDimHandler::OnResizeBar( cbBarInfo* pBar, 
-                                          const wxSize& given, 
-                                          wxSize& preferred )
-{
-    wxASSERT( pBar->mpBarWnd ); // DBG:: should be present
-
-    wxDynamicToolBar* pTBar = (wxDynamicToolBar*)pBar->mpBarWnd;
-
-    pTBar->GetPreferredDim( given, preferred );
-}
-
diff --git a/contrib/src/fl/files.lst b/contrib/src/fl/files.lst
deleted file mode 100644
index 0a653d8b0d..0000000000
--- a/contrib/src/fl/files.lst
+++ /dev/null
@@ -1,19 +0,0 @@
-
-FL_OBJECTS  = \
-   antiflickpl.$(OBJ_EXT) \
-   gcupdatesmgr.$(OBJ_EXT) \
-   rowlayoutpl.$(OBJ_EXT) \
-   bardragpl.$(OBJ_EXT) \
-   dyntbar.$(OBJ_EXT) \
-   hintanimpl.$(OBJ_EXT) \
-   toolwnd.$(OBJ_EXT) \
-   barhintspl.$(OBJ_EXT) \
-   dyntbarhnd.$(OBJ_EXT) \
-   newbmpbtn.$(OBJ_EXT) \
-   updatesmgr.$(OBJ_EXT) \
-   cbcustom.$(OBJ_EXT) \
-   panedrawpl.$(OBJ_EXT) \
-   controlbar.$(OBJ_EXT) \
-   garbagec.$(OBJ_EXT) \
-   rowdragpl.$(OBJ_EXT)
-
diff --git a/contrib/src/fl/frmview.cpp b/contrib/src/fl/frmview.cpp
deleted file mode 100644
index 56730f2cd3..0000000000
--- a/contrib/src/fl/frmview.cpp
+++ /dev/null
@@ -1,442 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        frmview.cpp
-// Purpose:     wxFrameView implementation. NOT USED IN FL.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     02/01/99
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
- 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/frmview.h"
-#include "wx/utils.h"
-
-/***** Implementation for class wxFrameView *****/
-
-BEGIN_EVENT_TABLE( wxFrameView, wxEvtHandler )
-
-    EVT_IDLE( wxFrameView::OnIdle )
-
-END_EVENT_TABLE()
-
-void wxFrameView::OnIdle( wxIdleEvent& event)
-{
-    event.Skip();
-
-    if ( mDoToolUpdates )
-    {
-        // TBD::
-    }
-}
-
-/*** public methods ***/
-
-wxFrameView::wxFrameView()
-
-    : mpLayout( NULL ),
-      mpFrameMgr( NULL )
-{}
-
-wxFrameView::~wxFrameView()
-{
-    if ( mpLayout ) delete mpLayout;
-}
-
-wxFrame* wxFrameView::GetParentFrame()
-{
-    return mpFrameMgr->GetParentFrame();
-}
-
-wxWindow* wxFrameView::GetClientWindow()
-{
-    return mpFrameMgr->GetClientWindow();
-}
-
-void wxFrameView::Activate()
-{
-    mpFrameMgr->ActivateView( this );
-}
-
-void wxFrameView::Deactivate()
-{
-    mpFrameMgr->DeactivateCurrentView();
-}
-
-void wxFrameView::CreateLayout()
-{
-    mpLayout = new wxFrameLayout( GetParentFrame(), mpFrameMgr->GetClientWindow(), false );
-}
-
-wxFrameLayout* wxFrameView::GetLayout()
-{
-    return mpLayout;
-}
-
-void wxFrameView::SetToolUpdates( bool doToolUpdates )
-{
-    mDoToolUpdates = doToolUpdates;
-}
-
-void wxFrameView::SetLayout( wxFrameLayout* pLayout )
-{
-    if ( mpLayout ) delete mpLayout;
-
-    mpLayout = pLayout;
-}
-
-wxFrameManager& wxFrameView::GetFrameManager()
-{
-    return *mpFrameMgr;
-}
-
-void wxFrameView::RegisterMenu( const wxString& topMenuName )
-{
-    mTopMenus.Add( topMenuName );
-}
-
-#if 0
-
-/***** Implementation for class wxFrameViewSerializer *****/
-
-// NOTE:: currently "stipple" property of the brush is not serialized
-
-class wxFrameViewSerializer : public wxEvtHandlerSerializer
-{
-    DECLARE_SERIALIZER_CLASS( wxFrameViewSerializer );
-
-    static void Serialize( wxObject* pObj, wxObjectStorage& store );
-};
-
-IMPLEMENT_SERIALIZER_CLASS( wxFrameView, 
-                            wxFrameViewSerializer,
-                            wxFrameViewSerializer::Serialize,
-                            NO_CLASS_INIT )
-
-void wxFrameViewSerializer::Serialize( wxObject* pObj, wxObjectStorage& store )
-{
-    // wxFrameViewSerializer is a kind of wxEvtHandler - peform serialization of
-    // the base class first
-
-    info.SerializeInherited( pObj, store );
-
-    wxFrameView* pView = (wxFrameView*)pObj;
-
-    store.XchgObjPtr( (wxObject**) &pView->mpFrameMgr );
-    store.XchgObjPtr( (wxObject**) &pView->mpLayout );
-    store.XchgBool  ( pView->mDoToolUpdates );
-
-    // serialize members in derived classes
-
-    pView->OnSerialize( store );
-}
-
-#endif
-
-/***** Implementation for class wxFrameManager *****/
-
-void wxFrameManager::DoSerialize( wxObjectStorage& WXUNUSED(store) )
-{
-#if 0
-    store.AddInitialRef( mpFrameWnd );
-    store.AddInitialRef( this );
-    if ( mpClientWnd ) store.AddInitialRef( mpClientWnd );
-
-    store.XchgObj( (wxObject*) &mViews );
-    store.XchgInt( mActiveViewNo );
-
-    store.Finalize(); // finish serialization
-#endif 
-}
-
-void wxFrameManager::DestroyViews()
-{
-    DeactivateCurrentView();
-
-    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-
-    while ( pNode )
-    {
-        delete (wxFrameView*)pNode->GetData();
-
-        pNode = pNode->GetNext();
-    }
-
-    if ( mActiveViewNo != -1 && GetParentFrame() )
-
-        GetParentFrame()->SetNextHandler( NULL );
-}
-
-int wxFrameManager::GetViewNo( wxFrameView* pView )
-{
-    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-    int n = 0;
-
-    while ( pNode )
-    {
-        if ( (wxFrameView*)pNode->GetData() == pView )
-
-            return n;
-
-        ++n;
-        pNode = pNode->GetNext();
-    }
-
-    return -1;
-}
-
-void wxFrameManager::EnableMenusForView( wxFrameView* pView, bool enable )
-{
-    wxMenuBar* pMenuBar = GetParentFrame()->GetMenuBar();
-    int count = pMenuBar->GetMenuCount();
-
-    if ( !pMenuBar )
-        return;
-
-    wxStringList::compatibility_iterator pNode = pView->mTopMenus.GetFirst();
-
-    int i;
-    while ( pNode )
-    {
-        for ( i = 0; i != count; ++i )
-        {
-            if ( pMenuBar->GetMenu(i)->GetTitle() == pNode->GetData() )
-                pMenuBar->EnableTop( i, enable );
-        }
-
-        pNode = pNode->GetNext();
-    }
-}
-
-void wxFrameManager::SyncAllMenus()
-{
-    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-    int i = 0;
-
-    while ( pNode )
-    {
-        if ( i != mActiveViewNo )
-
-            EnableMenusForView( (wxFrameView*)pNode->GetData(), false );
-
-        pNode = pNode->GetNext();
-    }
-
-    EnableMenusForView( GetView( mActiveViewNo ), true );
-}
-
-/*** public methods ***/
-
-wxFrameManager::wxFrameManager()
-
-    : mpFrameWnd( NULL  ),
-      mActiveViewNo( -1 ),
-      mpClientWnd( NULL )
-{
-}
-
-wxFrameManager::~wxFrameManager()
-{
-    SaveViewsNow();
-    DestroyViews();
-}
-
-void wxFrameManager::Init( wxWindow* pMainFrame, const wxString& settingsFile )
-{
-    mSettingsFile = settingsFile;
-    mpFrameWnd    = pMainFrame;
-
-    wxObjectList::compatibility_iterator pNode = mViews.GetFirst();
-
-    while ( pNode )
-    {
-        wxFrameView* pView = (wxFrameView*)pNode->GetData();
-
-        pView->OnInit();
-        pView->OnInitMenus();
-
-        pNode = pNode->GetNext();
-    }
-
-    if ( !ReloadViews() )
-    {
-        // if loading of settings file failed (e.g. was not found), 
-        // do recreation of items in each view
-
-        pNode = mViews.GetFirst();
-
-        while ( pNode )
-        {
-            wxFrameView* pView = (wxFrameView*)pNode->GetData();
-
-            pView->OnRecreate();
-
-            pNode = pNode->GetNext();
-        }
-    }
-
-    if ( mActiveViewNo >= (int)mViews.GetCount() )
-        mActiveViewNo = -1;
-
-    ActivateView( GetView( ( mActiveViewNo == -1 ) ? 0 : mActiveViewNo ) );
-
-    SyncAllMenus();
-}
-
-void wxFrameManager::AddView( wxFrameView* pFrmView )
-{
-    mViews.Append( pFrmView );
-
-    pFrmView->mpFrameMgr = this; // back ref.
-}
-
-void wxFrameManager::RemoveView( wxFrameView* WXUNUSED(pFrmView) )
-{
-    // TBD::
-    wxFAIL_MSG( _T("wxFrameManager::RemoveView() has not been implemented yet.") );
-}
-
-int wxFrameManager::GetActiveViewNo()
-{
-    return mActiveViewNo;
-}
-
-wxFrameView* wxFrameManager::GetActiveView()
-{
-    wxObjectList::compatibility_iterator pNode = mViews.Item( mActiveViewNo );
-
-    if ( pNode ) return (wxFrameView*)pNode->GetData();
-            else return NULL;
-}
-
-wxObjectList::compatibility_iterator wxFrameManager::GetActiveViewNode()
-{
-    return mViews.Item( mActiveViewNo );
-}
-
-wxFrame* wxFrameManager::GetParentFrame()
-{
-    return ((wxFrame*)mpFrameWnd);
-}
-
-wxWindow* wxFrameManager::GetParentWindow()
-{
-    return mpFrameWnd;
-}
-
-wxFrameView* wxFrameManager::GetView( int viewNo )
-{
-    wxObjectList::compatibility_iterator pNode = mViews.Item( viewNo );
-
-    if ( pNode ) return (wxFrameView*)pNode->GetData();
-            else return NULL;
-}
-
-void wxFrameManager::ActivateView( int viewNo )
-{
-    ActivateView( GetView( viewNo ) );
-}
-
-void wxFrameManager::ActivateView( wxFrameView* pFrmView )
-{
-    DeactivateCurrentView();
-
-    mActiveViewNo = GetViewNo( pFrmView );
-
-    if ( pFrmView->mpLayout )
-
-        pFrmView->mpLayout->Activate();
-
-    // FIXME:: we would have used PushEventHandler(),
-    //         but wxFrame bypasses attached handlers when
-    //         handling wxCommand events!
-
-    GetParentFrame()->PushEventHandler( pFrmView );
-
-    EnableMenusForView( pFrmView, true );
-}
-
-void wxFrameManager::SetClinetWindow( wxWindow* pFrameClient )
-{
-    if ( mpClientWnd ) mpClientWnd->Destroy();
-
-    mpClientWnd = pFrameClient;
-}
-
-wxWindow* wxFrameManager::GetClientWindow()
-{
-    if ( !mpClientWnd )
-
-        mpClientWnd = new wxWindow( GetParentFrame(), -1 );
-
-    return mpClientWnd;
-}
-
-void wxFrameManager::DeactivateCurrentView()
-{
-    if ( mActiveViewNo == -1 )
-        return;
-
-    wxFrameView* pView = GetActiveView();
-
-    // FOR NOW::
-    wxASSERT( GetParentFrame()->GetEventHandler() == pView );
-
-    GetParentFrame()->PopEventHandler();
-
-    if ( pView->mpLayout )
-        pView->mpLayout->Deactivate();
-
-    EnableMenusForView( pView, false );
-}
-
-void wxFrameManager::SaveViewsNow()
-{
-#if 0
-    if ( mSettingsFile == "" ) return;
-
-    wxIOStreamWrapper stm;
-    stm.CreateForOutput( mSettingsFile );
-
-    mStore.SetDataStream( stm );
-    DoSerialize( mStore );
-#endif
-}
-
-bool wxFrameManager::ReloadViews()
-{
-    return false;
-
-    // TBD: ????
-#if 0
-    if ( mSettingsFile == "" || !wxFileExists( mSettingsFile ) ) 
-        return false;
-
-    DestroyViews();
-
-    wxIOStreamWrapper stm;
-    stm.CreateForInput( mSettingsFile );
-
-    mStore.SetDataStream( stm );
-    DoSerialize( mStore );
-
-    return true;
-#endif
-}
-
-bool wxFrameManager::ViewsAreLoaded()
-{
-    return ( mViews.GetCount() != 0 );
-}
-
diff --git a/contrib/src/fl/garbagec.cpp b/contrib/src/fl/garbagec.cpp
deleted file mode 100644
index e103208ccb..0000000000
--- a/contrib/src/fl/garbagec.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        garbagec.cpp
-// Purpose:     Garbage collection algorithm for optimizing refresh.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     18/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:       wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/fl/garbagec.h"
-
-/***** Implementation for class GarbageCollector *****/
-
-inline static GCItem& node_to_item( wxNode* pNode )
-{
-    return *( (GCItem*)(pNode->GetData()) );
-}
-
-GarbageCollector::~GarbageCollector()
-{
-    Reset();
-}
-
-/*** GC alg. helpers ***/
-
-void GarbageCollector::DestroyItemList( wxList& lst )
-{
-    wxNode* pNode = lst.GetFirst();
-
-    while( pNode )
-    {
-        delete &node_to_item( pNode );
-
-        pNode = pNode->GetNext();
-    }
-
-    lst.Clear();
-}
-
-wxNode* GarbageCollector::FindItemNode( void* pForObj )
-{
-    wxNode* pNode = mAllNodes.GetFirst();
-
-    while( pNode )
-    {
-        if ( node_to_item( pNode ).mpObj == pForObj )
-
-            return pNode;
-
-        pNode = pNode->GetNext();
-    }
-
-    return NULL;
-}
-
-wxNode* GarbageCollector::FindReferenceFreeItemNode()
-{
-    wxNode* pNode = mAllNodes.GetFirst();
-
-    while( pNode )
-    {
-        if ( node_to_item( pNode ).mRefs.GetCount() == 0 ) 
-
-            return pNode;
-
-        pNode = pNode->GetNext();
-    }
-
-    return 0;
-}
-
-void GarbageCollector::RemoveReferencesToNode( wxNode* pItemNode )
-{
-    wxNode* pNode = mAllNodes.GetFirst();
-
-    while( pNode )
-    {
-        wxList& refLst   = node_to_item( pNode ).mRefs;
-        wxNode* pRefNode = refLst.GetFirst();
-
-        while( pRefNode )
-        {
-            if ( pRefNode->GetData() == (wxObject*)pItemNode )
-            {
-                wxNode* pNext = pRefNode->GetNext();
-
-                refLst.DeleteNode( pRefNode );
-
-                pRefNode = pNext;
-
-                continue;
-            }
-            else pRefNode = pRefNode->GetNext();
-        }
-
-        pNode = pNode->GetNext();
-    }
-}
-
-void GarbageCollector::ResolveReferences()
-{
-    wxNode* pNode = mAllNodes.GetFirst();
-
-    while( pNode )
-    {
-        GCItem& item = node_to_item( pNode );
-
-        wxNode* pRefNode = item.mRefs.GetFirst();
-
-        while( pRefNode )
-        {
-            pRefNode->SetData( (wxObject*) FindItemNode( (void*)pRefNode->GetData() ) );
-
-            pRefNode = pRefNode->GetNext();
-        }
-
-        pNode = pNode->GetNext();
-    }
-}
-
-void GarbageCollector::AddObject( void* pObj, int WXUNUSED(refCnt) )
-{
-    // FOR NOW:: initial ref-count is not used
-
-    GCItem* pItem = new GCItem();
-
-    pItem->mpObj  = pObj;
-
-    mAllNodes.Append( (wxObject*) pItem );
-}
-
-void GarbageCollector::AddDependency( void* pObj, void* pDependsOnObj )
-{
-    node_to_item( FindItemNode( pObj ) ).mRefs.Append( (wxObject*)pDependsOnObj );
-}
-
-/*** GC alg. implementation ***/
-
-void GarbageCollector::ArrangeCollection()
-{
-    ResolveReferences();
-
-    do
-    {
-        // find node, which does not depend on anything
-
-        wxNode* pItemNode = FindReferenceFreeItemNode();
-
-        if ( pItemNode )
-        {
-            // append it to the list, where items are contained
-            // in the increasing order of dependencies
-
-            mRegularLst.Append( pItemNode->GetData() );
-
-            mAllNodes.DeleteNode( pItemNode );
-
-            // remove references to this current "least-dependent" node
-            // from reference lists of all the other nodes
-
-            RemoveReferencesToNode( pItemNode );
-        }
-        else
-        {
-            // otherwise, what is left - all nodes, which
-            // are involved into cycled chains (rings)
-
-            wxNode* pNode = mAllNodes.GetFirst();
-
-            while( pNode )
-            {
-                mCycledLst.Append( pNode->GetData() );
-
-                pNode = pNode->GetNext();
-            }
-
-            mAllNodes.Clear();
-            break;
-        }
-
-        // continue search for "least-dependent" nodes
-
-    } while(1);
-}
-
-wxList& GarbageCollector::GetRegularObjects()
-{
-    return mRegularLst;
-}
-
-wxList& GarbageCollector::GetCycledObjects()
-{
-    return mCycledLst;
-}
-
-void GarbageCollector::Reset()
-{
-    DestroyItemList( mAllNodes   );
-    DestroyItemList( mRegularLst );
-    DestroyItemList( mCycledLst );
-}
-
diff --git a/contrib/src/fl/gcupdatesmgr.cpp b/contrib/src/fl/gcupdatesmgr.cpp
deleted file mode 100644
index 0ec1bcd358..0000000000
--- a/contrib/src/fl/gcupdatesmgr.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gcupdatesmgr.cpp
-// Purpose:     cbGCUpdatesMgr class, optimizing refresh using GarbageCollector
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     19/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas 
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/gcupdatesmgr.h"
-
-// helper function
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
-    if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
-         ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
-        if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
-             ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-             
-            return 1;
-
-    return 0;
-}
-
-// helper structure
-
-struct cbRectInfo
-{
-    cbBarInfo*  mpBar;
-    cbDockPane* mpPane;
-    wxRect*     mpCurBounds;
-    wxRect*     mpPrevBounds;
-};
-
-static inline cbRectInfo& node_to_rect_info( wxNode* pNode )
-{
-    return *( (cbRectInfo*) (pNode->GetData()) );
-}
-
-/***** Implementation for class cbSimpleUpdatesMgr *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbGCUpdatesMgr, cbSimpleUpdatesMgr )
-
-cbGCUpdatesMgr::cbGCUpdatesMgr( wxFrameLayout* pPanel )
-    : cbSimpleUpdatesMgr( pPanel )
-{}
-
-void cbGCUpdatesMgr::AddItem( wxList&     itemList,
-                              cbBarInfo*  pBar, 
-                              cbDockPane* pPane,
-                              wxRect&     curBounds,
-                              wxRect&     prevBounds )
-{
-    cbRectInfo* pInfo = new cbRectInfo();
-
-    pInfo->mpBar     = pBar;
-    pInfo->mpPane       = pPane;
-    pInfo->mpCurBounds  = &curBounds;
-    pInfo->mpPrevBounds = &prevBounds;
-
-    itemList.Append( (wxObject*) pInfo );
-}
-
-void cbGCUpdatesMgr::OnStartChanges()
-{
-    // memorize states of ALL items in the layout -
-    // this is quite excessive, but OK for the decent 
-    // implementation of updates manager
-
-    mpLayout->GetPrevClientRect() = mpLayout->GetClientRect();
-
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    for( int n = 0; n != MAX_PANES; ++n )
-    {
-        cbDockPane& pane = *(panes[n]);
-
-        // store pane state
-        pane.mUMgrData.StoreItemState( pane.mBoundsInParent );
-        pane.mUMgrData.SetDirty( false );
-
-        cbRowInfo* pRow = pane.GetFirstRow();
-
-        while ( pRow )
-        {
-            cbBarInfo* pBar = pRow->GetFirstBar();
-
-            // store row state
-            pRow->mUMgrData.StoreItemState( pRow->mBoundsInParent );
-            pRow->mUMgrData.SetDirty( false );
-
-            while( pBar )
-            {
-                // store bar state
-                pBar->mUMgrData.StoreItemState( pBar->mBoundsInParent );
-                pBar->mUMgrData.SetDirty( false );
-
-                pBar = pBar->mpNext;
-            }
-
-            pRow = pRow->mpNext;
-        }
-    }
-}
-
-void cbGCUpdatesMgr::UpdateNow()
-{
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    wxRect& r1 = mpLayout->GetClientRect();
-    wxRect& r2 = mpLayout->GetPrevClientRect();
-
-    // detect changes in client window's area
-
-    bool clientWindowChanged = ( r1.x      != r2.x     ||
-                                 r1.y      != r2.y     ||
-                                 r1.width  != r2.width ||
-                                 r1.height != r2.height );
-
-    // step #1 - detect changes in each row of each pane,
-    //           and repaint decorations around changed windows
-
-    wxList mBarsToResize;
-
-    int n;
-    for ( n = 0; n != MAX_PANES; ++n )
-    {
-        cbDockPane& pane = *(panes[n]);
-
-        bool paneChanged = WasChanged( pane.mUMgrData, pane.mBoundsInParent );
-
-        if ( paneChanged )
-        {
-            wxClientDC dc( &mpLayout->GetParentFrame() );
-            pane.PaintPaneBackground( dc );
-        }
-
-        wxRect realBounds;
-
-        cbRowInfo* pRow = pane.GetFirstRow();
-
-        while ( pRow )
-        {
-            wxDC* pDc = 0;
-
-            cbBarInfo* pBar = pRow->GetFirstBar();
-
-            bool rowChanged = false;
-//            bool rowBkPainted  = false;
-
-            // FIXME:: the below should not be fixed
-            cbBarInfo* barsToRepaint[128];
-            // number of bars, that were changed in the current row
-            int nBars = 0; 
-
-            //wxRect r1 = pRow->mUMgrData.mPrevBounds;
-            //wxRect r2 = pRow->mBoundsInParent;
-
-            if ( WasChanged( pRow->mUMgrData, pRow->mBoundsInParent ) )
-            
-                rowChanged = true;
-            else
-                while( pBar )
-                {
-                    if ( WasChanged( pBar->mUMgrData, pBar->mBoundsInParent ) )
-                    
-                        barsToRepaint[nBars++] = pBar;
-
-                    pBar = pBar->mpNext;
-                }
-
-            if ( nBars || rowChanged )
-            {
-                realBounds = pRow->mBoundsInParent;
-
-                // include 1-pixel thick shades around the row
-                realBounds.x -= 1;
-                realBounds.y -= 1;
-                realBounds.width  += 2;
-                realBounds.height += 2;
-
-                pDc = pane.StartDrawInArea( realBounds );
-            }
-
-            if ( rowChanged )
-            {
-                // postphone the resizement and refreshing the changed
-                // bar windows
-
-                cbBarInfo* pCurBar = pRow->GetFirstBar();
-
-                while ( pCurBar )
-                {
-                    if ( WasChanged( pCurBar->mUMgrData, 
-                                     pCurBar->mBoundsInParent ) )
-
-                        AddItem( mBarsToResize, pCurBar, &pane, 
-                                 pCurBar->mBoundsInParent,
-                                 pCurBar->mUMgrData.mPrevBounds );
-
-                    pCurBar = pCurBar->mpNext;
-                }
-
-                // draw only their decorations now
-
-                pane.PaintRow( pRow, *pDc );
-            }
-            else
-            if ( nBars != 0 )
-            {
-                for ( int i = 0; i != nBars; ++i )
-
-                    // postphone the resizement and refreshing the changed
-                    // bar windows
-
-                    AddItem( mBarsToResize, 
-                             barsToRepaint[i], 
-                             &pane, 
-                             barsToRepaint[i]->mBoundsInParent,
-                             barsToRepaint[i]->mUMgrData.mPrevBounds );
-
-                // redraw decorations of entire row, regardless of how much
-                // of the bars were changed
-
-                pane.PaintRow( pRow, *pDc );
-            }
-
-            if ( pDc )
-        
-                pane.FinishDrawInArea( realBounds );
-
-            pRow = pRow->mpNext;
-
-        } // end of while
-
-        if ( paneChanged )
-        {
-            wxClientDC dc( &mpLayout->GetParentFrame() );
-            pane.PaintPaneDecorations( dc );
-        }
-
-    } // end of for
-
-    if ( clientWindowChanged && !mpLayout->mClientWndRefreshPending )
-    {
-        // ptr to client-window object is "marked" as NULL
-
-        AddItem( mBarsToResize, NULL, NULL, 
-                 mpLayout->GetClientRect(),
-                 mpLayout->GetPrevClientRect() );
-    }
-
-    // step #2 - do ordered refreshing and resizing of bar window objects now
-
-    DoRepositionItems( mBarsToResize );
-}
-
-void cbGCUpdatesMgr::DoRepositionItems( wxList& items )
-{
-    wxNode* pNode1 = items.GetFirst();
-
-    while( pNode1 )
-    {
-        cbRectInfo& info = node_to_rect_info( pNode1 );
-
-        wxNode* pNode2 = items.GetFirst();
-
-        // and node itself
-
-        mGC.AddObject( &info );
-
-        while( pNode2 )
-        {
-            if ( pNode2 != pNode1 ) // node should not depend on itself
-            {
-                // Add references to objects on which this object
-                // depends. Dependency here indicates intersection of current
-                // bounds of this object with the initial bounds of the
-                // other object.
-
-                cbRectInfo& otherInfo = node_to_rect_info( pNode2 );
-
-                if ( rect_hits_rect( *info.mpCurBounds, *otherInfo.mpPrevBounds ) )
-                
-                                    // the node    depends on node
-                    mGC.AddDependency( &info,      &otherInfo      );
-            }
-
-            pNode2 = pNode2->GetNext();
-        }
-
-        pNode1 = pNode1->GetNext();
-    }
-
-    mGC.ArrangeCollection(); // order nodes according "least-dependency" rule,
-                             // and find out cycled chains
-
-    // Regular item nodes need to be resized, but not repainted (since
-    // they stand in linear (not cyclic) dependency with other
-    // regular nodes).
-
-    wxNode* pNode = mGC.GetRegularObjects().GetFirst();
-
-    while ( pNode )
-    {
-        cbRectInfo& info = *((cbRectInfo*)gc_node_to_obj(pNode));
-
-        if ( info.mpBar == NULL ) 
-            
-            mpLayout->PositionClientWindow();
-        else
-            info.mpPane->SizeBar( info.mpBar );
-
-        pNode = pNode->GetNext();
-    }
-
-    // cycled item nodes, need to be both resized and repainted
-
-    pNode = mGC.GetCycledObjects().GetFirst();
-
-    while ( pNode )
-    {
-        cbRectInfo& info = *((cbRectInfo*)gc_node_to_obj(pNode));
-
-        if ( info.mpBar == NULL ) 
-        {
-            wxWindow* pClntWnd = mpLayout->GetFrameClient();
-
-            mpLayout->PositionClientWindow();
-
-            // FIXME FIXME:: excessive!
-
-            pClntWnd->Show( false );
-            pClntWnd->Show( true  );
-
-            // OLD STUFF:: mpLayout->PositionClientWindow();
-        }
-        else
-        if ( info.mpBar->mpBarWnd )
-        {
-            wxWindow* pWnd = info.mpBar->mpBarWnd;
-
-            // resize
-            info.mpPane->SizeBar( info.mpBar );
-
-            // repaint
-
-            /* OLD STUFF:: bool isChoice = info.mpBar->IsKindOf( CLASSINFO( wxChoice ) );
-
-            //#ifdef __WINDOWS__
-            //int result = ::SendMessage( (HWND)pWnd->m_hWnd, WM_NCPAINT, 0, 0 );
-            //#endif
-            */
-
-            // FIXME FIXME:: there's no other way to repaint non-client area of the wxWindow!!
-            //                 so we do *excessive* "hide 'n show"
-
-            pWnd->Show(false);
-            pWnd->Show(true);
-                
-            pWnd->Refresh();
-        }
-
-        pNode = pNode->GetNext();
-    }
-
-    // release data prepared for GC alg.
-
-    pNode = items.GetFirst();
-
-    while( pNode )
-    {
-        cbRectInfo* pInfo = (cbRectInfo*)(pNode->GetData());
-
-        delete pInfo;
-
-        pNode = pNode->GetNext();
-    }
-
-    mGC.Reset(); // reinit GC
-
-    // FIXME:: this is a dirty-workaround for messy client-area,
-    //         as a result of docking bar out of floated-container window
-
-    if ( mpLayout->mClientWndRefreshPending )
-    {
-        mpLayout->PositionClientWindow();
-        mpLayout->GetFrameClient()->Refresh();
-    }
-}
-
diff --git a/contrib/src/fl/hintanimpl.cpp b/contrib/src/fl/hintanimpl.cpp
deleted file mode 100644
index fd49501c18..0000000000
--- a/contrib/src/fl/hintanimpl.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        hintanimpl.cpp
-// Purpose:     cbHintAnimationPlugin implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     9/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/hintanimpl.h"
-
-#define POS_UNDEFINED -32768
-
-/***** Implementation for class cbHintAnimationPlugin *****/
-
-// FIXME:: some of the below code should be eliminated by 
-//         reusing parts of cbBarDragPlugin's implementation
-
-IMPLEMENT_DYNAMIC_CLASS( cbHintAnimationPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbHintAnimationPlugin, cbPluginBase )
-
-    EVT_PL_DRAW_HINT_RECT( cbHintAnimationPlugin::OnDrawHintRect )
-
-END_EVENT_TABLE()
-
-cbHintAnimationPlugin::cbHintAnimationPlugin(void)
-
-    : mpScrDc( NULL ),
-      mpAnimTimer( 0 ),
-      mAnimStarted( false ),
-      
-      mMorphDelay    ( 5   ),
-      mMaxFrames     ( 20   ),
-      mInClientHintBorder( 4 ),
-      mAccelerationOn( true )
-{}
-
-cbHintAnimationPlugin::cbHintAnimationPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask ),
-      mpScrDc( NULL ),
-      mpAnimTimer( 0 ),
-      mAnimStarted( false ),
-
-      mMorphDelay    ( 5   ),
-      mMaxFrames     ( 20   ),
-      mInClientHintBorder( 4 ),
-      mAccelerationOn( true )
-{}
-
-cbHintAnimationPlugin::~cbHintAnimationPlugin()
-{
-    if ( mpScrDc ) delete mpScrDc;
-}
-
-/*** rect-tracking related methods ***/
-
-void cbHintAnimationPlugin::OnDrawHintRect( cbDrawHintRectEvent& event )
-{
-    if ( !mAnimStarted && !mpScrDc ) 
-    {
-        StartTracking();
-
-        mPrevInClient = event.mIsInClient;
-
-        mPrevRect = event.mRect;
-
-        mStopPending = false;
-    }
-
-    if ( !event.mEraseRect )
-    {
-        // pass on current hint-rect info to the animation "thread", in 
-        // order to make adjustments to the morph-target on-the-fly
-
-        mCurRect.x = event.mRect.x;
-        mCurRect.y = event.mRect.y;
-        mCurRect.width  = event.mRect.width;
-        mCurRect.height = event.mRect.height;
-    }
-
-    // check the amount of change in the shape of hint,
-    // and start morph-effect if change is "sufficient"
-
-    int change = abs( mCurRect.width  - mPrevRect.width  ) +
-                 abs( mCurRect.height - mPrevRect.height );
-
-    if ( change > 10 && !event.mLastTime && !event.mEraseRect )
-    {
-        if ( !mpAnimTimer )
-
-            mpAnimTimer  = new cbHintAnimTimer();
-
-        // init the animation "thread", or reinit if already started
-
-        mpAnimTimer->Init( this, mAnimStarted );
-
-        mAnimStarted = true;
-    }
-    else
-    if ( !mAnimStarted )
-    {
-        DoDrawHintRect( event.mRect, event.mIsInClient );
-
-        if ( event.mLastTime )
-
-            FinishTracking();
-
-        mPrevInClient = event.mIsInClient;
-    }
-    else
-    {
-        mCurInClient = event.mIsInClient;
-
-        if ( event.mLastTime && mpAnimTimer ) 
-        {
-            mStopPending = true;
-
-            if ( mpAnimTimer->mPrevMorphed.x != POS_UNDEFINED )
-
-                // erase previous rect
-                DoDrawHintRect( mpAnimTimer->mPrevMorphed, mPrevInClient );
-        }
-    }
-
-    mPrevRect = event.mRect;
-}
-
-#define _IMG_A  0xAA    // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B  0x00    // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C  0x55    // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D  0x00    // Note: modified from _D to _IMG_D, for consistency reasons.
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D
-                                              };
-
-void cbHintAnimationPlugin::StartTracking()
-{
-    mpScrDc = new wxScreenDC;
-
-    wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-}
-
-void cbHintAnimationPlugin::DoDrawHintRect( wxRect& rect, bool isInClientRect)
-{
-    wxRect scrRect;
-
-    RectToScr( rect, scrRect );
-
-    int prevLF = mpScrDc->GetLogicalFunction();
-
-    mpScrDc->SetLogicalFunction( wxXOR );
-
-    if ( isInClientRect )
-    {
-        // BUG BUG BUG (wx):: somehow stippled brush works only  
-        //                      when the bitmap created on stack, not
-        //                      as a member of the class
-
-        wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
-        wxBrush checkerBrush( checker );
-
-        mpScrDc->SetPen( mpLayout->mNullPen );
-        mpScrDc->SetBrush( checkerBrush );
-
-        int half = mInClientHintBorder / 2;
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y - half,
-                                scrRect.width + 2*half, mInClientHintBorder );
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + scrRect.height - half,
-                                scrRect.width + 2*half, mInClientHintBorder );
-
-        mpScrDc->DrawRectangle( scrRect.x - half, scrRect.y + half - 1,
-                                mInClientHintBorder, scrRect.height - 2*half + 2);
-
-        mpScrDc->DrawRectangle( scrRect.x + scrRect.width - half,
-                                scrRect.y + half - 1,
-                                mInClientHintBorder, scrRect.height - 2*half + 2);
-
-        mpScrDc->SetBrush( wxNullBrush );
-    }
-    else
-    {
-        // otherwise draw 1-pixel thin borders
-
-        mpScrDc->SetPen( mpLayout->mBlackPen );
-
-        mpScrDc->DrawLine( scrRect.x, scrRect.y, 
-                           scrRect.x + scrRect.width, scrRect.y );
-
-        mpScrDc->DrawLine( scrRect.x, scrRect.y + 1, 
-                           scrRect.x, scrRect.y + scrRect.height );
-
-        mpScrDc->DrawLine( scrRect.x+1, scrRect.y + scrRect.height, 
-                           scrRect.x + scrRect.width, scrRect.y + scrRect.height );
-
-        mpScrDc->DrawLine( scrRect.x + scrRect.width , scrRect.y, 
-                           scrRect.x + scrRect.width, scrRect.y + scrRect.height + 1);
-    }
-
-    mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void cbHintAnimationPlugin::DrawHintRect ( wxRect& rect, bool isInClientRect)
-{
-    DoDrawHintRect( rect, isInClientRect );    
-}
-
-void cbHintAnimationPlugin::EraseHintRect( wxRect& rect, bool isInClientRect)
-{
-    DoDrawHintRect( rect, isInClientRect );    
-}
-
-void cbHintAnimationPlugin::FinishTracking()
-{
-    wxScreenDC::EndDrawingOnTop();
-
-    delete mpScrDc;
-
-    mpScrDc = NULL;
-}
-
-void cbHintAnimationPlugin::RectToScr( wxRect& frameRect, wxRect& scrRect )
-{
-    scrRect = frameRect;
-
-    int x = frameRect.x, y = frameRect.y;
-
-    mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
-    scrRect.x = x;
-    scrRect.y = y;
-}
-
-/***** Implementation for class cbHintAnimTimer *****/
-
-cbHintAnimTimer::cbHintAnimTimer(void)
-{
-#ifdef __WINDOWS__
-    mLock = 0L;
-#endif
-
-    mPrevMorphed.x = POS_UNDEFINED;
-}
-
-void cbHintAnimTimer::MorphPoint( wxPoint& origin, MorphInfoT& info, wxPoint& point )
-{
-    // simulate lienar movement (FOR NOW:: without acceleration)
-
-    double k;
-    
-    if ( mpPl->mAccelerationOn )
-        
-        k = double( mCurIter*mCurIter ) / 
-            double( (mpPl->mMaxFrames - 1)*(mpPl->mMaxFrames - 1) );
-    else
-        k = double( mCurIter ) / double( mpPl->mMaxFrames - 1 );
-
-    point.x = int ( double ( info.mFrom.x + double (info.mTill.x - info.mFrom.x) * k ) );
-
-    point.y = int ( double ( info.mFrom.y + double (info.mTill.y - info.mFrom.y) * k ) );
-
-    point.x += origin.x;
-    point.y += origin.y;
-}
-
-void cbHintAnimTimer::Notify(void)
-{
-    // FIXME:: "clean" implementation should use mutex to sync
-    //         between GUI and animation threads
-
-    if ( mpPl->mStopPending )
-    {
-        Stop(); // top timer
-
-        mpPl->FinishTracking();
-
-        mpPl->mStopPending = false;
-        mpPl->mpAnimTimer  = NULL;
-        mpPl->mAnimStarted = false;
-
-        mPrevMorphed.x = POS_UNDEFINED;
-
-        delete this;
-
-        return;
-    }
-
-    wxPoint origin( mpPl->mCurRect.x, mpPl->mCurRect.y );
-
-    wxPoint curUpper, curLower;
-
-    MorphPoint( origin, mUpperLeft,  curUpper  );
-    MorphPoint( origin, mLowerRight, curLower );
-
-    if ( mPrevMorphed.x != POS_UNDEFINED )
-
-        // erase previous rect
-        mpPl->DoDrawHintRect( mPrevMorphed, mpPl->mPrevInClient );
-
-    wxRect morphed( curUpper.x,  curUpper.y,
-                    curLower.x - curUpper.x,
-                    curLower.y - curUpper.y );
-
-    // draw rect of current iteration
-    mpPl->DoDrawHintRect( morphed, 
-                          ( mCurIter != mpPl->mMaxFrames - 1 ) 
-                          ? mpPl->mPrevInClient : mpPl->mCurInClient );
-
-    mPrevMorphed = morphed;
-
-    if ( mCurIter == mpPl->mMaxFrames - 1 ) 
-    {
-        Stop(); // top timer
-        
-        mpPl->FinishTracking();
-        mpPl->mpAnimTimer  = NULL;
-        mpPl->mAnimStarted = false;
-
-        mPrevMorphed.x = POS_UNDEFINED;
-
-        delete this;
-    }
-    else
-        ++mCurIter;
-}
-
-bool cbHintAnimTimer::Init( cbHintAnimationPlugin* pAnimPl, bool reinit )
-{
-
-    mpPl = pAnimPl;
-
-    // morph-points are set up relatively to the upper-left corner
-    // of the current hint-rectangle
-
-    if ( !reinit )
-    {
-        mUpperLeft.mFrom.x = mpPl->mPrevRect.x - mpPl->mCurRect.x;
-        mUpperLeft.mFrom.y = mpPl->mPrevRect.y - mpPl->mCurRect.y;
-
-        mLowerRight.mFrom.x = ( mUpperLeft.mFrom.x + mpPl->mPrevRect.width  );
-        mLowerRight.mFrom.y = ( mUpperLeft.mFrom.y + mpPl->mPrevRect.height );
-    }
-    else
-    {
-        wxPoint origin( mpPl->mPrevRect.x, mpPl->mPrevRect.y );
-
-        wxPoint curUpper, curLower;
-
-        MorphPoint( origin, mUpperLeft,  curUpper  );
-        MorphPoint( origin, mLowerRight, curLower );
-
-        mUpperLeft.mFrom.x = curUpper.x - mpPl->mCurRect.x;
-        mUpperLeft.mFrom.y = curUpper.y - mpPl->mCurRect.y;
-
-        mLowerRight.mFrom.x = ( mUpperLeft.mFrom.x + curLower.x - curUpper.x );
-        mLowerRight.mFrom.y = ( mUpperLeft.mFrom.y + curLower.y - curUpper.y );
-    }
-
-    mUpperLeft.mTill.x = 0;
-    mUpperLeft.mTill.y = 0;
-
-    mLowerRight.mTill.x = mpPl->mCurRect.width;
-    mLowerRight.mTill.y = mpPl->mCurRect.height;
-
-    mCurIter = 1;
-    
-    if ( !reinit )
-
-        Start( mpPl->mMorphDelay );
-
-    return true;
-}
-
diff --git a/contrib/src/fl/makedocs.vc b/contrib/src/fl/makedocs.vc
deleted file mode 100644
index 40d1733a01..0000000000
--- a/contrib/src/fl/makedocs.vc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# File:         makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=fl
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\$(NAME).tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: touchmanual $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: touchmanual $(DOCDIR)\htmlhelp\$(NAME).chm
-htb:	$(DOCDIR)\htb\$(NAME).htb
-hlp: touchmanual $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
-	touch $(DOCSOURCEDIR)\$(NAME).tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp:         $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
-        cd $(DOCSOURCEDIR)
-        -erase $(NAME).ph
-        hcw /c /e $(NAME)
-        move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
-        move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
-        cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
-	echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm:         $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -mkdir $(DOCDIR)\html\$(NAME)
-        copy *.gif $(DOCDIR)\html\$(NAME)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\html\$(NAME)\$(NAME).htm -twice -html
-        -erase $(DOCDIR)\html\$(NAME)\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\$(NAME)\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
-	cd $(DOCDIR)\html\$(NAME)
-	-hhc $(NAME).hhp
-    -erase $(DOCDIR)\htmlhelp\$(NAME).chm
-    move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-	cd $(DOCDIR)\html\$(NAME)
-    -erase $(NAME).zip $(NAME).htb
-    zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
-    cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi:	$(DOCSOURCES)
-	cd $(DOCSOURCEDIR)
-        -latex $(NAME)
-        -latex $(NAME)
-        -makeindx $(NAME)
-        -bibtex $(NAME)
-        -latex $(NAME)
-        -latex $(NAME)
-        cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps:	$(DOCSOURCEDIR)\$(NAME).dvi
-	cd $(DOCSOURCEDIR)
-        -dvips32 -o $(NAME).ps $(NAME)
-        move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
-        cd $(THISDIR)
-
diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp
deleted file mode 100644
index eb83eb9c62..0000000000
--- a/contrib/src/fl/newbmpbtn.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        newbmpbtn.cpp
-// Purpose:     wxNewBitmapButton enhanced bitmap button class.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     ??/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/fl/newbmpbtn.h"
-#include "wx/utils.h"     // import wxMin,wxMax macros
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-///////////// button-label rendering helpers //////////////////
-
-static int* create_array( int width, int height, int fill = 0 )
-{
-    int* array = new int[width*height];
-
-    int len = width*height;
-    int i;
-    for ( i = 0; i != len; ++i )
-        array[i] = fill;
-
-    return array;
-}
-
-#define GET_ELEM(array,x,y) (array[width*(y)+(x)])
-
-#define MIN_COLOR_DIFF 10
-
-#define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
-
-#define GET_RED(col)    col        & 0xFF
-#define GET_GREEN(col) (col >> 8)  & 0xFF
-#define GET_BLUE(col)  (col >> 16) & 0xFF
-
-#define MAKE_INT_COLOR(red,green,blue) (     (red)                      | \
-                                         ( ( (green) << 8 ) & 0xFF00  ) | \
-                                         ( ( (blue)  << 16) & 0xFF0000) \
-                                       )
-
-#define IS_GREATER(col1,col2) ( ( (GET_RED(col1)  ) > (GET_RED(col2)  ) + MIN_COLOR_DIFF ) && \
-                                ( (GET_GREEN(col1)) > (GET_GREEN(col2)) + MIN_COLOR_DIFF ) &&  \
-                                ( (GET_BLUE(col1) ) > (GET_BLUE(col2) ) + MIN_COLOR_DIFF )     \
-                              )
-
-#define MASK_BG    0
-#define MASK_DARK  1
-#define MASK_LIGHT 2
-
-// helper function, used internally
-
-static void gray_out_pixmap( int* src, int* dest, int width, int height )
-{
-    // assuming the pixels along the edges are of the background color
-
-    int x = 0;
-    int y = 1;
-
-    do
-    {
-        int cur       = GET_ELEM(src,x,y);
-
-
-        if ( IS_IN_ARRAY(x-1,y-1) )
-        {
-            int upperElem = GET_ELEM(src,x-1,y-1);
-
-            // if the upper element is lighter than current
-            if ( IS_GREATER(upperElem,cur) )
-            {
-                GET_ELEM(dest,x,y) = MASK_DARK;
-            }
-            else
-            // if the current element is ligher than the upper
-            if ( IS_GREATER(cur,upperElem) )
-            {
-                GET_ELEM(dest,x,y) = MASK_LIGHT;
-            }
-            else
-            {
-                if ( GET_ELEM(dest,x-1,y-1) == MASK_LIGHT )
-
-                    GET_ELEM(dest,x,y) = MASK_BG;
-
-                if ( GET_ELEM(dest,x-1,y-1 ) == MASK_DARK )
-
-                    GET_ELEM(dest,x,y) = MASK_DARK;
-                else
-                    GET_ELEM(dest,x,y) = MASK_BG;
-            }
-        }
-
-        // go zig-zag
-
-        if ( IS_IN_ARRAY(x+1,y-1) )
-        {
-            ++x;
-            --y;
-        }
-        else
-        {
-            while ( IS_IN_ARRAY(x-1,y+1) )
-            {
-                --x;
-                ++y;
-            }
-
-            if ( IS_IN_ARRAY(x,y+1) )
-            {
-                ++y;
-                continue;
-            }
-            else
-            {
-                if ( IS_IN_ARRAY(x+1,y) )
-                {
-                    ++x;
-                    continue;
-                }
-                else break;
-            }
-        }
-
-    } while (1);
-}
-
-// algorithm for making the image look "grayed" (e.g. disabled button)
-// NOTE:: used GetPixel(), which is Windows-Only!
-
-void gray_out_image_on_dc( wxDC& dc, int width, int height )
-{
-    // assuming the pixels along the edges are of the background color
-    wxColour bgCol;
-    dc.GetPixel( 0, 0, &bgCol );
-
-    wxPen darkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW),1, wxSOLID );
-    wxPen lightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT),1, wxSOLID );
-    wxPen bgPen   ( bgCol,                1, wxSOLID );
-
-    int* src  = create_array( width, height, MASK_BG );
-    int* dest = create_array( width, height, MASK_BG );
-
-    int x, y;
-    for ( y = 0; y != height; ++y )
-    {
-        for ( x = 0; x != width; ++x )
-        {
-            wxColour col;
-            dc.GetPixel( x,y, &col );
-
-            GET_ELEM(src,x,y) = MAKE_INT_COLOR( col.Red(), col.Green(), col.Blue() );
-        }
-    }
-    gray_out_pixmap( src, dest, width, height );
-
-    for ( y = 0; y != height; ++y )
-    {
-        for ( x = 0; x != width; ++x )
-        {
-            int mask = GET_ELEM(dest,x,y);
-
-            switch (mask)
-            {
-                case MASK_BG    : { dc.SetPen( bgPen );
-                                    dc.DrawPoint( x,y ); break;
-                                  }
-                case MASK_DARK  : { dc.SetPen( darkPen );
-                                    dc.DrawPoint( x,y ); break;
-                                  }
-                case MASK_LIGHT : { dc.SetPen( lightPen );
-                                    dc.DrawPoint( x,y ); break;
-                                  }
-                default : break;
-            }
-        }
-    }
-    delete [] src;
-    delete [] dest;
-}
-
-///////////////////////////////
-
-/***** Implementation for class wxNewBitmapButton *****/
-
-IMPLEMENT_DYNAMIC_CLASS(wxNewBitmapButton, wxPanel)
-
-BEGIN_EVENT_TABLE( wxNewBitmapButton, wxPanel )
-
-    EVT_LEFT_DOWN   ( wxNewBitmapButton::OnLButtonDown   )
-    EVT_LEFT_UP     ( wxNewBitmapButton::OnLButtonUp     )
-//    EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDClick )
-    EVT_LEFT_DCLICK ( wxNewBitmapButton::OnLButtonDown )
-    EVT_ENTER_WINDOW( wxNewBitmapButton::OnMouseEnter    )
-    EVT_LEAVE_WINDOW( wxNewBitmapButton::OnMouseLeave    )
-
-    EVT_SIZE ( wxNewBitmapButton::OnSize  )
-    EVT_PAINT( wxNewBitmapButton::OnPaint )
-
-    //EVT_KILL_FOCUS( wxNewBitmapButton::OnKillFocus )
-
-    EVT_ERASE_BACKGROUND( wxNewBitmapButton::OnEraseBackground )
-
-    EVT_IDLE(wxNewBitmapButton::OnIdle)
-
-END_EVENT_TABLE()
-
-wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
-                                      const wxString& labelText,
-                                      int  alignText,
-                                      bool isFlat,
-                                      int  firedEventType,
-                                      int  marginX,
-                                      int  marginY,
-                                      int  textToLabelGap,
-                                      bool isSticky)
-    :   mTextToLabelGap  ( textToLabelGap ),
-        mMarginX( marginX ),
-        mMarginY( marginY ),
-        mTextAlignment( alignText ),
-        mIsSticky( isSticky ),
-        mIsFlat( isFlat ),
-        mLabelText( labelText ),
-        mImageFileType( wxBITMAP_TYPE_INVALID ),
-        mDepressedBmp( labelBitmap ),
-
-        mpDepressedImg( NULL ),
-        mpPressedImg  ( NULL ),
-        mpDisabledImg ( NULL ),
-        mpFocusedImg  ( NULL ),
-
-
-        mDragStarted  ( false ),
-        mIsPressed    ( false ),
-        mIsInFocus    ( false ),
-        mIsToggled    ( false ),
-        mHasFocusedBmp( false ),
-        mFiredEventType( firedEventType ),
-
-        mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),
-        mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
-        mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-        mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
-
-        mIsCreated( false ),
-        mSizeIsSet( false )
-
-{
-}
-
-wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
-                                      const wxBitmapType  bitmapFileType,
-                                      const wxString& labelText,
-                                      int  alignText,
-                                      bool isFlat,
-                                      int  WXUNUSED(firedEventType),
-                                      int  WXUNUSED(marginX),
-                                      int  WXUNUSED(marginY),
-                                      int  WXUNUSED(textToLabelGap),
-                                      bool WXUNUSED(isSticky))
-
-    :   mTextToLabelGap  ( 2 ),
-        mMarginX( 2 ),
-        mMarginY( 2 ),
-        mTextAlignment( alignText ),
-        mIsSticky( false ),
-        mIsFlat( isFlat ),
-        mLabelText( labelText ),
-        mImageFileName( bitmapFileName ),
-        mImageFileType( bitmapFileType ),
-
-        mpDepressedImg( NULL ),
-        mpPressedImg  ( NULL ),
-        mpDisabledImg ( NULL ),
-        mpFocusedImg  ( NULL ),
-
-        mDragStarted  ( false ),
-        mIsPressed    ( false ),
-        mIsInFocus    ( false ),
-        mIsToggled    ( false ),
-        mHasFocusedBmp( false ),
-        mFiredEventType( wxEVT_COMMAND_MENU_SELECTED ),
-
-        mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),
-        mDarkPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
-        mGrayPen ( wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
-        mLightPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT), 1, wxSOLID ),
-
-        mIsCreated( false ),
-        mSizeIsSet( false )
-
-{
-}
-
-wxNewBitmapButton::~wxNewBitmapButton(void)
-{
-    DestroyLabels();
-}
-
-void wxNewBitmapButton::DrawShade( int outerLevel,
-                                   wxDC&  dc,
-                                   wxPen& upperLeftSidePen,
-                                   wxPen& lowerRightSidePen )
-{
-    wxBitmap* pBmp = GetStateLabel();
-    int x = mMarginX - (outerLevel + 2);
-    int y = mMarginY - (outerLevel + 2);
-    int height = pBmp->GetHeight() + (outerLevel + 2)*2 - 1;
-    int width  = pBmp->GetWidth()  + (outerLevel + 2)*2 - 1;
-    dc.SetPen( upperLeftSidePen );
-    dc.DrawLine( x,y, x + width, y  );
-    dc.DrawLine( x,y, x, y + height );
-    dc.DrawLine( x,y+1, x + width , y +1 );  // top
-    dc.DrawLine( x+1,y, x+1, y + height );  // left
-
-    dc.SetPen( lowerRightSidePen );
-    dc.DrawLine( x + width, y, x + width, y + height + 1  );
-    dc.DrawLine( x, y + height, x + width, y + height );
-    dc.DrawLine( x + width-1, y+1, x + width-1, y + height +1  );  // right
-    dc.DrawLine( x +1, y + height-1, x + width, y + height-1 );  // bottom
-}
-
-void wxNewBitmapButton::DestroyLabels()
-{
-    if ( mpDepressedImg ) delete mpDepressedImg;
-    if ( mpPressedImg   ) delete mpPressedImg;
-    if ( mpDisabledImg  ) delete mpDisabledImg;
-    if ( mpFocusedImg   ) delete mpFocusedImg;
-
-    mpDepressedImg = NULL;
-    mpPressedImg   = NULL;
-    mpDisabledImg  = NULL;
-    mpFocusedImg   = NULL;
-}
-
-wxBitmap* wxNewBitmapButton::GetStateLabel()
-{
-    if ( IsEnabled() )
-    {
-        if ( mIsPressed )
-        {
-            return mpPressedImg;
-        }
-        else
-        {
-            if ( mIsInFocus )
-            {
-                if ( mHasFocusedBmp )
-
-                    return mpFocusedImg;
-                else
-                    return mpDepressedImg;
-            }
-            else
-                return mpDepressedImg;
-        }
-    }
-    else
-        return mpDisabledImg;
-}
-
-#ifndef __WXMSW__
-
-static const unsigned char _gDisableImage[] = { 0x55,0xAA,0x55,0xAA,
-                                              0x55,0xAA,0x55,0xAA,
-                                              0x55,0xAA,0x55,0xAA,
-                                              0x55,0xAA,0x55,0xAA
-                                            };
-
-#endif
-
-void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
-                                          bool isEnabled, bool isPressed )
-{
-    if ( destBmp != 0 ) return;
-
-    // render labels on-demand
-
-    wxMemoryDC srcDc;
-    srcDc.SelectObject( *srcBmp );
-
-    bool hasText = ( mTextAlignment != NB_NO_TEXT ) &&
-                   ( mLabelText.length() != 0 );
-
-    bool hasImage = (mTextAlignment != NB_NO_IMAGE);
-
-    wxSize destDim;
-    wxPoint txtPos;
-    wxPoint imgPos;
-
-    if ( hasText )
-    {
-        long txtWidth, txtHeight;
-
-        srcDc.SetFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) );
-        srcDc.GetTextExtent( mLabelText, &txtWidth, &txtHeight );
-
-        if ( mTextAlignment == NB_ALIGN_TEXT_RIGHT )
-        {
-            destDim.x = srcBmp->GetWidth() + 2*mTextToLabelGap + txtWidth;
-
-            destDim.y =
-                wxMax( srcBmp->GetHeight(), txtHeight );
-
-            txtPos.x = srcBmp->GetWidth() + mTextToLabelGap;
-            txtPos.y = (destDim.y - txtHeight)/2;
-            imgPos.x = 0;
-            imgPos.y = (destDim.y - srcBmp->GetHeight())/2;
-        }
-        else
-        if ( mTextAlignment == NB_ALIGN_TEXT_BOTTOM )
-        {
-            destDim.x =
-                wxMax( srcBmp->GetWidth(), txtWidth );
-
-            destDim.y = srcBmp->GetHeight() + mTextToLabelGap + txtHeight;
-
-            txtPos.x = (destDim.x - txtWidth)/2;
-            txtPos.y = srcBmp->GetHeight() + mTextToLabelGap;
-            imgPos.x = (destDim.x - srcBmp->GetWidth())/2;
-            imgPos.y = 0;
-        }
-        else
-        {
-            wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
-        }
-    }
-    else
-    {
-        imgPos.x = 0;
-        imgPos.y = 0;
-        destDim.x = srcBmp->GetWidth();
-        destDim.y = srcBmp->GetHeight();
-    }
-
-    destBmp = new wxBitmap( int(destDim.x), int(destDim.y) );
-
-    wxMemoryDC destDc;
-    destDc.SelectObject( *destBmp );
-
-    wxBrush grayBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE), wxSOLID );
-
-    destDc.SetBrush( grayBrush );
-    destDc.SetPen( *wxTRANSPARENT_PEN );
-    destDc.DrawRectangle( 0,0, destDim.x+1, destDim.y+1 );
-
-    if ( isPressed )
-    {
-        ++imgPos.x; ++imgPos.y;
-        ++txtPos.x; ++txtPos.y;
-    }
-
-    if ( hasImage )
-    {
-
-        destDc.Blit( imgPos.x, imgPos.y,
-                 srcBmp->GetWidth(),
-                 srcBmp->GetHeight(),
-                 &srcDc, 0,0, wxCOPY,true );
-    }
-
-    if ( hasText )
-    {
-        wxWindow* pTopWnd = this;
-
-        do
-        {
-            wxWindow* pParent = pTopWnd->GetParent();
-
-            if ( pParent == 0 )
-                break;
-
-            pTopWnd = pParent;
-        } while (1);
-
-        destDc.SetFont( wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT) );
-
-        if ( isEnabled )
-        {
-            destDc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) );
-        }
-        else
-        {
-            destDc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) );
-        }
-        destDc.SetTextBackground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) );
-
-        destDc.DrawText( mLabelText, txtPos.x, txtPos.y );
-    }
-
-    if ( !isEnabled ){
-
-#ifdef __WXMSW__ // This is currently MSW specific
-        gray_out_image_on_dc( destDc, destDim.x, destDim.y );
-#else
-        wxBitmap bmp( (const char*)_gDisableImage,8,8);
-        wxBrush checkerBrush(bmp);
-        checkerBrush.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-        destDc.SetBrush( checkerBrush );
-        destDc.DrawRectangle( imgPos.x, imgPos.y, srcBmp->GetWidth()+1, srcBmp->GetHeight()+1);
-#endif
-    }
-    // adjust button size to fit the new dimensions of the label
-    if ( !mSizeIsSet && 0 )
-    {
-        mSizeIsSet = true;
-        SetSize( wxDefaultCoord, wxDefaultCoord,
-                 destBmp->GetWidth()  + mMarginX*2,
-                 destBmp->GetHeight() + mMarginY*2, 0
-            );
-    }
-    destDc.SelectObject( wxNullBitmap );
-
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    // Map to system colours
-    (void) wxToolBar::MapBitmap(destBmp->GetHBITMAP(), destBmp->GetWidth(), destBmp->GetHeight());
-#endif
-}
-
-void wxNewBitmapButton::RenderAllLabelImages()
-{
-    if ( !mIsCreated )
-        return;
-    RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );
-    RenderLabelImage( mpPressedImg,   &mDepressedBmp, true, true );
-    RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
-    if ( mHasFocusedBmp )
-    {
-        RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );
-    }
-}
-
-
-void wxNewBitmapButton::RenderLabelImages()
-{
-    if ( !mIsCreated )
-        return;
-
-    if ( !IsEnabled() )
-    {
-        RenderLabelImage( mpDisabledImg, &mDepressedBmp, false );
-    }
-    else
-
-    if ( mIsPressed )
-
-        RenderLabelImage( mpPressedImg,   &mDepressedBmp, true, true );
-    else
-    {
-        if ( mIsInFocus )
-        {
-            if ( mHasFocusedBmp )
-                RenderLabelImage( mpFocusedImg, &mFocusedBmp, true, false );
-            else
-                RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
-        }
-        else
-            RenderLabelImage( mpDepressedImg, &mDepressedBmp, true, false );
-    }
-}
-
-bool wxNewBitmapButton::Toggle(bool enable)
-{
-    if ( mIsToggled == enable )
-    {
-        return false;
-    }
-
-    mIsToggled = enable;
-    Refresh();
-
-    return true;
-}
-
-bool wxNewBitmapButton::Enable(bool enable)
-{
-    if ( enable != m_isEnabled )
-    {
-        if ( mIsInFocus )
-        {
-            mIsInFocus = false;
-        }
-
-        if ( mIsPressed )
-        {
-            mIsPressed = false;
-        }
-
-        Refresh();
-    }
-
-    return wxPanel::Enable( enable );
-}
-
-void wxNewBitmapButton::DrawDecorations( wxDC& dc )
-{
-    if ( mIsFlat )
-    {
-        DrawShade( 1, dc, mGrayPen,  mGrayPen  );
-        if ( mIsToggled )
-        {
-            DrawShade( 0, dc, mDarkPen,  mLightPen  );
-        }
-        else if ( mIsInFocus )
-        {
-            if ( mIsPressed )
-                DrawShade( 0, dc, mDarkPen,  mLightPen  );
-            else
-                DrawShade( 0, dc, mLightPen,  mDarkPen  );
-        }
-        else
-            DrawShade( 0, dc, mGrayPen,  mGrayPen  );
-    }
-    else
-    {
-        if ( mIsPressed || mIsToggled )
-        {
-            DrawShade( 0, dc, mDarkPen,  mGrayPen  );
-            DrawShade( 1, dc, mBlackPen, mLightPen );
-        }
-        else
-        {
-            DrawShade( 0, dc, mGrayPen,  mDarkPen  );
-            DrawShade( 1, dc, mLightPen, mBlackPen );
-        }
-    }
-}
-
-void wxNewBitmapButton::SetLabel(const wxBitmap& labelBitmap,
-                                 const wxString& labelText )
-{
-    DestroyLabels();
-
-    mLabelText    = labelText;
-    mDepressedBmp = labelBitmap;
-
-    //RenderLabelImages();
-    RenderAllLabelImages();
-}
-
-void wxNewBitmapButton::SetAlignments( int alignText,
-                                       int marginX,
-                                       int marginY,
-                                       int textToLabelGap)
-{
-    DestroyLabels();
-
-    mMarginX        = marginX;
-    mMarginY        = marginY;
-    mTextAlignment  = alignText;
-    mTextToLabelGap = textToLabelGap;
-
-    //RenderLabelImages();
-    RenderAllLabelImages();
-}
-
-// event handlers
-
-void wxNewBitmapButton::OnLButtonDown( wxMouseEvent& WXUNUSED(event) )
-{
-    mDragStarted      = true;
-    mIsPressed        = true;
-    Refresh();
-}
-
-void wxNewBitmapButton::OnLButtonUp( wxMouseEvent& event )
-{
-    if ( !mDragStarted )
-        return;
-
-    mDragStarted = false;
-    mIsPressed   = false;
-    Refresh();
-
-    if ( IsInWindow( event.m_x, event.m_y ) )
-    {
-        // fire event, if mouse was released
-        // within the bounds of button
-        wxCommandEvent cmd( mFiredEventType, GetId() );
-        GetParent()->ProcessEvent( cmd );
-    }
-}
-
-bool wxNewBitmapButton::IsInWindow( int x, int y )
-{
-    int width, height;
-    GetSize( &width, &height );
-
-    return ( x >= 0 && y >= 0 &&
-             x < width &&
-             y < height );
-}
-
-void wxNewBitmapButton::OnMouseEnter( wxMouseEvent& WXUNUSED(event) )
-{
-    bool prevIsInFocus = mIsInFocus;
-
-    if ( !mIsInFocus )
-    {
-        mIsInFocus = true;
-    }
-    if ( prevIsInFocus != mIsInFocus )
-    {
-        Refresh();
-    }
-}
-
-void wxNewBitmapButton::OnMouseLeave( wxMouseEvent& WXUNUSED(event) )
-{
-    bool prevIsInFocus = mIsInFocus;
-    bool prevIsPressed = mIsPressed;
-    if ( mIsInFocus )
-    {
-        mIsInFocus = false;
-        mIsPressed = false;
-    }
-    if ( prevIsInFocus != mIsInFocus || prevIsPressed != mIsPressed )
-    {
-        Refresh();
-    }
-}
-
-void wxNewBitmapButton::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-        //Reshape();
-}
-
-void wxNewBitmapButton::Reshape( )
-{
-    bool wasCreated = mIsCreated;
-    mIsCreated = true;
-
-    if ( !wasCreated )
-    {
-        // in the case of loading button from stream, check if we
-        // have non-empty image-file name, load if possible
-
-        if (!mImageFileName.empty())
-        {
-            mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
-
-            //wxMessageBox("Image Loaded!!!");
-        }
-
-        //RenderLabelImages();
-        RenderAllLabelImages();
-
-        wxBitmap* pCurImg = GetStateLabel();
-
-        int w = pCurImg->GetWidth(),
-            h = pCurImg->GetHeight();
-
-        SetSize( 0,0, w + mMarginX*2, h + mMarginY*2 , 0 );
-    }
-}
-
-void wxNewBitmapButton::DrawLabel( wxDC& dc )
-{
-    wxBitmap* pCurBmp = GetStateLabel();
-
-    if ( pCurBmp == NULL )
-    {
-        wxSizeEvent evt;
-        OnSize( evt ); // fake it up!
-
-        //RenderLabelImages();
-        pCurBmp = GetStateLabel();
-    }
-
-    wxMemoryDC mdc;
-    mdc.SelectObject( *pCurBmp );
-
-    dc.Blit( mMarginX, mMarginY,
-             pCurBmp->GetWidth(),
-             pCurBmp->GetHeight(),
-             &mdc, 0,0, wxCOPY
-           );
-
-    mdc.SelectObject( wxNullBitmap );
-}
-
-void wxNewBitmapButton::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-
-    // first, make sure images for current state are prepared
-    //RenderLabelImages();
-
-    DrawLabel( dc );
-
-    DrawDecorations( dc );
-}
-
-void wxNewBitmapButton::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
-    // do nothing
-}
-
-void wxNewBitmapButton::OnKillFocus( wxFocusEvent& WXUNUSED(event) )
-{
-    // useless
-
-    wxMessageBox(wxT("kill-focus for button!"));
-}
-
-// ----------------------------------------------------------------------------
-// UI updates
-// ----------------------------------------------------------------------------
-
-void wxNewBitmapButton::OnIdle(wxIdleEvent& event)
-{
-    DoButtonUpdate();
-
-    event.Skip();
-}
-
-// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
-void wxNewBitmapButton::DoButtonUpdate()
-{
-    wxUpdateUIEvent event(GetId());
-    event.SetEventObject(this);
-
-    if ( GetParent()->ProcessEvent(event) )
-    {
-        if ( event.GetSetEnabled() )
-        {
-            bool enabled = event.GetEnabled();
-            if ( enabled != IsEnabled() )
-                Enable( enabled );
-        }
-        if ( event.GetSetChecked() )
-            Toggle( event.GetChecked() );
-    }
-}
diff --git a/contrib/src/fl/panedrawpl.cpp b/contrib/src/fl/panedrawpl.cpp
deleted file mode 100644
index cb292b7285..0000000000
--- a/contrib/src/fl/panedrawpl.cpp
+++ /dev/null
@@ -1,1284 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        panedrawpl.cpp
-// Purpose:     cbPaneDrawPlugin implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "wx/utils.h"     // import wxMin,wxMax macros
-
-#include "wx/fl/panedrawpl.h"
-
-// bitmap bits used by bar-resizing brush
-
-#define _IMG_A  0xAA    // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B  0x00    // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C  0x55    // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D  0x00    // Note: modified from _D to _IMG_D, for consistency reasons.
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D
-                                              };
-
-// FIXME:: The below code somehow doesn't work - cursors remain unchanged
-// Used: controlbar.cpp(1268):    set_cursor_bits( _gHorizCursorImg, bits, 32, 16 );
-// Used: controlbar.cpp(1272):    set_cursor_bits( _gVertCursorImg, bits, 32, 16 );
-/*
-static void set_cursor_bits( const char** img, char* bits, int width, int height )
-{
-    for( int i = 0; i != (width*height)/8; ++i )
-        bits[i] = 0;
-
-    for( int y = 0; y != height; ++y )
-    {
-        const char* row = img[0];
-
-        for( int x = 0; x != width; ++x )
-        {
-            int bitNo = y*width + x;
-
-            char value = ( row[x] != '.' ) ? 1 : 0;
-
-            bits[ bitNo / sizeof(char) ] |= 
-                ( ( bitNo %sizeof(char) ) << value );
-        }
-
-        ++img;
-    }
-}
-*/
-
-/***** Implementation for class cbPaneDrawPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbPaneDrawPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbPaneDrawPlugin, cbPluginBase )
-
-    EVT_PL_LEFT_DOWN           ( cbPaneDrawPlugin::OnLButtonDown         )
-    EVT_PL_LEFT_UP               ( cbPaneDrawPlugin::OnLButtonUp           )
-//    EVT_PL_LEFT_DCLICK           ( cbPaneDrawPlugin::OnLDblClick           )
-    EVT_PL_RIGHT_UP               ( cbPaneDrawPlugin::OnRButtonUp           )
-    EVT_PL_MOTION               ( cbPaneDrawPlugin::OnMouseMove           )
-
-
-    EVT_PL_DRAW_PANE_BKGROUND  ( cbPaneDrawPlugin::OnDrawPaneBackground  )
-    EVT_PL_DRAW_PANE_DECOR     ( cbPaneDrawPlugin::OnDrawPaneDecorations )
-
-    EVT_PL_DRAW_ROW_DECOR      ( cbPaneDrawPlugin::OnDrawRowDecorations  )
-    EVT_PL_DRAW_ROW_HANDLES    ( cbPaneDrawPlugin::OnDrawRowHandles      )
-    EVT_PL_DRAW_ROW_BKGROUND   ( cbPaneDrawPlugin::OnDrawRowBackground   )
-
-    EVT_PL_SIZE_BAR_WND           ( cbPaneDrawPlugin::OnSizeBarWindow       )
-    EVT_PL_DRAW_BAR_DECOR       ( cbPaneDrawPlugin::OnDrawBarDecorations  )
-    EVT_PL_DRAW_BAR_HANDLES       ( cbPaneDrawPlugin::OnDrawBarHandles      )
-
-    EVT_PL_START_DRAW_IN_AREA  ( cbPaneDrawPlugin::OnStartDrawInArea     )
-    EVT_PL_FINISH_DRAW_IN_AREA ( cbPaneDrawPlugin::OnFinishDrawInArea    )
-
-END_EVENT_TABLE()
-
-cbPaneDrawPlugin::cbPaneDrawPlugin(void)
-
-    : mResizeStarted          ( false ),
-
-      mResizeCursorOn         ( false ),
-      mpDraggedBar              ( NULL  ),
-      mpResizedRow            ( NULL  ),
-
-      mRowHandleHitted        ( false ),
-      mIsUpperHandle          ( false ),
-      mBarHandleHitted        ( false ),
-      mIsLeftHandle           ( false ),
-      mBarContentHitted       ( false ),
-
-      mpClntDc ( NULL ),
-      mpPane   ( NULL )
-{}
-
-cbPaneDrawPlugin::cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask ),
-    
-      // bar-row resizing state varaibles
-
-      mResizeStarted          ( false ),
-
-      mResizeCursorOn         ( false ),
-      mpDraggedBar              ( NULL ),
-      mpResizedRow            ( NULL ),
-
-      mRowHandleHitted        ( false ),
-      mIsUpperHandle          ( false ),
-      mBarHandleHitted        ( false ),
-      mIsLeftHandle           ( false ),
-      mBarContentHitted       ( false ),
-
-      mpClntDc ( NULL ),
-      mpPane   ( NULL )
-{}
-
-cbPaneDrawPlugin::~cbPaneDrawPlugin()
-{
-    // DBG::
-    wxASSERT( mpClntDc == NULL );
-}
-
-void cbPaneDrawPlugin::DrawDraggedHandle( const wxPoint& pos, cbDockPane& pane )
-{
-    wxScreenDC dc;
-    int ofsX = 0;
-    int ofsY = 0;
-
-    wxPoint fpos = pos;
-    pane.PaneToFrame( &fpos.x, &fpos.y );
-
-    // short-cut
-    int resizeHndSize = pane.mProps.mResizeHandleSize;
-
-    // "Required for X to specify that
-    // that we wish to draw on top of all windows
-    // - and we optimise by specifying the area
-    // for creating the overlap window." --J.S.
-
-    wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-
-    mpLayout->GetParentFrame().ClientToScreen( &ofsX, &ofsY );
-
-    int prevLF = dc.GetLogicalFunction();
-
-    // BUG BUG BUG (wx):: somehow stippled brush works only  
-    //                      when the bitmap created on stack, not
-    //                      as a member of the class
-
-    wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
-    wxBrush checkerBrush( checker );
-
-    dc.SetPen( mpLayout->mNullPen );
-    dc.SetBrush( checkerBrush );
-    dc.SetLogicalFunction( wxXOR );
-
-    if ( mHandleIsVertical )
-    {
-        int delta = pos.x - mDragOrigin.x;
-
-        if ( !pane.IsHorizontal() )
-
-            delta = pos.y - mDragOrigin.y;
-
-        int realHndOfs;
-        realHndOfs = pane.mBoundsInParent.x + pane.mLeftMargin + mHandleOfs;
-
-        int newX = realHndOfs + delta;
-
-        if ( newX + resizeHndSize > mHandleDragArea.x + mHandleDragArea.width )
-
-            newX = mHandleDragArea.x + mHandleDragArea.width  - 1;
-
-        if ( newX < mHandleDragArea.x ) 
-
-            newX = mHandleDragArea.x;
-
-        mDraggedDelta = newX - realHndOfs;
-
-        dc.DrawRectangle( newX + ofsX, mHandleDragArea.y + ofsY,
-                          resizeHndSize + 1,
-                          mHandleDragArea.height+1 );
-    }
-    else
-    {
-        // otherwise, draw horizontal handle
-
-        int delta = pos.y - mDragOrigin.y;
-
-        if ( !pane.IsHorizontal() )
-
-            delta = pos.x - mDragOrigin.x;
-
-        int realHndOfs;
-        realHndOfs = pane.mBoundsInParent.y + pane.mTopMargin + mHandleOfs;
-
-        int newY = realHndOfs + delta;
-
-        if ( newY + resizeHndSize > mHandleDragArea.y + mHandleDragArea.height )
-
-            newY = mHandleDragArea.y + mHandleDragArea.height - 1;
-
-        if ( newY < mHandleDragArea.y ) 
-
-            newY = mHandleDragArea.y;
-
-        mDraggedDelta = newY - realHndOfs;
-
-        dc.DrawRectangle( mHandleDragArea.x + ofsX, newY + ofsY,
-                          mHandleDragArea.width + 1,
-                          resizeHndSize + 1 );
-    }
-
-    dc.SetLogicalFunction( prevLF );
-
-    // "End drawing on top (frees the window used for drawing
-    // over the screen)" --J.S.
-    wxScreenDC::EndDrawingOnTop();
-}
-
-void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event ) 
-{
-    if ( !mResizeStarted )
-    {
-        // if nothing is started, do hit-tests
-
-        bool prevWasRowHandle = mRowHandleHitted;
-
-        mBarContentHitted = false;
-        mBarHandleHitted  = false;
-        mRowHandleHitted  = false;
-
-        int testResult =  
-            event.mpPane->HitTestPaneItems( event.mPos,        // in pane's coordiantes
-                                            &mpResizedRow,
-                                            &mpDraggedBar );
-
-        if ( testResult != CB_NO_ITEMS_HITTED )
-        {
-            if ( testResult == CB_BAR_CONTENT_HITTED )
-            {
-                // restore cursor, if non of the handles were hit
-                if ( mResizeCursorOn )
-                {
-                    // remove resizing hints
-
-                    mpLayout->ReleaseEventsFromPane( event.mpPane );
-                    mpLayout->ReleaseEventsFromPlugin( this );
-    
-                    mResizeCursorOn = false;
-
-                    mBarContentHitted = true;
-
-                    // In Windows, at least, the frame needs to have a null cursor
-                    // else child windows (such as text windows) inherit the cursor
-#if 1
-                    mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
-                    mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-                }
-
-                // TBD:: fire something like "mouse-over-bar" event
-
-                event.Skip(); // pass event to the next handler in the chain
-                return;
-            }
-
-            wxCursor* pCurs;
-
-            if ( testResult == CB_UPPER_ROW_HANDLE_HITTED ||
-                 testResult == CB_LOWER_ROW_HANDLE_HITTED)
-            {
-                if ( event.mpPane->IsHorizontal() )
-
-                    pCurs = mpLayout->mpVertCursor;
-                else
-                    pCurs = mpLayout->mpHorizCursor;
-
-                mRowHandleHitted = true;
-                mIsUpperHandle    = ( testResult == CB_UPPER_ROW_HANDLE_HITTED );
-            }
-            else
-            {
-                // otherwise, if inter-bar handle was hitted
-
-                if ( event.mpPane->IsHorizontal() )
-
-                    pCurs = mpLayout->mpHorizCursor;
-                else
-                    pCurs = mpLayout->mpVertCursor;
-
-                mBarHandleHitted = true;
-                mIsLeftHandle    = ( testResult == CB_LEFT_BAR_HANDLE_HITTED );
-            }
-
-            // avoid setting the same cursor twice
-
-            if ( !mResizeCursorOn || prevWasRowHandle != mRowHandleHitted )
-            {
-                mpLayout->GetParentFrame().SetCursor( *pCurs );
-
-                if ( !mResizeCursorOn )
-                {
-                    // caputre if not captured yet
-                    mpLayout->CaptureEventsForPane( event.mpPane );
-                    mpLayout->CaptureEventsForPlugin( this );
-                }
-            }
-
-            mResizeCursorOn = true;
-
-            // handled is being dragged now, thus event is "eaten" by this plugin
-
-            return;
-
-        } // end of if (HitTestBarHandles())
-
-        // restore cursor, if non of the handles were hit
-        if ( mResizeCursorOn )
-        {
-            mpLayout->ReleaseEventsFromPane( event.mpPane );
-            mpLayout->ReleaseEventsFromPlugin( this );
-
-            // In Windows, at least, the frame needs to have a null cursor
-            // else child windows (such as text windows) inherit the cursor
-#if 1
-            mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
-            mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
-            mResizeCursorOn = false;
-        }
-
-        event.Skip(); // pass event to the next plugin
-    }
-
-    // othewise series of actions, if something has already started
-
-    else
-    if ( mResizeStarted )
-    {
-        // apply xor-mask twice 
-        DrawDraggedHandle( mPrevPos,   *event.mpPane );
-
-        // draw handle in the new position
-        DrawDraggedHandle( event.mPos, *event.mpPane );
-        mPrevPos = event.mPos;
-
-        // handled is dragged, thus event is "eaten" by this plugin
-    }
-    else
-        event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnLDblClick( cbLeftDClickEvent& event )
-{
-    if ( !mResizeCursorOn )
-    {
-        cbBarInfo* pBarToFloat;
-
-        if ( event.mpPane->HitTestPaneItems( event.mPos,       // in pane's coordiantes
-                                             &mpResizedRow,
-                                             &pBarToFloat ) == CB_BAR_CONTENT_HITTED
-           )
-            {
-            return;
-            }
-
-        event.Skip();
-    }
-}
-
-void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event ) 
-{
-    wxASSERT( !mResizeStarted );
-
-    if ( mResizeCursorOn )
-    {
-        mResizeStarted = true;
-        mDragOrigin    = event.mPos;
-        
-        // setup constraints for the dragging handle
-
-        int from, till;
-        mHandleOfs        = 0;
-        mHandleIsVertical = false;
-
-        if ( mRowHandleHitted )
-
-            event.mpPane->GetRowResizeRange( mpResizedRow, &from, &till, mIsUpperHandle );
-        else
-            // otherwise if bar handle was hitted
-            event.mpPane->GetBarResizeRange( mpDraggedBar, &from, &till, mIsLeftHandle );
-         
-        if ( mRowHandleHitted )
-        {
-            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? false : true;
-
-            mHandleDragArea.x      = 0;
-            mHandleDragArea.width  = event.mpPane->mPaneWidth;
-
-            mHandleDragArea.y      = from;
-            mHandleDragArea.height = till - from;
-
-            if ( mIsUpperHandle )
-
-                mHandleOfs = mpResizedRow->mRowY;
-            else
-                mHandleOfs = mpResizedRow->mRowY + 
-                             mpResizedRow->mRowHeight -
-                             event.mpPane->mProps.mResizeHandleSize;
-        }
-        else
-        {
-            // otehrwise if bar handle dragged
-
-//            cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
-            wxRect& bounds         = mpDraggedBar->mBounds;
-
-            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? true : false;
-
-            mHandleDragArea.x      = from;
-            mHandleDragArea.width  = till - from;
-
-
-            mHandleDragArea.y      = bounds.y;
-            mHandleDragArea.height = bounds.height;
-
-            // left-side-handle mBounds
-            if ( mIsLeftHandle )
-
-                mHandleOfs = bounds.x;
-            else
-                mHandleOfs = bounds.x + 
-                             bounds.width - event.mpPane->mProps.mResizeHandleSize;
-
-        }
-
-        event.mpPane->PaneToFrame( &mHandleDragArea );
-        DrawDraggedHandle(mDragOrigin, *event.mpPane);
-
-        mPrevPos = mDragOrigin;
-
-        return;
-        // handled is dragged, thus event is "eaten" by this plugin
-    }
-    else
-    {
-        cbBarInfo* pDraggedBar;
-
-        if ( event.mpPane->HitTestPaneItems( event.mPos,       // in pane's coordiantes
-                                             &mpResizedRow,
-                                             &pDraggedBar ) == CB_BAR_CONTENT_HITTED 
-           )
-        {
-            int x = event.mPos.x,
-                y = event.mPos.y;
-
-            event.mpPane->PaneToFrame( &x, &y );
-
-            cbStartBarDraggingEvent dragEvt( pDraggedBar, wxPoint(x,y), event.mpPane );
-
-            mpLayout->FirePluginEvent( dragEvt );
-
-            return; // event is "eaten" by this plugin
-        }
-    }
-
-    event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbPaneDrawPlugin::OnLButtonUp( cbLeftUpEvent& event ) 
-{
-    if ( mResizeStarted )
-    {
-        DrawDraggedHandle( event.mPos, *event.mpPane );
-
-        mResizeStarted  = false;
-        mResizeCursorOn = false;
-
-        mpLayout->ReleaseEventsFromPane( event.mpPane );
-        mpLayout->ReleaseEventsFromPlugin( this );
-
-        // In Windows, at least, the frame needs to have a null cursor
-        // else child windows (such as text windows) inherit the cursor
-#if 1
-        mpLayout->GetParentFrame().SetCursor( wxNullCursor );
-#else
-        mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
-#endif
-
-        if ( mRowHandleHitted )
-        {
-            event.mpPane->ResizeRow( mpResizedRow, 
-                                     mDraggedDelta,
-                                     mIsUpperHandle );
-        }
-        else
-        {
-            event.mpPane->ResizeBar( mpDraggedBar, 
-                                     mDraggedDelta,
-                                     mIsLeftHandle );
-        }
-
-        mpDraggedBar = NULL;
-        mpResizedRow = NULL;
-
-        // handled dragging action was finished by this mouse-up, 
-        // thus event is "eaten" by this plugin
-
-        return;
-    }
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnRButtonUp( cbRightUpEvent&   event )
-{
-    wxPoint fpos = event.mPos;
-    event.mpPane->PaneToFrame( &fpos.x, &fpos.y );
-
-    cbBarInfo* pDraggedBar;
-
-    // user clicks inside the bar contnet, fire bar-customization event
-
-    if ( event.mpPane->HitTestPaneItems( event.mPos,       // in pane's coordiantes
-                                         &mpResizedRow,
-                                         &pDraggedBar  ) == CB_BAR_CONTENT_HITTED
-       )
-    {
-        cbCustomizeBarEvent cbEvt( pDraggedBar, fpos, event.mpPane );
-
-        mpLayout->FirePluginEvent( cbEvt );
-
-        return; // event is "eaten" by this plugin
-    }
-
-    // otherwise fire whole-layout customization event
-
-    cbCustomizeLayoutEvent csEvt( fpos );
-
-    mpLayout->FirePluginEvent( csEvt );
-
-    // event is "eaten" by this plugin
-}
-
-void cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event ) 
-{
-    cbBarInfo& bar = *event.mpBar;
-    mpPane         = event.mpPane;
-
-    // it's possible that a bar does not have it's own window!
-    if ( !bar.mpBarWnd ) return;
-
-    wxRect& bounds = event.mBoundsInParent;
-
-    // check visibility
-    if ( bounds.height != 0 )
-    {
-        // size smaller than bounds, to leave space for shade lines
-
-        // FIXME:: +/- 1s
-
-        int nNewHeight = bounds.height - 2 - bar.mDimInfo.mVertGap *2;
-        if(nNewHeight < 0)
-           nNewHeight = 0;
-
-        bar.mpBarWnd->wxWindow::SetSize( bounds.x      + 1 + bar.mDimInfo.mHorizGap,     
-                                         bounds.y      + 1 + bar.mDimInfo.mVertGap,
-                                         bounds.width  - 2 - bar.mDimInfo.mHorizGap*2,
-                                         nNewHeight,
-                                         0 
-                                       );
-
-        if ( !bar.mpBarWnd->IsShown() )
-
-            bar.mpBarWnd->Show( true );
-    }
-    else
-        // hide bar if not visible
-        bar.mpBarWnd->Show( false );
-
-    event.Skip(); // pass event to the next plugin in the chain
-}
-
-void cbPaneDrawPlugin::OnDrawRowDecorations( cbDrawRowDecorEvent& event )
-{
-    DrawPaneShadeForRow( event.mpRow, *event.mpDc );
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::DrawUpperRowHandle( cbRowInfo* pRow, wxDC& dc )
-{
-    wxRect& bounds = pRow->mBoundsInParent;
-
-    if ( mpPane->IsHorizontal() )
-    {
-         if ( pRow->mHasUpperHandle )
-        
-            mpPane->DrawHorizHandle( dc, bounds.x, 
-                                     bounds.y-1, 
-                                      pRow->mRowWidth );
-    }
-    else
-    {
-        if ( pRow->mHasUpperHandle )
-
-            mpPane->DrawVertHandle( dc, bounds.x-1, 
-                                    bounds.y, pRow->mRowWidth );
-    }
-}
-
-void cbPaneDrawPlugin::DrawLowerRowHandle( cbRowInfo* pRow, wxDC& dc )
-{
-    wxRect& bounds = pRow->mBoundsInParent;
-
-    // check if iter-row handles present
-
-    if ( mpPane->IsHorizontal() )
-    {
-        if ( pRow->mHasLowerHandle )
-        
-            mpPane->DrawHorizHandle( dc, bounds.x, bounds.y + bounds.height - mpPane->mProps.mResizeHandleSize - 1, 
-                                      pRow->mRowWidth );
-    }
-    else
-    {
-        if ( pRow->mHasLowerHandle )
-
-            mpPane->DrawVertHandle( dc, bounds.x + bounds.width - mpPane->mProps.mResizeHandleSize - 1, 
-                                     bounds.y, pRow->mRowWidth );
-    }
-}
-
-void cbPaneDrawPlugin::OnDrawRowHandles( cbDrawRowHandlesEvent& event )
-{
-    // short-cuts
-    cbRowInfo* pRow = event.mpRow;
-    wxDC&   dc      = *event.mpDc;
-    mpPane          = event.mpPane;
-
-    // draw handles of surrounding rows first
-
-    if ( pRow->mpPrev && pRow->mpPrev->mHasLowerHandle )
-
-            DrawLowerRowHandle( pRow->mpPrev, dc );
-
-    if ( pRow->mpNext && pRow->mpNext->mHasUpperHandle )
-
-        DrawUpperRowHandle( pRow->mpNext, dc );
-
-    // draw handles of the given row
-
-    if ( pRow->mHasUpperHandle )
-    
-        DrawUpperRowHandle( pRow, dc );
-
-    if ( pRow->mHasLowerHandle )
-
-        DrawLowerRowHandle( pRow, dc );
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawPaneBackground ( cbDrawPaneBkGroundEvent& event )
-{
-    wxDC& dc = *event.mpDc;
-    mpPane   = event.mpPane;
-
-    // FOR NOW:: hard-coded
-    wxBrush bkBrush( mpLayout->mBorderPen.GetColour(), wxSOLID );
-
-    dc.SetBrush( bkBrush );
-    dc.SetPen( mpLayout->mNullPen );
-
-    wxRect& bounds = mpPane->mBoundsInParent;
-
-    if ( mpPane->mTopMargin >= 1 )
-    
-        dc.DrawRectangle( bounds.x, bounds.y,
-                          bounds.width+1,
-                          mpPane->mTopMargin + 1);
-
-
-    if ( mpPane->mBottomMargin >= 1 )
-    
-        dc.DrawRectangle( bounds.x, 
-                          bounds.y + bounds.height - mpPane->mBottomMargin,
-                          bounds.width + 1,
-                          mpPane->mBottomMargin + 1);
-
-
-    if ( mpPane->mLeftMargin >= 1 )
-    
-        dc.DrawRectangle( bounds.x, 
-                          bounds.y + mpPane->mTopMargin - 1,
-                          mpPane->mLeftMargin + 1,
-                          bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin + 2);
-
-
-    if ( mpPane->mRightMargin >= 1 )
-    
-        dc.DrawRectangle( bounds.x + bounds.width - mpPane->mRightMargin,
-                          bounds.y + mpPane->mTopMargin - 1,
-                          mpPane->mRightMargin + 1,
-                          bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin + 2);
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawRowBackground ( cbDrawRowBkGroundEvent& event )
-{
-    // short-cuts
-    cbRowInfo* pRow = event.mpRow;
-    wxDC&   dc      = *event.mpDc;
-    mpPane          = event.mpPane;
-
-    // get ready
-    wxRect     rowBounds    = pRow->mBoundsInParent;
-    bool       isHorizontal    = event.mpPane->IsHorizontal();
-    
-//    int prevPos;
-
-    if ( isHorizontal )
-    {
-//        prevPos = rowBounds.x;
-        // include one line above and below the row
-        --rowBounds.y;
-        rowBounds.height += 2;
-
-        --rowBounds.x;
-        rowBounds.width  += 2;
-    }
-    else
-    {
-//        prevPos = rowBounds.y;
-        // include one line above and below the row
-        --rowBounds.x;
-        rowBounds.width  += 2;
-
-        --rowBounds.y;
-        rowBounds.height += 2;
-    }
-
-//#define TEST_BK_ERASING
-
-#ifdef TEST_BK_ERASING
-
-    // DBG::
-    wxBrush br0( wxColour(0,160,160), wxSOLID );
-    dc.SetBrush(br0);
-    dc.SetPen  ( mpLayout->mNullPen );
-    dc.DrawRectangle( rowBounds.x, rowBounds.y,
-                      rowBounds.width  + 1, 
-                      rowBounds.height + 1  );
-#endif
-
-    wxBrush bkBrush( mpLayout->mGrayPen.GetColour(), wxSOLID );
-
-    dc.SetPen  ( mpLayout->mNullPen );
-    dc.SetBrush( bkBrush );
-
-    // fill background-recatangle of entire row area
-    dc.DrawRectangle( rowBounds.x, rowBounds.y,
-                      rowBounds.width  + 1, 
-                      rowBounds.height + 1  );
-
-    dc.SetBrush( wxNullBrush );
-
-    // draw "shaded-side-bars" for each bar
-    for( size_t i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
-        if ( isHorizontal )
-        {
-            DrawShade( 1, bounds, FL_ALIGN_LEFT, dc );
-            DrawShade( 1, bounds, FL_ALIGN_RIGHT, dc );
-        }
-        else
-        {
-            DrawShade( 1, bounds, FL_ALIGN_TOP, dc );
-            DrawShade( 1, bounds, FL_ALIGN_BOTTOM, dc );
-        }
-    }
-
-    // draw extra shades to simulate "glued-bricks" effect
-
-    // TBD:: reduce exessive drawing of shades, when the
-    //       row handle is present, and shades will be overr-drawn anyway
-
-    DrawUpperRowShades( pRow, dc, 1 ); // outer shade
-
-    if ( pRow->mpPrev )
-    {
-        DrawLowerRowShades( pRow->mpPrev, dc, 1 ); // outter shade
-        DrawLowerRowShades( pRow->mpPrev, dc, 0 ); // inner shade
-    }
-
-    DrawLowerRowShades( pRow, dc, 1 );
-
-    if ( pRow->mpNext )
-    {
-        DrawUpperRowShades( pRow->mpNext, dc, 1 ); 
-        DrawUpperRowShades( pRow->mpNext, dc, 0 );
-    }
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::DrawUpperRowShades( cbRowInfo* pRow, wxDC& dc, int level )
-{
-    for( size_t i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
-        if ( mpPane->IsHorizontal() )
-        {        
-            DrawShade( level, bounds, FL_ALIGN_TOP, dc );
-            if ( level == 1 )
-            {
-                dc.SetPen( mpLayout->mDarkPen );
-                dc.DrawPoint( bounds.x - 1, bounds.y );
-                dc.SetPen( mpLayout->mLightPen );
-                dc.DrawPoint( bounds.x + bounds.width , bounds.y );
-            }
-        }
-        else
-        {
-            DrawShade( level, bounds, FL_ALIGN_LEFT, dc );
-            if ( level == 1 )
-            {
-                dc.SetPen( mpLayout->mDarkPen );
-                dc.DrawPoint( bounds.x, bounds.y -1 );
-                dc.SetPen( mpLayout->mLightPen );
-                dc.DrawPoint( bounds.x, bounds.y + bounds.height );
-            }
-        }
-    }
-}
-
-void cbPaneDrawPlugin::DrawLowerRowShades( cbRowInfo* pRow, wxDC& dc, int level )
-{
-    for( size_t i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        wxRect& bounds = pRow->mBars[i]->mBoundsInParent;
-
-        if ( mpPane->IsHorizontal() )
-        {
-            DrawShade( level, bounds, FL_ALIGN_BOTTOM, dc );
-            if ( level == 1 )
-            {
-                dc.SetPen( mpLayout->mDarkPen );
-                dc.DrawPoint( bounds.x - 1, bounds.y + bounds.height -1 );
-                dc.SetPen( mpLayout->mLightPen );
-                dc.DrawPoint( bounds.x + bounds.width , bounds.y + bounds.height -1 );
-            }
-        }
-        else
-        {
-            DrawShade( level, bounds, FL_ALIGN_RIGHT, dc );
-            if ( level == 1 )
-            {
-                dc.SetPen( mpLayout->mDarkPen );
-                dc.DrawPoint( bounds.x + bounds.width - 1, bounds.y -1 );
-                dc.SetPen( mpLayout->mLightPen );
-                dc.DrawPoint( bounds.x + bounds.width - 1, bounds.y + bounds.height );
-            }
-        }
-    }
-}
-
-void cbPaneDrawPlugin::DrawBarInnerShadeRect( cbBarInfo* pBar, wxDC& dc )
-{
-    wxRect& bounds = pBar->mBoundsInParent;
-
-    dc.SetPen( mpLayout->mDarkPen );
-    
-    dc.DrawLine( bounds.x + bounds.width - 1,
-                 bounds.y,
-                 bounds.x + bounds.width - 1,
-                 bounds.y + bounds.height );
-
-    dc.DrawLine( bounds.x,
-                 bounds.y + bounds.height - 1,
-                 bounds.x + bounds.width,
-                 bounds.y + bounds.height -1  );
-
-    dc.SetPen( mpLayout->mLightPen );
-
-    dc.DrawLine( bounds.x,
-                 bounds.y,
-                 bounds.x + bounds.width - 1,
-                 bounds.y );
-
-    dc.DrawLine( bounds.x,
-                 bounds.y,
-                 bounds.x,
-                 bounds.y + bounds.height - 1 );
-}
-
-void cbPaneDrawPlugin::DrawShade( int level, wxRect& rect, int alignment, wxDC& dc )
-{
-    // simulates "guled-bricks" appearence of control bars
-
-    if ( ( alignment == FL_ALIGN_TOP    && level == 1 ) ||
-         ( alignment == FL_ALIGN_BOTTOM && level == 0 ) ||
-         ( alignment == FL_ALIGN_LEFT   && level == 1 ) ||
-         ( alignment == FL_ALIGN_RIGHT  && level == 0 )
-       )
-    
-        dc.SetPen( mpLayout->mDarkPen  );
-    else
-        dc.SetPen( mpLayout->mLightPen );
-
-    if ( alignment == FL_ALIGN_TOP )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y,
-                         rect.x + rect.width - 1,
-                         rect.y );
-        else
-            dc.DrawLine( rect.x - 1,
-                         rect.y - 1,
-                         rect.x + rect.width + 0,
-                         rect.y - 1 );
-    }
-    else
-    if ( alignment == FL_ALIGN_BOTTOM )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y + rect.height - 1,
-                         rect.x + rect.width,
-                         rect.y + rect.height - 1 );
-        else
-            dc.DrawLine( rect.x - 1,
-                         rect.y + rect.height,
-                         rect.x + rect.width + 1,
-                         rect.y + rect.height );
-    }
-    else
-    if ( alignment == FL_ALIGN_LEFT )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y,
-                         rect.x,
-                         rect.y + rect.height - 1 );
-        else
-            dc.DrawLine( rect.x - 1,
-                         rect.y - 1,
-                         rect.x - 1,
-                         rect.y + rect.height );
-    }
-    else
-    if ( alignment == FL_ALIGN_RIGHT )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x + rect.width - 1, 
-                         rect.y,
-                         rect.x + rect.width - 1,
-                         rect.y + rect.height );
-        else
-        {                     
-            dc.DrawLine( rect.x + rect.width,
-                         rect.y - 1,
-                         rect.x + rect.width,
-                         rect.y + rect.height + 1  );
-        }
-    }
-}
-
-void cbPaneDrawPlugin::DrawShade1( int level, wxRect& rect, int alignment, wxDC& dc )
-{
-    // simulates "guled-bricks" appearence of control bars
-
-    if ( ( alignment == FL_ALIGN_TOP    && level == 1 ) ||
-         ( alignment == FL_ALIGN_BOTTOM && level == 0 ) ||
-         ( alignment == FL_ALIGN_LEFT   && level == 1 ) ||
-         ( alignment == FL_ALIGN_RIGHT  && level == 0 )
-       )
-    
-        dc.SetPen( mpLayout->mDarkPen  );
-    else
-        dc.SetPen( mpLayout->mLightPen );
-
-    if ( alignment == FL_ALIGN_TOP )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y,
-                         rect.x + rect.width,
-                         rect.y );
-        else
-            dc.DrawLine( rect.x,
-                         rect.y - 1,
-                         rect.x + rect.width,
-                         rect.y - 1 );
-    }
-    else
-    if ( alignment == FL_ALIGN_BOTTOM )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y + rect.height - 1,
-                         rect.x + rect.width,
-                         rect.y + rect.height - 1 );
-        else
-            dc.DrawLine( rect.x,
-                         rect.y + rect.height,
-                         rect.x + rect.width,
-                         rect.y + rect.height );
-    }
-    else
-    if ( alignment == FL_ALIGN_LEFT )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x, 
-                         rect.y,
-                         rect.x,
-                         rect.y + rect.height );
-        else
-            dc.DrawLine( rect.x - 1,
-                         rect.y,
-                         rect.x - 1,
-                         rect.y + rect.height );
-    }
-    else
-    if ( alignment == FL_ALIGN_RIGHT )
-    {
-        if ( level == 0 )
-        
-            dc.DrawLine( rect.x + rect.width - 1, 
-                         rect.y,
-                         rect.x + rect.width - 1,
-                         rect.y + rect.height );
-        else
-        {                     
-            dc.DrawLine( rect.x + rect.width,
-                         rect.y ,
-                         rect.x + rect.width,
-                         rect.y + rect.height );
-        }
-    }
-}
-
-void cbPaneDrawPlugin::DrawPaneShade( wxDC& dc, int alignment )
-{
-    if ( !mpPane->mProps.mShow3DPaneBorderOn ) return;
-
-    wxRect bounds = mpPane->mBoundsInParent;
-
-    bounds.x      += mpPane->mLeftMargin;
-    bounds.y      += mpPane->mTopMargin;
-    bounds.width  -= ( mpPane->mLeftMargin + mpPane->mRightMargin  );
-    bounds.height -= ( mpPane->mTopMargin  + mpPane->mBottomMargin );
-
-    DrawShade( 0, bounds, alignment, dc );
-    DrawShade( 1, bounds, alignment, dc );
-}
-
-void cbPaneDrawPlugin::DrawPaneShadeForRow( cbRowInfo* pRow, wxDC& dc )
-{
-    if ( !mpPane->mProps.mShow3DPaneBorderOn ) return;
-
-    // do not draw decoration, if pane has "vainished"
-    if ( mpPane->mPaneWidth  < 0 ||
-         mpPane->mPaneHeight < 0 )
-
-         return;
-
-    wxRect bounds = pRow->mBoundsInParent;
-
-    if ( mpPane->mAlignment == FL_ALIGN_TOP ||
-         mpPane->mAlignment == FL_ALIGN_BOTTOM )
-    {
-        --bounds.y;
-        bounds.height += 2;
-
-        DrawShade1( 0, bounds, FL_ALIGN_LEFT, dc );
-        DrawShade1( 1, bounds, FL_ALIGN_LEFT, dc );
-        DrawShade1( 0, bounds, FL_ALIGN_RIGHT, dc );
-        DrawShade1( 1, bounds, FL_ALIGN_RIGHT, dc );
-
-        if ( !pRow->mpNext )
-            DrawPaneShade( dc, FL_ALIGN_BOTTOM );
-
-        if ( !pRow->mpPrev )
-            DrawPaneShade( dc, FL_ALIGN_TOP );
-    }
-    else
-    {
-        --bounds.x;
-        bounds.width += 2;
-
-        DrawShade1( 0, bounds, FL_ALIGN_TOP, dc );
-        DrawShade1( 1, bounds, FL_ALIGN_TOP, dc );
-        DrawShade1( 0, bounds, FL_ALIGN_BOTTOM, dc );
-        DrawShade1( 1, bounds, FL_ALIGN_BOTTOM, dc );
-
-        if ( !pRow->mpNext )
-            DrawPaneShade( dc, FL_ALIGN_RIGHT );
-
-        if ( !pRow->mpPrev )
-            DrawPaneShade( dc, FL_ALIGN_LEFT );
-    }
-}
-
-void cbPaneDrawPlugin::OnDrawPaneDecorations( cbDrawPaneDecorEvent& event )
-{
-    wxDC& dc = *event.mpDc;
-
-    cbDockPane* pPane = event.mpPane;
-
-    RowArrayT& lst = pPane->GetRowList();
-    
-    // FIXME:: this is a workaround for some glitches
-
-    if ( lst.Count() )
-    {
-        cbRowInfo* pLastRow = lst[ lst.Count() - 1 ];
-
-        pPane->PaintRowBackground( pLastRow,  dc );
-        pPane->PaintRowDecorations( pLastRow, dc );
-        pPane->PaintRowHandles( pLastRow, dc );
-    }
-
-    if ( !pPane->mProps.mShow3DPaneBorderOn ) return;
-
-    // do not draw decoration, if pane is completely hidden
-    if ( event.mpPane->mPaneWidth  < 0 ||
-         event.mpPane->mPaneHeight < 0 )
-
-         return;
-
-    DrawPaneShade( dc, FL_ALIGN_TOP    );
-    DrawPaneShade( dc, FL_ALIGN_BOTTOM );
-    DrawPaneShade( dc, FL_ALIGN_LEFT   );
-    DrawPaneShade( dc, FL_ALIGN_RIGHT  );
-
-    event.Skip(); // pass event to the next plugin
-}
-
-// bar decoration/sizing handlers
-
-void cbPaneDrawPlugin::OnDrawBarDecorations( cbDrawBarDecorEvent& event )
-{
-//    cbBarInfo* pBar = event.mpBar;
-    wxDC&   dc      = *event.mpDc;
-
-    // draw brick borders
-
-    wxRect& rect = event.mBoundsInParent;
-
-    dc.SetPen( mpLayout->mLightPen );
-
-    // horiz
-    dc.DrawLine( rect.x, rect.y, 
-                 rect.x + rect.width-1, rect.y );
-
-    // vert
-    dc.DrawLine( rect.x, rect.y,
-                 rect.x, rect.y + rect.height-1 );
-
-
-    dc.SetPen( mpLayout->mDarkPen );
-
-    // vert
-    dc.DrawLine( rect.x + rect.width-1, rect.y,
-                 rect.x + rect.width-1, rect.y + rect.height-1 );
-
-    // horiz
-    dc.DrawLine( rect.x, rect.y + rect.height-1,
-                 rect.x + rect.width, rect.y + rect.height-1 );
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnDrawBarHandles( cbDrawBarHandlesEvent& event )
-{
-    // short-cuts
-    cbBarInfo* pBar = event.mpBar;
-    wxDC&   dc      = *event.mpDc;
-    mpPane          = event.mpPane;
-
-    // draw handles around the bar if present
-
-    if ( pBar->mHasLeftHandle ||
-         pBar->mHasRightHandle )
-    {
-        wxRect& bounds = pBar->mBoundsInParent;
-
-        if ( mpPane->IsHorizontal() )
-        {
-            if ( pBar->mHasLeftHandle )
-
-                mpPane->DrawVertHandle( dc, bounds.x - mpPane->mProps.mResizeHandleSize -1, 
-                                        bounds.y, bounds.height );
-
-            if ( pBar->mHasRightHandle )
-
-                mpPane->DrawVertHandle( dc, 
-                                        bounds.x + bounds.width -1, 
-                                        bounds.y, bounds.height );
-        }
-        else
-        {
-            if ( pBar->mHasLeftHandle )
-
-                mpPane->DrawHorizHandle( dc, bounds.x, 
-                                         bounds.y  - mpPane->mProps.mResizeHandleSize - 1, 
-                                         bounds.width );
-
-            if ( pBar->mHasRightHandle )
-
-                mpPane->DrawHorizHandle( dc, bounds.x, 
-                                         bounds.y + bounds.height - 1,
-                                         bounds.width );
-        }
-    }
-
-    event.Skip(); // pass event to the next plugin
-}
-
-void cbPaneDrawPlugin::OnStartDrawInArea( cbStartDrawInAreaEvent& event )
-{
-    // DBG::
-    wxASSERT( mpClntDc == NULL );
-
-    // FOR NOW:: create/destroy client-dc upon each drawing
-    mpClntDc = new wxClientDC( &mpLayout->GetParentFrame() );
-
-    (*event.mppDc) = mpClntDc;
-
-    mpClntDc->SetClippingRegion( event.mArea.x,     event.mArea.y,
-                                 event.mArea.width, event.mArea.height );
-}
-
-void cbPaneDrawPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& WXUNUSED(event) )
-{
-    // DBG::
-    wxASSERT( mpClntDc );
-
-    delete mpClntDc;
-
-    mpClntDc = NULL;
-}
-
diff --git a/contrib/src/fl/rowdragpl.cpp b/contrib/src/fl/rowdragpl.cpp
deleted file mode 100644
index e2f4d478c1..0000000000
--- a/contrib/src/fl/rowdragpl.cpp
+++ /dev/null
@@ -1,1451 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        rowdragpl.cpp
-// Purpose:     cbRowDragPlugin implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/rowdragpl.h"
-
-#define MINIMAL_ROW_DRAG_OFS  5
-
-// parameters for row-hints of NC-look
-
-#define TRIANGLE_OFFSET       2
-#define TRIANGLE_TO_PAT_GAP   2
-#define PAT_OFFSET            2
-#define COLLAPSED_ICON_WIDTH  45
-#define COLLAPSED_ICON_HEIGHT 9
-#define ROW_DRAG_HINT_WIDTH   10
-#define ICON_TRIAN_WIDTH      6
-#define ICON_TRIAN_HEIGHT     3
-
-/***** Implementation for class cbHiddenBarInfo *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbHiddenBarInfo, wxObject )
-
-/***** Implementation for class cbRowDragPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowDragPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbRowDragPlugin, cbPluginBase )
-
-    EVT_PL_LEFT_DOWN          ( cbRowDragPlugin::OnLButtonDown        )
-    EVT_PL_LEFT_UP              ( cbRowDragPlugin::OnLButtonUp          )
-    EVT_PL_MOTION              ( cbRowDragPlugin::OnMouseMove          )
-
-    EVT_PL_DRAW_PANE_DECOR    ( cbRowDragPlugin::OnDrawPaneBackground )
-
-END_EVENT_TABLE()
-
-// FIXME:: how to eliminated these cut and pasted constructors?
-
-cbRowDragPlugin::cbRowDragPlugin(void)
-
-    : mHightColor          ( 192, 192, 255 ),
-      mLowColor            ( 192, 192, 192 ),
-      mTrianInnerColor     ( 0,0,255 ),
-      mTrianInnerPen       ( mTrianInnerColor, 1, wxSOLID ),
- 
-      mDragStarted         ( false ),
-      mDecisionMode        ( false ),
-      mCurDragOfs          ( 0 ),
-      mCaptureIsOn         ( false ),
-      mSvTopMargin         ( -1 ),
-      mSvBottomMargin      ( -1 ),
-      mSvLeftMargin        ( -1 ),
-      mSvRightMargin       ( -1 ),
-   
-      mpPaneImage          ( NULL ),
-      mpRowImage           ( NULL ),
-      mpCombinedImage        ( NULL ),
-
-      mpRowInFocus         ( NULL ),
-      mCollapsedIconInFocus( -1 ),
-      
-      mpPane               ( NULL )
-{
-}
-
-cbRowDragPlugin::cbRowDragPlugin( wxFrameLayout* pLayout, int paneMask )
-
-    : cbPluginBase( pLayout, paneMask ),
-      
-         mHightColor          ( 192, 192, 255 ),
-      mLowColor            ( 192, 192, 192 ),
-      mTrianInnerColor     ( 0,0,255 ),
-      mTrianInnerPen       ( mTrianInnerColor, 1, wxSOLID ),
-   
-      mDragStarted         ( false ),
-      mDecisionMode        ( false ),
-      mCurDragOfs          ( 0 ),
-      mCaptureIsOn         ( false ),
-      mSvTopMargin         ( -1 ),
-      mSvBottomMargin      ( -1 ),
-      mSvLeftMargin        ( -1 ),
-      mSvRightMargin       ( -1 ),
-      
-      mpPaneImage          ( NULL ),
-      mpRowImage           ( NULL ),
-      mpCombinedImage        ( NULL ),
-
-      mpRowInFocus         ( NULL ),
-      mCollapsedIconInFocus( -1 ),
-      
-      mpPane               ( NULL )
-{
-}
-
-cbRowDragPlugin::~cbRowDragPlugin()
-{
-}
-
-// handlers for plugin events
-void cbRowDragPlugin::OnMouseMove( cbMotionEvent& event )
-{
-    // short-cuts
-    wxPoint pos = event.mPos;
-    mpPane      = event.mpPane;
-
-    mpPane->PaneToFrame( &pos.x, &pos.y );
-
-    if ( !mDragStarted )
-    {
-        if ( mDecisionMode && mpRowInFocus )
-        {
-            int ofs;
-
-            if ( mpPane->IsHorizontal() )
-
-                ofs = pos.y - mDragOrigin.y;
-            else
-                ofs = pos.x - mDragOrigin.x;
-
-            // check if the item was dragged sufficeintly
-            // far, enough to consider that user really intends 
-            // to drag it
-
-            if ( ofs >= MINIMAL_ROW_DRAG_OFS ||
-                 ofs <= -MINIMAL_ROW_DRAG_OFS )
-            {
-                // DBG::
-                //.wxPoint pos = event.mPos;
-                //wxPoint drg = mDragOrigin;
-                //int dif = event.mPos.x - mDragOrigin.x;
-
-                mDragStarted  = true;
-                mDecisionMode = false;
-                mDragOrigin   = pos;
-
-                PrepareForRowDrag();
-                return;
-            }
-
-            // this plugin "eats" all mouse input while item is dragged,
-            return;
-        }
-
-        cbRowInfo* pRow = GetFirstRow();
-
-        bool focusFound = false;
-
-        while( pRow )
-        {
-            if ( HitTestRowDragHint( pRow, pos ) )
-            {
-                CheckPrevItemInFocus( pRow, -1 );
-                SetMouseCapture( true );
-
-                focusFound = true;
-
-                mpRowInFocus          = pRow;
-                mCollapsedIconInFocus = -1;
-                break;
-            }
-
-            pRow = pRow->mpNext;
-        }
-
-        if ( !focusFound )
-        {
-            int hrCnt = GetHRowsCountForPane( event.mpPane );
-
-            for( int i = 0; i != hrCnt; ++i )
-            {
-                if ( HitTestCollapsedRowIcon( i, pos ) )
-                {
-                    CheckPrevItemInFocus( NULL, i );
-                    SetMouseCapture( true );
-
-                    focusFound = true;
-
-                    mCollapsedIconInFocus = i;
-                    mpRowInFocus          = NULL;
-                    break;
-                }
-            }
-        }
-
-        if ( !focusFound && ItemIsInFocus() )
-        {
-            // kill focus from item previously been in focus
-            UnhighlightItemInFocus();
-
-            mpRowInFocus          = NULL;
-            mCollapsedIconInFocus = -1;
-            SetMouseCapture( false );
-        }
-
-        if ( !ItemIsInFocus() ) 
-
-                // delegate it to other plugins
-                event.Skip();
-    }
-    else
-    {
-        // otherwise mouse pointer moves, when dragging is started
-
-        if ( mpPane->IsHorizontal() )
-        {
-            // row is dragged up or down;
-            ShowDraggedRow( pos.y - mDragOrigin.y );
-        }
-        else
-        {
-            // row is dragged left or right
-            ShowDraggedRow( pos.x - mDragOrigin.x );
-        }
-
-        // this plugin "eats" all mouse input while item is dragged,
-    }
-}
-
-void cbRowDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
-{
-    mpPane = event.mpPane;
-
-    // DBG::
-    wxASSERT( !mDragStarted && !mDecisionMode );
-
-    if ( ItemIsInFocus() )
-    {
-        mDecisionMode = true;
-
-        wxPoint pos = event.mPos;
-        mpPane->PaneToFrame( &pos.x, &pos.y );
-
-        mDragOrigin = pos;
-
-        SetMouseCapture( true );
-    }
-    else
-        // propagate event to other plugins
-        event.Skip();
-}
-
-void cbRowDragPlugin::OnLButtonUp  ( cbLeftUpEvent& event )
-{
-    if ( !mDragStarted && !mDecisionMode ) 
-    {
-        event.Skip();
-        return;
-    }
-
-    mpPane = event.mpPane;
-
-    if ( mDecisionMode )
-    {
-        cbDockPane* pPane = mpPane;
-
-        SetMouseCapture( false );
-
-        mDecisionMode = false;
-        mDragStarted  = false;
-
-        wxPoint frmPos = event.mPos;
-        pPane->PaneToFrame( &frmPos.x, &frmPos.y );
-
-        if ( mpRowInFocus ) 
-        {
-            CollapseRow( mpRowInFocus );
-            mpRowInFocus = 0;
-        }
-        else
-        {
-            ExpandRow( mCollapsedIconInFocus );
-            mCollapsedIconInFocus = -1;
-        }
-
-        mpRowInFocus  = NULL;
-        mpPane = pPane;
-
-        pPane->FrameToPane( &frmPos.x, &frmPos.y );
-
-        // give it another try after relayouting bars
-
-        cbMotionEvent moveEvt( frmPos, pPane );
-        this->OnMouseMove( moveEvt );
-
-        // this plugin has "eaten" the mouse-up event
-
-        return;
-    }
-    else
-    {
-        // otherwise, the dragged row was dropped, determine
-        // where to insert it
-
-        // restore initial pane appearence
-        ShowPaneImage();
-        FinishOnScreenDraw();
-
-        cbRowInfo* pRow = GetFirstRow();
-
-        mpLayout->GetUpdatesManager().OnStartChanges();
-
-        pRow->mUMgrData.SetDirty(true);
-
-        cbBarInfo* pBar = mpRowInFocus->mBars[0];
-
-        while ( pBar )
-        {
-            pBar->mUMgrData.SetDirty(true);
-
-            if ( pBar->mpBarWnd )
-            {
-                // do complete refresh
-                pBar->mpBarWnd->Show(false);
-                pBar->mpBarWnd->Show(true);
-            }
-
-            pBar = pBar->mpNext;
-        }
-
-        while( pRow )
-        {
-            if ( mCurDragOfs < pRow->mRowY )
-            {
-                InsertDraggedRowBefore( pRow );
-                break;
-            }
-
-            pRow = pRow->mpNext;
-        }
-
-        if ( pRow == NULL ) InsertDraggedRowBefore( NULL );
-
-        mpRowInFocus = NULL;
-
-        mpLayout->RecalcLayout(false);
-
-        // finish change "transaction"
-        mpLayout->GetUpdatesManager().OnFinishChanges();
-        mpLayout->GetUpdatesManager().UpdateNow();
-
-        // finish drag action
-        SetMouseCapture( false );
-        mDragStarted = false;
-    }
-}
-
-void cbRowDragPlugin::OnDrawPaneBackground ( cbDrawPaneDecorEvent& event )
-{
-    mpPane = event.mpPane;
-
-    // FIXME:: this may harm operation of other plugins
-
-    if ( GetNextHandler() && mpPane->GetRowList().GetCount() )
-    {
-        // first, let other plugins add their decorations now
-    
-        GetNextHandler()->ProcessEvent( event );
-        event.Skip(false);
-    }
-
-    wxClientDC dc( &mpLayout->GetParentFrame() );
-
-    dc.SetClippingRegion( mpPane->mBoundsInParent.x,
-                          mpPane->mBoundsInParent.y,
-                          mpPane->mBoundsInParent.width,
-                          mpPane->mBoundsInParent.height );
-
-    int cnt = GetHRowsCountForPane( event.mpPane );
-
-    if ( cnt > 0 ) 
-
-        DrawCollapsedRowsBorder( dc );
-
-    if ( mpPane->GetRowList().GetCount() )
-    
-        DrawRowsDragHintsBorder( dc );
-
-    cbRowInfo* pRow = GetFirstRow();
-
-    while( pRow )
-    {
-        DrawRowDragHint( pRow, dc, false );
-        pRow = pRow->mpNext;
-    }
-
-    for( int i = 0; i != cnt; ++i )
-
-        DrawCollapsedRowIcon(i, dc, false );
-}
-
-int cbRowDragPlugin::GetHRowsCountForPane( cbDockPane* pPane )
-{
-    wxNode* pNode = mHiddenBars.GetFirst();
-
-    int maxIconNo = -1;
-
-    while( pNode )
-    {
-        cbHiddenBarInfo* pHBInfo = (cbHiddenBarInfo*)pNode->GetData();
-
-        if ( pHBInfo->mAlignment == pPane->mAlignment )
-
-            maxIconNo = wxMax( maxIconNo, pHBInfo->mIconNo );
-
-        pNode = pNode->GetNext();
-    }
-
-    return ( maxIconNo + 1 );
-}
-
-int cbRowDragPlugin::GetCollapsedRowIconHeight()
-{
-    return COLLAPSED_ICON_HEIGHT;
-}
-
-int cbRowDragPlugin::GetRowDragHintWidth()
-{
-    return ROW_DRAG_HINT_WIDTH;
-}
-
-void cbRowDragPlugin::SetPaneMargins()
-{
-    int hiddenRowsCnt = GetHRowsCountForPane( mpPane );
-
-    if ( mSvTopMargin == -1 )
-    {
-        mSvTopMargin    = mpPane->mTopMargin;
-        mSvBottomMargin    = mpPane->mBottomMargin;
-        mSvLeftMargin   = mpPane->mLeftMargin;
-        mSvRightMargin  = mpPane->mRightMargin;
-    }
-
-    if ( mpPane->IsHorizontal() )
-    {
-        mpPane->mTopMargin    = mSvTopMargin;
-        mpPane->mBottomMargin = ( hiddenRowsCnt == 0 ) 
-                                ?  mSvBottomMargin 
-                                :  mSvBottomMargin + GetCollapsedRowIconHeight();
-
-        mpPane->mLeftMargin   = mSvLeftMargin + GetRowDragHintWidth();
-        mpPane->mRightMargin  = mSvRightMargin;
-    }
-    else
-    {
-        mpPane->mTopMargin    = mSvTopMargin;
-        mpPane->mBottomMargin = mSvBottomMargin + GetRowDragHintWidth();
-
-        mpPane->mLeftMargin   = mSvLeftMargin;
-        mpPane->mRightMargin  = ( hiddenRowsCnt == 0 ) ?
-                                mSvRightMargin : mSvRightMargin + GetCollapsedRowIconHeight();
-    }
-}
-
-void cbRowDragPlugin::OnInitPlugin()
-{
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    for( int i = 0; i != MAX_PANES; ++i )
-
-        if ( panes[i]->MatchesMask( mPaneMask ) )
-        {
-            mpPane = panes[i];
-
-            SetPaneMargins();
-        }
-}
-
-/*** helpers for drag&drop ***/
-
-void cbRowDragPlugin::SetMouseCapture( bool captureOn )
-{
-    if ( mCaptureIsOn == captureOn ) return;
-
-    if ( captureOn ) 
-    {
-        mpLayout->CaptureEventsForPane( mpPane );
-        mpLayout->CaptureEventsForPlugin( this );
-    }
-    else 
-    {
-        mpLayout->ReleaseEventsFromPane( mpPane );
-        mpLayout->ReleaseEventsFromPlugin( this );
-    }
-
-    mCaptureIsOn = captureOn;
-}
-
-void cbRowDragPlugin::UnhighlightItemInFocus()
-{
-    wxClientDC dc( &mpLayout->GetParentFrame() );
-
-    if ( mpRowInFocus ) 
-
-        DrawRowDragHint( mpRowInFocus, dc, false );
-    else
-    if ( mCollapsedIconInFocus != - 1 )
-
-        DrawCollapsedRowIcon( mCollapsedIconInFocus, dc, false );
-}
-
-void cbRowDragPlugin::ShowDraggedRow( int offset )
-{
-    // create combined image of pane and dragged
-    // row on it, in the mpCombinedImage bitmap
-
-    if ( mpPane->IsHorizontal() )
-    {
-        if ( mInitialRowOfs + offset + mRowImgDim.y > mCombRect.y + mCombRect.height )
-
-            offset = mCombRect.y + mCombRect.height - mRowImgDim.y - mInitialRowOfs;
-
-        if ( mInitialRowOfs + offset < mCombRect.y )
-
-            offset = mCombRect.y - mInitialRowOfs;
-
-        int x, y = mInitialRowOfs + offset;
-        mpPane->FrameToPane( &x, &y );
-        mCurDragOfs = y;
-    }
-    else
-    {
-        if ( mInitialRowOfs + offset + mRowImgDim.x > mCombRect.x + mCombRect.width )
-
-            offset = mCombRect.x + mCombRect.width - mRowImgDim.x - mInitialRowOfs;
-
-        if ( mInitialRowOfs + offset < mCombRect.x )
-
-            offset = mCombRect.x - mInitialRowOfs;
-
-        int x = mInitialRowOfs + offset, y;
-        mpPane->FrameToPane( &x, &y );
-        mCurDragOfs = x;
-    }
-
-    wxMemoryDC rowImgDc;
-    rowImgDc.SelectObject ( *mpRowImage );
-
-    wxMemoryDC paneImgDc;
-    paneImgDc.SelectObject( *mpPaneImage );
-
-    wxMemoryDC combImgDc;
-    combImgDc.SelectObject( *mpCombinedImage );
-
-    combImgDc.Blit( 0,0, mCombRect.width, mCombRect.height,
-                    &paneImgDc, 0,0, wxCOPY );
-
-    if ( mpPane->IsHorizontal() )
-    {    
-        combImgDc.Blit( 0, mInitialRowOfs + offset - mCombRect.y,
-                        mCombRect.width, mRowImgDim.y,
-                        &rowImgDc, 0,0, wxCOPY );
-    }
-    else
-    {
-        combImgDc.Blit( mInitialRowOfs + offset - mCombRect.x,
-                        0,
-                        mRowImgDim.x, mCombRect.height,
-                        &rowImgDc, 0,0, wxCOPY );
-    }
-
-    int scrX = mCombRect.x,
-        scrY = mCombRect.y;
-
-    mpLayout->GetParentFrame().ClientToScreen( &scrX, &scrY );
-
-    mpScrDc->Blit( scrX, scrY, mCombRect.width, mCombRect.height,
-                   &combImgDc, 0,0, wxCOPY );
-
-    rowImgDc .SelectObject( wxNullBitmap );
-    paneImgDc.SelectObject( wxNullBitmap );
-    combImgDc.SelectObject( wxNullBitmap );
-}
-
-wxBitmap* cbRowDragPlugin::CaptureDCArea( wxDC& dc, wxRect& area )
-{
-    wxBitmap* pBmp = new wxBitmap( int(area.width), int(area.height) );
-
-    wxMemoryDC mdc;
-    mdc.SelectObject( *pBmp );
-
-    mdc.Blit( 0,0, area.width, area.height, &dc, area.x, area.y, wxCOPY );
-    mdc.SelectObject( wxNullBitmap );
-
-    return pBmp;
-}
-
-void cbRowDragPlugin::PrepareForRowDrag()
-{
-    wxRect rowBounds = mpRowInFocus->mBoundsInParent;
-
-    if ( mpPane->IsHorizontal() )
-    {
-        mCombRect         = mpPane->mBoundsInParent;
-
-        mCombRect.x += mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1;
-        mCombRect.y += mpPane->mTopMargin;
-
-        mCombRect.width  -= mpPane->mLeftMargin + mpPane->mRightMargin - ROW_DRAG_HINT_WIDTH - 1 - 1;
-        mCombRect.height -= mpPane->mTopMargin  + mpPane->mBottomMargin;
-
-        mCombRect.height += 2*rowBounds.height;
-        mCombRect.y      -= rowBounds.height;
-        mInitialRowOfs     = rowBounds.y;
-
-        rowBounds.y      -= 1;
-        rowBounds.height += 2;
-        rowBounds.x      = mCombRect.x;
-        rowBounds.width  = mCombRect.width;
-
-        mRowImgDim.y     = rowBounds.height;
-    }
-    else
-    {
-        mCombRect = mpPane->mBoundsInParent;
-
-        mCombRect.y += mpPane->mTopMargin  - 1; 
-        mCombRect.x += mpPane->mLeftMargin - 1;
-            ;
-        mCombRect.height -= mpPane->mTopMargin  + mpPane->mBottomMargin - ROW_DRAG_HINT_WIDTH - 1 - 1;
-        mCombRect.width  -= mpPane->mLeftMargin + mpPane->mRightMargin;
-
-        mCombRect.width += 2*rowBounds.width;
-        mCombRect.x     -= rowBounds.width;
-        mInitialRowOfs    = rowBounds.x;
-
-        rowBounds.x      -= 1;
-        rowBounds.width  += 2;
-        rowBounds.y      = mCombRect.y;
-        rowBounds.height = mCombRect.height;
-
-        mRowImgDim.x     = rowBounds.width;
-    }
-    // output cobination results onto frame's client area
-    wxScreenDC::StartDrawingOnTop(&mpLayout->GetParentFrame());
-    mpScrDc = new wxScreenDC();
-
-    int x = mCombRect.x, y = mCombRect.y;
-    mpLayout->GetParentFrame().ClientToScreen( &x, &y );
-
-    wxRect scrRect = mCombRect;
-    scrRect.x = x;
-    scrRect.y = y;
-
-    mpPaneImage = CaptureDCArea( *mpScrDc, scrRect );
-
-    wxMemoryDC mdc;
-    mdc.SelectObject( *mpPaneImage );
-    mdc.SetDeviceOrigin( -mCombRect.x, -mCombRect.y );
-
-    DrawRectShade( rowBounds, mdc, -1, mpLayout->mGrayPen,  mpLayout->mDarkPen  );
-    DrawRectShade( rowBounds, mdc, 0, mpLayout->mLightPen, mpLayout->mBlackPen );
-
-    mpRowImage = CaptureDCArea( mdc, rowBounds );
-
-    // draw dark empty-row placeholder
-    DrawEmptyRow( mdc, rowBounds );
-
-    //DrawRectShade( rowBounds, mdc, 0, mpLayout->mGrayPen,  mpLayout->mDarkPen  );
-    DrawRectShade( rowBounds, mdc, -1, mpLayout->mGrayPen, mpLayout->mGrayPen );
-
-    mdc.SelectObject( wxNullBitmap );
-
-    mpCombinedImage = new wxBitmap( int(mCombRect.width), int(mCombRect.height) );
-
-    // show it for the first time
-    ShowDraggedRow( 0 );
-}
-
-void cbRowDragPlugin::DrawEmptyRow( wxDC& dc, wxRect& rowBounds )
-{
-    wxBrush bkBrush( mpLayout->mDarkPen.GetColour(), wxSOLID );
-
-    // paint the "dark" empty-row placeholder
-
-    dc.SetBrush( bkBrush );
-    dc.SetPen  ( mpLayout->mNullPen );
-
-    dc.DrawRectangle( rowBounds.x, rowBounds.y, 
-                      rowBounds.width+1, rowBounds.height+1 );
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::ShowPaneImage()
-{
-    int scrX = 0, scrY = 0;
-
-    mpLayout->GetParentFrame().ClientToScreen( &scrX, &scrY );
-
-    wxMemoryDC mdc;
-    mdc.SelectObject( *mpPaneImage );
-
-    mpScrDc->Blit( mCombRect.x + scrX, mCombRect.y + scrY, 
-                   mCombRect.width, mCombRect.height,
-                   &mdc, 0,0, wxCOPY );
-
-    mdc.SelectObject( wxNullBitmap );
-}
-
-void cbRowDragPlugin::FinishOnScreenDraw()
-{
-    wxScreenDC::EndDrawingOnTop();
-
-    delete mpScrDc;
-    delete mpCombinedImage;
-    delete mpPaneImage;
-    delete mpRowImage;
-
-    mpScrDc = NULL;
-    
-    mpCombinedImage = mpPaneImage = mpRowImage = NULL;
-}
-
-void cbRowDragPlugin::CollapseRow( cbRowInfo* pRow )
-{
-    int iconCnt = GetHRowsCountForPane( mpPane );
-
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    cbBarInfo* pBar = pRow->mBars[0];
-
-    int rowNo = 0;
-
-    cbRowInfo* pCur = pRow;
-    while( pCur->mpPrev ) { ++rowNo; pCur = pCur->mpPrev; }
-
-    while( pBar )
-    {
-        cbHiddenBarInfo* pHBInfo = new cbHiddenBarInfo();
-                            
-        pHBInfo->mpBar      = pBar;
-        pHBInfo->mRowNo     = rowNo;
-        pHBInfo->mIconNo    = iconCnt;
-        pHBInfo->mAlignment    = mpPane->mAlignment;
-
-        mHiddenBars.Append( (wxObject*) pHBInfo );
-
-        // hide it
-        if ( pBar->mpBarWnd )
-
-            pBar->mpBarWnd->Show( false );
-
-        pBar->mState = wxCBAR_HIDDEN;
-
-        cbBarInfo* pNext = pBar->mpNext;
-
-        pBar->mpRow  = NULL;
-        pBar->mpNext = NULL;
-        pBar->mpPrev = NULL;
-
-        pBar = pNext;
-    }
-
-    mpPane->GetRowList().Remove( pRow );
-    mpPane->InitLinksForRows();
-
-    delete pRow;
-
-    SetPaneMargins();
-
-    mpLayout->RecalcLayout(false);
-
-    mpRowInFocus = NULL;
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-}
-
-void cbRowDragPlugin::ExpandRow( int collapsedIconIdx )
-{
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    cbRowInfo* pNewRow = new cbRowInfo();
-
-    wxNode* pNode = mHiddenBars.GetFirst();
-
-    int rowNo = 0;
-
-    // move bars from internal list to the newly expanded row 
-
-    while( pNode )
-    {
-        cbHiddenBarInfo* pHBInfo = (cbHiddenBarInfo*)pNode->GetData();
-
-        if ( pHBInfo->mAlignment     == mpPane->mAlignment &&
-             pHBInfo->mIconNo        == collapsedIconIdx   )
-        {
-            rowNo = pHBInfo->mRowNo;
-
-            if ( pHBInfo->mpBar->mState == wxCBAR_HIDDEN )
-            {
-                pNewRow->mBars.Add( pHBInfo->mpBar );
-
-                pHBInfo->mpBar->mState = ( mpPane->IsHorizontal() ) 
-                                         ? wxCBAR_DOCKED_HORIZONTALLY
-                                         : wxCBAR_DOCKED_VERTICALLY;
-            }
-
-            // remove bar info from internal list
-
-            wxNode* pNext = pNode->GetNext();
-
-            delete pHBInfo;
-            mHiddenBars.DeleteNode( pNode );
-
-            pNode = pNext;
-        }
-        else
-        {
-            // decrease incon numbers with higher indicies, since this
-            // row is now removed from the hidden-rows list
-
-            if ( pHBInfo->mIconNo    > collapsedIconIdx &&
-                 pHBInfo->mAlignment == mpPane->mAlignment )
-
-                --pHBInfo->mIconNo;
-
-            pNode = pNode->GetNext();
-        }
-    }
-
-    mpPane->InitLinksForRow( pNewRow );
-
-    // insert row into pane at it's original position
-
-    if ( pNewRow->mBars.GetCount() )
-    {
-        cbRowInfo* beforeRowNode = mpPane->GetRow( rowNo );
-
-        mpPane->InsertRow( pNewRow, beforeRowNode );
-    }
-    else
-        delete pNewRow;
-
-    SetPaneMargins();
-
-    mpLayout->RecalcLayout(false);
-
-    mCollapsedIconInFocus = -1;
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-
-
-    /*
-    wxNode* pRowNode = mHiddenRows.Nth( collapsedIconIdx );
-
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    // insert at the end of rows list
-    mpPane->InsertRow( pRowNode, NULL );
-
-    int success = mHiddenRows.DeleteNode( pRowNode );
-    // DBG::
-    wxASSERT( success );
-
-    SetPaneMargins();
-
-    mpLayout->RecalcLayout(false);
-
-    mCollapsedIconInFocus = -1;
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-    */
-}
-
-void cbRowDragPlugin::InsertDraggedRowBefore( cbRowInfo* pBeforeRow )
-{
-    if ( mpRowInFocus != pBeforeRow &&
-         mpRowInFocus->mpNext != pBeforeRow 
-       )
-    {
-        mpPane->GetRowList().Remove( mpRowInFocus );
-
-        mpPane->InsertRow( mpRowInFocus, pBeforeRow );
-    }
-    else 
-    {
-        // otherwise, nothing has happned (row positions do not change)
-
-        //wxClientDC dc( &mpLayout->GetParentFrame() );
-
-        //mpPane->PaintRow( mpRowInFocus, dc );
-        //DrawRowDragHint( mpRowInFocus, dc, false );
-    }
-}
-
-bool cbRowDragPlugin::ItemIsInFocus()
-{
-    return ( mpRowInFocus || mCollapsedIconInFocus != - 1 );
-}
-
-void cbRowDragPlugin::CheckPrevItemInFocus( cbRowInfo* pRow, int iconIdx )
-{
-    wxClientDC dc( &mpLayout->GetParentFrame() );
-
-    if ( pRow != NULL && mpRowInFocus == pRow ) return;
-    if ( iconIdx != -1 && mCollapsedIconInFocus == iconIdx ) return;
-
-    UnhighlightItemInFocus();
-
-    if ( iconIdx != - 1 )
-    
-        DrawCollapsedRowIcon( iconIdx, dc, true );
-
-    else
-    if ( pRow != NULL )
-
-        DrawRowDragHint( pRow, dc, true );
-}
-
-cbRowInfo* cbRowDragPlugin::GetFirstRow()
-{
-    return ( mpPane->GetRowList().GetCount() ) 
-           ? mpPane->GetRowList()[0]
-           : NULL;
-}
-
-/*** "hard-coded" metafile for NN-look ***/
-
-void cbRowDragPlugin::DrawTrianUp( wxRect& inRect, wxDC& dc )
-{
-    int xOfs = (inRect.width - ICON_TRIAN_WIDTH)/2;
-
-    wxBrush br( mTrianInnerColor, wxSOLID );
-
-    dc.SetBrush( br );
-    dc.SetPen( mpLayout->mBlackPen );
-
-    wxPoint points[3];
-    points[0].x = inRect.x + xOfs;
-    points[0].y = inRect.y + inRect.height - 1;
-    points[1].x = inRect.x + xOfs + ICON_TRIAN_WIDTH/2 + 1;
-    points[1].y = inRect.y + inRect.height - 2 - ICON_TRIAN_HEIGHT;
-    points[2].x = inRect.x + xOfs + ICON_TRIAN_WIDTH+1;
-    points[2].y = inRect.y + inRect.height - 1;
-
-    dc.DrawPolygon( 3, points );
-
-    // higlight upper-right edge of triangle
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( points[2].x, points[2].y,
-                 points[0].x, points[0].y );
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawTrianDown( wxRect& inRect, wxDC& dc )
-{
-    int xOfs = (inRect.width - ICON_TRIAN_WIDTH)/2;
-
-    wxBrush br( mTrianInnerColor, wxSOLID );
-
-    dc.SetBrush( br );
-    dc.SetPen( mpLayout->mBlackPen );
-
-    wxPoint points[3];
-    points[0].x = inRect.x + xOfs;
-    points[0].y = inRect.y;
-    points[1].x = inRect.x + xOfs + ICON_TRIAN_WIDTH;
-    points[1].y = inRect.y;
-    points[2].x = inRect.x + xOfs + ICON_TRIAN_WIDTH/2;
-    points[2].y = inRect.y + ICON_TRIAN_HEIGHT;
-
-    dc.DrawPolygon( 3, points );
-
-    // higlight upper-right edge of triangle
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( points[2].x, points[2].y,
-                 points[1].x, points[1].y );
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawTrianRight( wxRect& inRect, wxDC& dc )
-{
-    int yOfs = (inRect.height - ICON_TRIAN_WIDTH)/2;
-
-    wxBrush br( mTrianInnerColor, wxSOLID );
-
-    dc.SetBrush( br );
-    dc.SetPen( mpLayout->mBlackPen );
-
-    wxPoint points[3];
-    points[0].x = inRect.x;
-    points[0].y = inRect.y + yOfs + ICON_TRIAN_WIDTH;
-    points[1].x = inRect.x;
-    points[1].y = inRect.y + yOfs;
-    points[2].x = inRect.x + ICON_TRIAN_HEIGHT;
-    points[2].y = inRect.y + yOfs + ICON_TRIAN_WIDTH/2;
-
-    dc.DrawPolygon( 3, points );
-
-    // higlight upper-right edge of triangle
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( points[0].x, points[0].y,
-                 points[2].x, points[2].y );
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::Draw3DPattern( wxRect& inRect, wxDC& dc )
-{
-    for( int y = inRect.y; y < inRect.y + inRect.height; y+=3 )
-    
-        for( int x = inRect.x; x < inRect.x + inRect.width; x+=3 )
-        {
-            dc.SetPen( mpLayout->mLightPen );
-            dc.DrawPoint( x,y );
-            dc.SetPen( mpLayout->mBlackPen );
-            dc.DrawPoint( x+1, y+1 );
-        }
-}
-
-void cbRowDragPlugin::DrawRombShades( wxPoint& p1, wxPoint& p2, 
-                                      wxPoint& p3, wxPoint& p4,
-                                      wxDC& dc )
-{
-    dc.SetPen( mpLayout->mLightPen );
-    dc.DrawLine( p1.x, p1.y, p2.x, p2.y );
-    dc.DrawLine( p2.x, p2.y, p3.x, p3.y );
-    dc.SetPen( mpLayout->mDarkPen );
-    dc.DrawLine( p3.x, p3.y, p4.x, p4.y );
-    dc.DrawLine( p4.x, p4.y, p1.x, p1.y );
-}
-
-void cbRowDragPlugin::DrawOrtoRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
-    dc.SetBrush( bkBrush );
-    dc.SetPen( mpLayout->mBlackPen );
-
-    wxPoint points[4];
-
-    if ( inRect.width > inRect.height )
-    {
-        // horizontal orienation
-        points[0].x = inRect.x;
-        points[0].y = inRect.y + inRect.height;
-        points[1].x = inRect.x;
-        points[1].y = inRect.y;
-        points[2].x = inRect.x + inRect.width;
-        points[2].y = inRect.y;
-        points[3].x = inRect.x + inRect.width - COLLAPSED_ICON_HEIGHT;
-        points[3].y = inRect.y + inRect.height;
-
-        dc.DrawPolygon( 4, points );
-
-        // squeeze romb's bounds to create an inner-shade shape
-        ++points[0].x;
-        --points[0].y;
-        ++points[1].x;
-        ++points[1].y;
-        --points[2].x; --points[2].x;
-        ++points[2].y;
-        --points[3].y;
-
-        DrawRombShades( points[0], points[1], points[2], points[3], dc );
-    }
-    else
-    {
-        // vertical orientation
-        points[0].x = inRect.x + inRect.width;
-        points[0].y = inRect.y + inRect.height;
-        points[1].x = inRect.x;
-        points[1].y = inRect.y + inRect.height;
-        points[2].x = inRect.x;
-        points[2].y = inRect.y;
-        points[3].x = inRect.x + inRect.width;
-        points[3].y = inRect.y + COLLAPSED_ICON_HEIGHT;
-
-        dc.DrawPolygon( 4, points );
-
-        // squeeze romb's bounds to create an inner-shade shape
-        --points[0].y ;
-        --points[0].x;
-        ++points[1].x;
-        --points[1].y;
-        ++points[2].y; ++points[2].y;
-        ++points[2].x;
-        --points[3].x;
-
-        DrawRombShades( points[1], points[2], points[3], points[0], dc );
-    }
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
-    wxPoint points[4];
-
-    dc.SetBrush( bkBrush );
-    dc.SetPen( mpLayout->mBlackPen );
-
-    if ( inRect.width > inRect.height )
-    {
-        // horizontal orientation
-        points[0].x = inRect.x;
-        points[0].y = inRect.y + inRect.height;
-        points[1].x = inRect.x + COLLAPSED_ICON_HEIGHT;
-        points[1].y = inRect.y;
-        points[2].x = inRect.x + inRect.width;
-        points[2].y = inRect.y;
-        points[3].x = inRect.x + inRect.width - COLLAPSED_ICON_HEIGHT;
-        points[3].y = inRect.y + inRect.height;
-
-        dc.DrawPolygon( 4, points );
-
-        // squeeze romb's bounds to create an inner-shade shape
-        ++points[0].x ;++points[0].x ;
-        --points[0].y;
-        ++points[1].y;
-        --points[2].x; --points[2].x;
-        ++points[2].y;
-        //--points[3].x ;
-        --points[3].y;
-
-        DrawRombShades( points[0], points[1], points[2], points[3], dc );
-
-    }
-    else
-    {
-        // vertical orientation
-        points[0].x = inRect.x + inRect.width;
-        points[0].y = inRect.y + inRect.height;
-        points[1].x = inRect.x;
-        points[1].y = inRect.y + inRect.height - COLLAPSED_ICON_HEIGHT;
-        points[2].x = inRect.x;
-        points[2].y = inRect.y;
-        points[3].x = inRect.x + inRect.width;
-        points[3].y = inRect.y + COLLAPSED_ICON_HEIGHT;
-
-        dc.DrawPolygon( 4, points );
-
-        // squeeze romb's bounds to create an inner-shade shape
-        --points[0].y ;--points[0].y ;
-        --points[0].x;
-        ++points[1].x;
-        ++points[2].y; ++points[2].y;
-        ++points[2].x;
-        --points[3].x;
-
-        DrawRombShades( points[1], points[2], points[3], points[0], dc );
-    }
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::DrawRectShade( wxRect& inRect, wxDC& dc, 
-                                     int level, const wxPen& upperPen, const wxPen& lowerPen )
-{
-    // upper shade
-    dc.SetPen( upperPen );
-    dc.DrawLine( inRect.x - level, 
-                 inRect.y - level, 
-                 inRect.x + inRect.width - 1 + level, 
-                 inRect.y - level);
-    dc.DrawLine( inRect.x - level, inRect.y - level,
-                 inRect.x - level, inRect.y + inRect.height - 1 + level );
-
-    // lower shade
-    dc.SetPen( lowerPen );
-    dc.DrawLine( inRect.x - level, 
-                 inRect.y + inRect.height - 1 + level,
-                 inRect.x + inRect.width  + level,
-                 inRect.y + inRect.height - 1 + level);
-    dc.DrawLine( inRect.x + inRect.width - 1 + level,
-                 inRect.y - level,
-                 inRect.x + inRect.width - 1 + level,
-                 inRect.y + inRect.height + level);
-
-    dc.SetBrush( wxNullBrush );
-}
-
-void cbRowDragPlugin::Draw3DRect( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush )
-{
-    dc.SetPen( mpLayout->mNullPen );
-    dc.SetBrush( bkBrush );
-
-    dc.DrawRectangle( inRect.x, inRect.y,
-                      inRect.width, inRect.height );
-
-    DrawRectShade( inRect, dc, 0, mpLayout->mLightPen, mpLayout->mDarkPen );
-}
-
-int  cbRowDragPlugin::GetCollapsedIconsPos()
-{
-    RowArrayT& rows = mpPane->GetRowList();
-
-    if ( rows.GetCount() == 0 ) 
-    {
-        if ( mpPane->IsHorizontal() )
-            
-            return mpPane->mBoundsInParent.y + mpPane->mTopMargin;
-        else
-            return mpPane->mBoundsInParent.x + mpPane->mLeftMargin;
-    }
-
-    wxRect& bounds = rows[ rows.GetCount() - 1 ]->mBoundsInParent;
-
-    if ( mpPane->IsHorizontal() )
-
-        return bounds.y + bounds.height + 1;
-    else
-        return bounds.x + bounds.width  + 1;
-
-}
-
-void cbRowDragPlugin::GetRowHintRect( cbRowInfo* pRow, wxRect& rect )
-{
-    wxRect& bounds = pRow->mBoundsInParent;
-
-    if ( mpPane->IsHorizontal() )
-    {
-        rect.x = bounds.x - ROW_DRAG_HINT_WIDTH - 1;
-        rect.y = bounds.y;
-        rect.width = ROW_DRAG_HINT_WIDTH;
-        rect.height = bounds.height;
-    }
-    else
-    {
-        rect.x = bounds.x;
-        rect.y = bounds.y + bounds.height + 1;
-        rect.width = bounds.width;
-        rect.height = ROW_DRAG_HINT_WIDTH;
-    }
-}
-
-void cbRowDragPlugin::GetCollapsedInconRect( int iconIdx, wxRect& rect )
-{
-    int upper = GetCollapsedIconsPos();
-
-    int right = (iconIdx == 0 ) 
-                ? 0 : iconIdx * (COLLAPSED_ICON_WIDTH - COLLAPSED_ICON_HEIGHT);
-
-    if ( mpPane->IsHorizontal() )
-    {
-        rect.x = mpPane->mBoundsInParent.x + mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1
-                 + right;
-
-        rect.y = upper;
-        rect.width  = COLLAPSED_ICON_WIDTH;
-        rect.height = COLLAPSED_ICON_HEIGHT;
-    }
-    else
-    {
-         rect.x = upper;
-         rect.y = mpPane->mBoundsInParent.y + mpPane->mBoundsInParent.height 
-                 - mpPane->mBottomMargin + ROW_DRAG_HINT_WIDTH + 1
-                 - right - COLLAPSED_ICON_WIDTH;
-
-        rect.height = COLLAPSED_ICON_WIDTH;
-        rect.width  = COLLAPSED_ICON_HEIGHT;
-    }
-}
-
-/*** overridables ***/
-
-void cbRowDragPlugin::DrawCollapsedRowIcon( int index, wxDC& dc, bool isHighlighted )
-{
-    wxRect rect;
-    GetCollapsedInconRect( index, rect );
-
-    wxBrush  hiBrush ( mHightColor, wxSOLID );
-    wxBrush  lowBrush( mLowColor,   wxSOLID );
-    wxBrush& curBrush = ( isHighlighted ) ? hiBrush : lowBrush;
-
-    if ( mpPane->IsHorizontal() )
-    {                 
-        if ( index == 0 )
-
-            DrawOrtoRomb( rect, dc, curBrush );
-        else
-            DrawRomb( rect, dc, curBrush );
-
-        int triOfs = (index == 0) ? TRIANGLE_OFFSET : TRIANGLE_OFFSET + COLLAPSED_ICON_HEIGHT;
-
-        wxRect triRect;
-        triRect.x = triOfs + rect.x;
-
-        triRect.width = ICON_TRIAN_HEIGHT;
-        triRect.y = rect.y;
-        triRect.height = rect.height;
-
-        DrawTrianRight( triRect, dc );
-
-        wxRect patRect;
-        patRect.x      = triOfs + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP + rect.x;
-        patRect.y      = rect.y + PAT_OFFSET; 
-        patRect.width  = rect.width - (patRect.x - rect.x) - COLLAPSED_ICON_HEIGHT - PAT_OFFSET;
-        patRect.height = rect.height - PAT_OFFSET*2;
-
-        Draw3DPattern( patRect, dc );
-    }
-    else
-    {
-        if ( index == 0 )
-
-            DrawOrtoRomb( rect, dc, curBrush );
-        else
-            DrawRomb( rect, dc, curBrush );
-
-        int triOfs = (index == 0) 
-                     ? TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT
-                     : TRIANGLE_OFFSET + COLLAPSED_ICON_HEIGHT + ICON_TRIAN_HEIGHT;
-
-        wxRect triRect;
-        triRect.y      = rect.y + rect.height - triOfs;
-        triRect.x      = rect.x;
-        triRect.width  = rect.width;
-        triRect.height = ICON_TRIAN_HEIGHT;
-
-        DrawTrianUp( triRect, dc );
-
-        wxRect patRect;
-        patRect.y      = rect.y + COLLAPSED_ICON_HEIGHT + PAT_OFFSET;
-        patRect.x      = rect.x + PAT_OFFSET; 
-        patRect.width  = rect.width - 2*PAT_OFFSET ;
-        patRect.height = rect.height - triOfs - 2*PAT_OFFSET - COLLAPSED_ICON_HEIGHT;
-
-        Draw3DPattern( patRect, dc );
-    }
-}
-
-void cbRowDragPlugin::DrawRowDragHint( cbRowInfo* pRow , wxDC& dc, bool isHighlighted )
-{
-    wxRect rect;
-    GetRowHintRect( pRow, rect );
-
-    wxBrush  hiBrush ( mHightColor, wxSOLID );
-    wxBrush  lowBrush( mLowColor,   wxSOLID );
-    wxBrush& curBrush = ( isHighlighted ) ? hiBrush : lowBrush;
-
-    Draw3DRect( rect, dc, curBrush );
-
-    if ( mpPane->IsHorizontal() )
-    {
-        wxRect triRect;
-        triRect.y       = rect.y + TRIANGLE_OFFSET;
-        triRect.x       = rect.x;
-        triRect.width  = rect.width;
-        triRect.height = ICON_TRIAN_HEIGHT;
-
-        DrawTrianDown( triRect, dc );
-
-        wxRect patRect;
-        patRect.x      = rect.x + PAT_OFFSET;
-        patRect.y      = rect.y + TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP;
-        patRect.width  = rect.width - 2*PAT_OFFSET;
-        patRect.height = rect.height - ( patRect.y - rect.y ) - PAT_OFFSET;
-        Draw3DPattern( patRect, dc );
-
-        dc.SetPen( mpLayout->mLightPen );
-        dc.DrawLine( rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height );
-    }
-    else
-    {
-        wxRect triRect;
-        triRect.x       = rect.x + TRIANGLE_OFFSET;
-        triRect.y       = rect.y;
-        triRect.height = rect.height;
-        triRect.width  = ICON_TRIAN_HEIGHT;
-
-        DrawTrianRight( triRect, dc );
-
-        wxRect patRect;
-        patRect.y      = rect.y + PAT_OFFSET;
-        patRect.x      = rect.x + TRIANGLE_OFFSET + ICON_TRIAN_HEIGHT + TRIANGLE_TO_PAT_GAP;
-        patRect.height = rect.height - 2*PAT_OFFSET;
-        patRect.width  = rect.width - ( patRect.x - rect.x ) - PAT_OFFSET;
-        Draw3DPattern( patRect, dc );
-
-        dc.SetPen( mpLayout->mLightPen );
-        dc.DrawLine( rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height );
-    }
-}
-
-void cbRowDragPlugin::DrawRowsDragHintsBorder( wxDC& WXUNUSED(dc) )
-{
-    // FIXME:: what was that?
-}
-
-void cbRowDragPlugin::DrawCollapsedRowsBorder( wxDC& dc )
-{
-    int colRowOfs = GetCollapsedIconsPos();
-    wxRect& bounds = mpPane->mBoundsInParent;
-
-    wxBrush bkBrush( mpLayout->mGrayPen.GetColour(), wxSOLID );
-    dc.SetBrush( bkBrush );
-    dc.SetPen( mpLayout->mDarkPen );
-
-    if ( mpPane->IsHorizontal() )
-    
-        dc.DrawRectangle( bounds.x + mpPane->mLeftMargin - ROW_DRAG_HINT_WIDTH - 1,
-                          colRowOfs,
-                          bounds.width - mpPane->mLeftMargin - mpPane->mRightMargin + 2 + ROW_DRAG_HINT_WIDTH,
-                          COLLAPSED_ICON_HEIGHT + 1);
-    else
-        dc.DrawRectangle( colRowOfs,
-                          bounds.y + mpPane->mTopMargin - 1,
-                          COLLAPSED_ICON_HEIGHT + 1,
-                          bounds.height - mpPane->mTopMargin - mpPane->mBottomMargin 
-                          - ROW_DRAG_HINT_WIDTH - 2 );
-
-    dc.SetBrush( wxNullBrush );
-}
-
-static inline bool rect_contains_point( const wxRect& rect, int x, int y )
-{
-    return ( x >= rect.x &&
-             y >= rect.y &&
-             x <  rect.x + rect.width  &&
-             y <  rect.y + rect.height );
-}
-
-bool cbRowDragPlugin::HitTestCollapsedRowIcon( int iconIdx, const wxPoint& pos )
-{
-    wxRect bounds;
-    GetCollapsedInconRect( iconIdx, bounds );
-
-    return rect_contains_point( bounds, pos.x, pos.y );
-}
-
-bool cbRowDragPlugin::HitTestRowDragHint( cbRowInfo* pRow, const wxPoint& pos )
-{
-    wxRect bounds;
-    GetRowHintRect( pRow, bounds );
-
-    return rect_contains_point( bounds, pos.x, pos.y );
-}
-
diff --git a/contrib/src/fl/rowlayoutpl.cpp b/contrib/src/fl/rowlayoutpl.cpp
deleted file mode 100644
index 1c78f4b5a2..0000000000
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ /dev/null
@@ -1,1220 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        rowlayoutpl.cpp
-// Purpose:     cbRowLayoutPlugin implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     09/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/rowlayoutpl.h"
-
-// exerimental "features" are still buggy
-#undef __EXPERIMENTAL
-
-/***** Implementation for class cbRowLayoutPlugin *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbRowLayoutPlugin, cbPluginBase )
-
-BEGIN_EVENT_TABLE( cbRowLayoutPlugin, cbPluginBase )
-
-    EVT_PL_LAYOUT_ROW ( cbRowLayoutPlugin::OnLayoutRow  )
-    EVT_PL_LAYOUT_ROWS( cbRowLayoutPlugin::OnLayoutRows )
-    EVT_PL_RESIZE_ROW ( cbRowLayoutPlugin::OnResizeRow  )
-
-    EVT_PL_INSERT_BAR ( cbRowLayoutPlugin::OnInsertBar  )
-    EVT_PL_REMOVE_BAR ( cbRowLayoutPlugin::OnRemoveBar  )
-
-END_EVENT_TABLE()
-
-cbRowLayoutPlugin::cbRowLayoutPlugin(void)
-    : mpPane( 0 )
-{}
-
-cbRowLayoutPlugin::cbRowLayoutPlugin( wxFrameLayout* pPanel, int paneMask )
-
-    : cbPluginBase( pPanel, paneMask ),
-      mpPane( 0 )
-{}
-
-void cbRowLayoutPlugin::CheckIfAtTheBoundary( cbBarInfo* pTheBar, cbRowInfo& rowInfo )
-{
-    // this method handles situation, when fixed bar is inserted
-    // into the row, where among fixed bars not-fixed ones are present.
-    // In this case we need to check if the pBarNode appears to be inserted
-    // chain of fixed-bars on the very right or left side of the row,
-    // then all the white-space, such chain should be eliminated,
-    // and the resulting chain justified to the right or the left
-    // side of the row
-
-    if ( !pTheBar->IsFixed() || rowInfo.mHasOnlyFixedBars )
-
-        return;
-
-    cbBarInfo* pBar = rowInfo.mBars[ rowInfo.mBars.Count() - 1 ];
-
-    // slide fixed bars to the right on the right side relative to the pBarNode
-
-    int prevX = mpPane->mPaneWidth;
-
-    do
-    {
-        if ( !pBar->IsFixed() )
-            break;
-
-        wxRect& bounds = pBar->mBounds;
-
-        bounds.x = prevX - bounds.width;
-
-        prevX = bounds.x;
-
-        if ( pBar == pTheBar ) break;
-
-        pBar = pBar->mpPrev;
-    }
-    while( 1 );
-
-    // slide fixed bars to the left on the left side relative to the pBarNode
-
-    pBar = rowInfo.mBars[0];
-
-    prevX = 0;
-
-    do
-    {
-        if ( pBar->IsFixed() )
-
-            break;
-
-        wxRect& bounds = pBar->mBounds;
-
-        bounds.x = prevX;
-
-        prevX = bounds.x + bounds.width;
-
-        if ( pBar == pTheBar ) break;
-
-        pBar = pBar->mpNext;
-    }
-    while( 1 );
-}
-
-void cbRowLayoutPlugin::ExpandNotFixedBars( cbRowInfo* pRow )
-{
-    ApplyLengthRatios( pRow );
-
-    #if 1
-
-   // FIXME:: something's wrong?
-   return;
-
-    #else
-
-    double freeSpc = (double)GetRowFreeSpace( pRow );
-
-    // calculate sum of precents
-
-    double pcntSum = 0.0;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            pcntSum += pRow->mBars[i]->mLenRatio;
-    }
-
-    // setup bar lengths
-
-    int curX = 0;
-
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        if ( !bar.IsFixed() )
-        {
-            bar.mLenRatio = bar.mLenRatio/(pcntSum);
-
-            bar.mBounds.width =
-
-                wxMax( mpPane->mProps.mMinCBarDim.x, int( freeSpc*bar.mLenRatio ) );
-        }
-
-        bar.mBounds.x = curX;
-        curX = bar.mBounds.x + bar.mBounds.width;
-    }
-    #endif
-}
-
-void cbRowLayoutPlugin::AdjustLengthOfInserted( cbRowInfo* WXUNUSED(pRow), cbBarInfo* WXUNUSED(pTheBar) )
-{
-    return;
-
-#if 0
-
-    // TBD: Makes following code unreachable
-
-    // pTheBar is not-fixed
-
-    // FIXME:: what is this for??
-
-#if 1
-
-    int totalLen = 0;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            totalLen += pRow->mBars[i]->mBounds.width;
-    }
-
-    double curWidth = pTheBar->mBounds.width;
-
-    if ( pRow->mBars.Count() )
-
-        pTheBar->mBounds.width = int( mpPane->mPaneWidth * (curWidth / double(totalLen)) );
-#else
-
-    double freeSpc = (double)GetRowFreeSpace( pRow );
-
-    double pcntSum = 0.0;
-
-   size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-   {
-        if ( !pRow->mBars[i]->IsFixed() )
-            pcntSum += pRow->mBars[i]->mLenRatio;
-   }
-
-    // if no longer "balanced", assume that `pTheBar' was previously
-    // removed from this row (kind of AI...)
-
-    if ( pcntSum < 0.98 )
-
-        pTheBar->mBounds.width = freeSpc * (1.0 - pcntSum);
-#endif
-
-#endif
-
-}
-
-void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
-                                        cbBarInfo* pTheBar, cbRowInfo* pRow )
-{
-    cbBarInfo* pFromBar;
-    cbBarInfo* pTillBar;
-
-    if ( pTheBar->mBounds.x > from )
-    {
-        // it's range from the left
-        pFromBar = pRow->mBars[0];
-        pTillBar = pTheBar;
-    }
-    else
-    {
-        pFromBar = pTheBar->mpNext;
-        pTillBar = NULL;
-    }
-
-    // calc free space in the range
-
-    cbBarInfo* pBar = pFromBar;
-    int     freeSpc = till-from;
-    double  pcntSum = 0;
-
-    while( pBar != pTillBar )
-    {
-        if ( pBar->IsFixed() )
-            freeSpc -= pBar->mBounds.width;
-        else
-            pcntSum += pBar->mLenRatio;
-
-        pBar = pBar->mpNext;
-    }
-
-    // adjust not-fixed bar sizes in the range
-
-    pBar = pFromBar;
-
-    while ( pBar != pTillBar )
-    {
-        if ( !pBar->IsFixed() )
-      {
-            pBar->mBounds.width =
-                wxMax( mpPane->mProps.mMinCBarDim.x,
-                       (int)( ((double)freeSpc) * (pBar->mLenRatio/pcntSum) )
-                     );
-      }
-        pBar = pBar->mpNext;
-    }
-
-    // layout range, starting from the left-most bar
-
-    pBar      = pFromBar;
-    int prevX = from;
-    bool hasNotFixedBars = false;
-
-    while ( pBar != pTillBar )
-    {
-        wxRect& bounds = pBar->mBounds;
-
-        if ( !pBar->IsFixed() )
-        {
-            hasNotFixedBars = true;
-
-            freeSpc -= bounds.width;
-        }
-
-        bounds.x = prevX;
-
-        prevX = bounds.x + bounds.width;
-
-        pBar = pBar->mpNext;
-    }
-
-    // make width adjustment for the right-most bar in the range, due to
-    // lost precision when seting widths using f.p. length-ratios
-
-    if ( hasNotFixedBars )
-    {
-        if ( pTheBar->mBounds.x > from )
-        {
-            if ( pTillBar->mpPrev )
-            {
-                wxRect& tillBar = pTillBar->mpPrev->mBounds;
-
-                //tillBar.width = bar.mBounds.x - tillBar.x;
-                tillBar.width += freeSpc;
-            }
-        }
-        else
-        {
-            cbBarInfo* pLast = pRow->mBars[ pRow->mBars.Count() - 1 ];
-
-            if ( pLast != pTheBar )
-            {
-                pTheBar->mBounds.width += freeSpc;
-
-                SlideRightSideBars( pTheBar );
-            }
-        }
-    }
-}
-
-void cbRowLayoutPlugin::MinimzeNotFixedBars( cbRowInfo* pRow, cbBarInfo* pBarToPreserve )
-{
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() && pRow->mBars[i] != pBarToPreserve )
-            pRow->mBars[i]->mBounds.width = mpPane->mProps.mMinCBarDim.x;
-    }
-}
-
-int cbRowLayoutPlugin::GetRowFreeSpace( cbRowInfo* pRow )
-{
-    int freeSpc = mpPane->mPaneWidth;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        // not-fixed bars variable length, thus their
-        // dimensions are ignored
-        if ( pRow->mBars[i]->IsFixed() )
-            freeSpc -= pRow->mBars[i]->mBounds.width;
-    }
-
-    return freeSpc;
-}
-
-void cbRowLayoutPlugin::RecalcLengthRatios( cbRowInfo* pRow )
-{
-    double freeSpc = double( GetRowFreeSpace( pRow ) );
-
-    cbBarInfo* pBar          = pRow->mBars[0];
-    cbBarInfo* pLastNotFixed = NULL;
-
-    double pcntLeft = 1.0; // (100%)
-
-#ifdef __EXPERIMENTAL
-
-    int totalLen = 0;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            totalLen += pRow->mBars[i]->mBounds.width;
-    }
-#endif
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        if ( !bar.IsFixed() )
-        {
-
-#ifdef __EXPERIMENTAL
-
-            bar.mLenRatio = double(bar.mBounds.width)/double(totalLen);
-#else
-            bar.mLenRatio = double(bar.mBounds.width)/freeSpc;
-#endif
-
-            pcntLeft      -= bar.mLenRatio;
-            pLastNotFixed  = pBar;
-        }
-    }
-
-    // attach remainder (the result of lost precision) to the
-    // last not-fixed bar
-
-#if !defined(__EXPERIMENTAL)
-
-    if ( pLastNotFixed )
-
-        pLastNotFixed->mLenRatio += pcntLeft;
-#endif
-
-}
-
-void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
-{
-    size_t i;
-    double pcntSum = 0;
-
-    // FOR NOW:: all-in-one
-
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-            pcntSum += pRow->mBars[i]->mLenRatio;
-    }
-
-    /*
-    pBar = node_to_first_bar_node( pRow );
-
-    while( pBar )
-    {
-        cbBarInfo& bar = node_to_bar( pBar );
-
-        if ( !bar.IsFixed() )
-
-            bar.mLenRatio = pcntSum / bar.mLenRatio;
-
-        pBar = pBar->Next();
-    }
-    */
-
-    int    prevX   = 0;
-    double freeSpc = GetRowFreeSpace( pRow );
-
-    // tricky stuff (improtant!):
-    // when not-fixed bar is removed from the row and there are
-    // still some other not-fixed ones left in that row, then
-    // the sum of mLenRatio's is no longer 1.0 - this is left
-    // intintionally to handle the case when the removed bar
-    // is returned right back to the row - so that it would retain
-    // it's original dimensions in this row (this is kind of AI...)
-    //
-    // The problem is - when it's remvoed, the sum of
-    // mLenRatio's is not in "balance", i.e. is < 1.0,
-    // it's possible to restore balance, but instead of that
-    // we artifically ajdust freeSpc value in a way that it would
-    // look like total of mLetRatio's is 1.0, thus original
-    // len. ratios are _preserved_:
-
-    if (pcntSum == 0.0)
-        pcntSum = 1.0;
-
-    double unit = freeSpc / pcntSum;
-
-    bool haveSquished = false;
-
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        if ( !pRow->mBars[i]->IsFixed() )
-        {
-            cbBarInfo& bar = *pRow->mBars[i];
-
-            if ( int( unit * bar.mLenRatio ) < mpPane->mProps.mMinCBarDim.x )
-            {
-                haveSquished = true;
-
-                bar.mBounds.width = -1; // mark as "squished"
-
-                pcntSum -= bar.mLenRatio;
-
-                freeSpc -= mpPane->mProps.mMinCBarDim.x;
-            }
-        }
-    }  // for
-
-    if ( haveSquished )
-        unit = freeSpc / pcntSum;
-
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        bar.mBounds.x = prevX;
-
-        if ( !bar.IsFixed() )
-        {
-            if ( bar.mBounds.width == -1 )
-
-                bar.mBounds.width = mpPane->mProps.mMinCBarDim.x;
-            else
-                bar.mBounds.width = int( unit * bar.mLenRatio );
-
-            // a little bit of AI:
-            // memorize bar's height and width, when docked in
-            // the current orientation - by making the current
-            // dimensions to be "preffered" ones for this docking state
-
-            if ( !bar.IsFixed() )
-            {
-                bar.mDimInfo.mSizes[ bar.mState ].x = bar.mBounds.width;
-                bar.mDimInfo.mSizes[ bar.mState ].y = bar.mBounds.height;
-            }
-        }
-
-        prevX = bar.mBounds.x + bar.mBounds.width;
-    }
-}
-
-void cbRowLayoutPlugin::DetectBarHandles( cbRowInfo* pRow )
-{
-    // first pass from left to right (detect left-side handles)
-
-    bool foundNotFixed = false;
-
-    size_t i;
-    for ( i = 0; i != pRow->mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *pRow->mBars[i];
-
-        bar.mHasLeftHandle = false;
-
-        if ( !bar.IsFixed() )
-        {
-            if ( foundNotFixed )
-
-                if ( bar.mpPrev &&
-                     bar.mpPrev->IsFixed() )
-
-                    bar.mHasLeftHandle = true;
-
-            foundNotFixed = true;
-        }
-    }
-
-    // pass from right to left (detect right-side handles)
-
-    foundNotFixed = false;
-
-    cbBarInfo* pBar = pRow->mBars[ pRow->mBars.Count() - 1 ];
-
-    while( pBar )
-    {
-        pBar->mHasRightHandle = false;
-
-        if ( !pBar->IsFixed() )
-        {
-            if ( foundNotFixed )
-
-                if ( pBar->mpNext )
-
-                     pBar->mHasRightHandle = true;
-
-            foundNotFixed = true;
-        }
-
-        pBar = pBar->mpPrev;
-    }
-}
-
-void cbRowLayoutPlugin::RelayoutNotFixedBarsAround( cbBarInfo* pTheBar, cbRowInfo* pRow )
-{
-    if ( !pTheBar->mpPrev )
-    {
-        if (  !pTheBar->IsFixed() )
-        {
-            // this bar the first in the row, move it's
-            // left edge to the very left
-            pTheBar->mBounds.width += pTheBar->mBounds.x;
-            pTheBar->mBounds.x      = 0;
-        }
-    }
-    else
-        FitBarsToRange( 0, pTheBar->mBounds.x, pTheBar, pRow );
-
-    if ( !pTheBar->mpNext )
-    {
-        if ( !pTheBar->IsFixed() )
-        {
-            // this bar is the last one, move it's
-            // right edge to the very right
-
-            pTheBar->mBounds.width = mpPane->mPaneWidth - pTheBar->mBounds.x;
-        }
-    }
-    else
-        FitBarsToRange( pTheBar->mBounds.x + pTheBar->mBounds.width, mpPane->mPaneWidth,
-                        pTheBar, pRow
-                      );
-}
-
-void cbRowLayoutPlugin::LayoutItemsVertically( cbRowInfo& row )
-{
-    size_t i;
-    for ( i = 0; i != row.mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *row.mBars[i];
-
-        bar.mBounds.y = row.mRowY;
-
-        if ( !bar.IsFixed() )
-
-            // make all not-fixed bars of equal height
-            bar.mBounds.height = row.mRowHeight;
-
-        if ( row.mHasUpperHandle )
-
-            bar.mBounds.y += mpPane->mProps.mResizeHandleSize;
-    }
-}
-
-int cbRowLayoutPlugin::CalcRowHeight( cbRowInfo& row )
-{
-    int maxHeight = 0;
-
-    size_t i;
-    for ( i = 0; i != row.mBars.Count(); ++i )
-
-        maxHeight = wxMax( maxHeight, row.mBars[i]->mBounds.height );
-
-    return maxHeight;
-}
-
-void cbRowLayoutPlugin::StickRightSideBars( cbBarInfo* pToBar )
-{
-    cbBarInfo* pBar  = pToBar->mpNext;
-    cbBarInfo* pPrev = pToBar;
-
-    while( pBar )
-    {
-        wxRect& cur  = pBar->mBounds;
-        wxRect& prev = pPrev->mBounds;
-
-        cur.x = prev.x + prev.width;
-
-        pPrev = pBar;
-        pBar  = pBar->mpNext;
-    }
-}
-
-void cbRowLayoutPlugin::SlideLeftSideBars( cbBarInfo* pTheBar )
-{
-    // shift left-side-bars to the left (with respect to "theBar"),
-    // so that they would not obscured by each other
-
-    cbBarInfo* pBar  = pTheBar->mpPrev;
-    cbBarInfo* pPrev = pTheBar;
-
-    while( pBar )
-    {
-        wxRect& cur  = pBar->mBounds;
-        wxRect& prev = pPrev->mBounds;
-
-        if ( cur.x + cur.width > prev.x )
-
-            cur.x = prev.x - cur.width;
-
-        pPrev = pBar;
-        pBar  = pBar->mpPrev;
-    }
-}
-
-void cbRowLayoutPlugin::SlideRightSideBars( cbBarInfo* pTheBar )
-{
-    // shift right-side-bars to the right (with respect to "theBar"),
-    // so that they would not be obscured by each other
-
-    cbBarInfo* pBar  = pTheBar->mpNext;
-    cbBarInfo* pPrev = pTheBar;
-
-    while( pBar )
-    {
-        wxRect& cur  = pBar->mBounds;
-        wxRect& prev = pPrev->mBounds;
-
-        if ( cur.x < prev.x + prev.width )
-
-            cur.x = prev.x + prev.width;
-
-        pPrev = pBar;
-        pBar  = pBar->mpNext;
-    }
-}
-
-void cbRowLayoutPlugin::ShiftLeftTrashold( cbBarInfo* WXUNUSED(pTheBar), cbRowInfo& row )
-{
-    wxRect& first = row.mBars[0]->mBounds;
-
-    if ( first.x < 0 )
-    {
-        row.mBars[0]->mBounds.x = 0;
-
-        SlideRightSideBars( row.mBars[0] );
-    }
-}
-
-void cbRowLayoutPlugin::ShiftRightTrashold( cbBarInfo* pTheBar, cbRowInfo& row )
-{
-    wxRect& theBar = pTheBar->mBounds;
-
-    do
-    {
-        cbBarInfo* pBar = pTheBar;
-
-        // calculate free spece on the left side
-
-        int leftFreeSpc = 0;
-
-        while( pBar )
-        {
-            wxRect& cur = pBar->mBounds;
-
-            if ( pBar->mpPrev )
-            {
-                wxRect& prev = pBar->mpPrev->mBounds;
-
-                leftFreeSpc += cur.x - prev.x - prev.width;
-            }
-            else
-                leftFreeSpc += cur.x;
-
-            if ( cur.x < 0 )
-            {
-                leftFreeSpc = 0;
-                break;
-            }
-
-            pBar = pBar->mpPrev;
-        }
-
-        pBar = pTheBar;
-
-        int rightOverflow = 0;
-
-        if ( pTheBar->IsFixed() )
-
-            while( pBar )
-            {
-                if ( !pBar->mpNext )
-                {
-                    wxRect& cur = pBar->mBounds;
-
-                    if ( cur.x + cur.width > mpPane->mPaneWidth )
-
-                        rightOverflow = cur.x + cur.width - mpPane->mPaneWidth;
-                }
-
-                pBar = pBar->mpNext;
-            }
-
-        if ( rightOverflow > 0 )
-        {
-            if ( leftFreeSpc <= 0 ) return;
-
-            if ( pTheBar->mpNext )
-            {
-                wxRect& next = pTheBar->mpNext->mBounds;
-
-                // if there's enough space on the left, move over one half-obscured
-                // bar from the right to the left side with respect to "theBar"
-
-                if ( next.width < leftFreeSpc )
-                {
-                    cbBarInfo* pNext = pTheBar->mpNext;
-
-                    row.mBars.Remove( pNext );
-
-                    row.mBars.Insert( pNext, row.mBars.Index( pTheBar ) );
-
-                    next.x = theBar.x - next.width;
-
-                    // re-setup mpPrev/mpNext references after insertion
-
-                    mpPane->InitLinksForRow( &row );
-
-                    // tighten things
-
-                    StickRightSideBars( pTheBar );
-                    SlideLeftSideBars ( pTheBar );
-
-                    continue;
-                }
-            }
-
-            int leftShift = ( rightOverflow > leftFreeSpc )
-                            ? leftFreeSpc
-                            : rightOverflow;
-
-            theBar.x -= leftShift;
-
-            StickRightSideBars( pTheBar );
-            SlideLeftSideBars ( pTheBar );
-
-            break;
-
-        } // end of if ( rightOverflow )
-        else
-            break;
-
-    } while(1);
-}
-
-void cbRowLayoutPlugin::InsertBefore( cbBarInfo* pBeforeBar,
-                                      cbBarInfo* pTheBar,
-                                      cbRowInfo& row        )
-{
-    if ( pBeforeBar )
-
-        row.mBars.Insert( pTheBar, row.mBars.Index( pBeforeBar ) );
-    else
-        row.mBars.Add( pTheBar );
-
-    pTheBar->mpRow = &row;
-}
-
-void cbRowLayoutPlugin::DoInsertBar( cbBarInfo* pTheBar, cbRowInfo& row )
-{
-    wxRect& theBar = pTheBar->mBounds;
-
-    /* OLD STUFF::
-    if ( theBar.x < 0 && !node_to_bar( pTheBar ).IsFixed() )
-    {
-        // AI::
-        theBar.width += theBar.x;
-        theBar.x = 0;
-    } */
-
-    size_t i;
-    for ( i = 0; i != row.mBars.Count(); ++i )
-    {
-        cbBarInfo& bar = *row.mBars[i];
-
-        wxRect& cur = bar.mBounds;
-
-        // if bar hits the left edge
-        if ( theBar.x <= cur.x )
-        {
-            InsertBefore( &bar, pTheBar, row );
-            return;
-        }
-
-        else
-        // if bar hits the right edge
-        if ( theBar.x <= cur.x + cur.width )
-        {
-            if ( theBar.x + theBar.width > cur.x + cur.width )
-            {
-                InsertBefore( bar.mpNext, pTheBar, row );
-                return;
-            }
-
-            // otherwise the bar lies within the bounds of current bar
-
-            int leftDist  = theBar.x - cur.x;
-            int rightDist = cur.x + cur.width - (theBar.x + theBar.width);
-
-            if ( leftDist < rightDist )
-
-                InsertBefore( &bar, pTheBar, row );
-            else
-                InsertBefore( bar.mpNext, pTheBar, row );
-
-            return;
-        }
-    }
-
-    InsertBefore( NULL, pTheBar, row ); // insert at the end
-}
-
-// evnet handlers
-
-void cbRowLayoutPlugin::OnInsertBar( cbInsertBarEvent& event )
-{
-    cbBarInfo* pBarToInsert = event.mpBar;
-    cbRowInfo* pIntoRow     = event.mpRow;
-    mpPane                  = event.mpPane;
-
-    if ( !pBarToInsert->IsFixed() )
-
-        AdjustLengthOfInserted( pIntoRow, pBarToInsert );
-
-    DoInsertBar( pBarToInsert, *pIntoRow );
-
-    mpPane->InitLinksForRow( pIntoRow ); // relink "mpNext/mpPrev"s
-
-    // perform relayouting of the bars after insertion
-
-    // init bar location info
-    pBarToInsert->mAlignment = event.mpPane->mAlignment;
-    pBarToInsert->mRowNo     = event.mpPane->GetRowIndex( pIntoRow );
-
-#ifdef __EXPERIMENTAL
-
-    if ( !pIntoRow->mHasOnlyFixedBars || !pBarToInsert->IsFixed() )
-
-        RecalcLengthRatios( pIntoRow );
-
-#endif
-
-    MinimzeNotFixedBars( pIntoRow, pBarToInsert );
-
-    SlideLeftSideBars ( pBarToInsert );
-    SlideRightSideBars( pBarToInsert );
-
-    ShiftLeftTrashold ( pBarToInsert, *pIntoRow );
-    ShiftRightTrashold( pBarToInsert, *pIntoRow );
-
-    mpPane->SyncRowFlags( pIntoRow );
-
-    CheckIfAtTheBoundary( pBarToInsert, *pIntoRow );
-
-    if ( event.mpPane->IsHorizontal() )
-
-        pBarToInsert->mState = wxCBAR_DOCKED_HORIZONTALLY;
-    else
-        pBarToInsert->mState = wxCBAR_DOCKED_VERTICALLY;
-
-    if ( !pIntoRow->mHasOnlyFixedBars )
-    {
-
-#ifdef __EXPERIMENTAL
-
-        ExpandNotFixedBars( pIntoRow );
-#else
-
-        RelayoutNotFixedBarsAround( pBarToInsert, pIntoRow );
-        RecalcLengthRatios( pIntoRow );
-
-#endif
-
-        DetectBarHandles( pIntoRow );
-
-        // do proportional resizing of not-fixed bars
-        ApplyLengthRatios( pIntoRow );
-    }
-
-    // adjust the bar's docking state
-
-    // a little bit of AI:
-    // memorize bar's height and width, when docked in
-    // the current orientation - by making the current
-    // dimensions to be "preferred" ones for this docking state
-
-    if ( !pBarToInsert->IsFixed() )
-    {
-        cbBarInfo& bar = *pBarToInsert;
-
-        bar.mDimInfo.mSizes[ bar.mState ].x = bar.mBounds.width;
-        bar.mDimInfo.mSizes[ bar.mState ].y = bar.mBounds.height;
-    }
-}
-
-void cbRowLayoutPlugin::OnRemoveBar ( cbRemoveBarEvent& event )
-{
-    cbBarInfo* pBar = event.mpBar;
-    mpPane          = event.mpPane;
-
-    cbRowInfo* pRow = pBar->mpRow;
-
-    mpLayout->GetUpdatesManager().OnBarWillChange( pBar, pRow, event.mpPane );
-
-    // invalidate the whole row
-    //pFirst->mpRowInfo->mMgrData.mPrevBounds.x = -1;
-
-    pRow->mBars.Remove( pBar );
-
-    // rest bar information after removing it from the row
-    pBar->mpRow           = NULL;
-    pBar->mHasLeftHandle  = false;
-    pBar->mHasRightHandle = false;
-
-    mpPane->InitLinksForRow( pRow ); // relink "mpNext/mpPrev"s
-
-    if ( pRow->mBars.Count() == 0 )
-    {
-        // empty rows should not exist
-
-        event.mpPane->GetRowList().Remove( pRow );
-
-        delete pRow;
-
-        mpPane->InitLinksForRows();
-    }
-    else
-    {
-        // force repainting of bars, in the row, from which the bar was removed
-
-        // FIXME:: really needed?
-        pRow->mBars[0]->mUMgrData.SetDirty(true);
-
-        // re-setup mHasOnlyFixedBars flag for the row information
-        event.mpPane->SyncRowFlags( pRow );
-
-        DetectBarHandles( pRow );
-
-        if ( !pRow->mHasOnlyFixedBars )
-
-            ExpandNotFixedBars( pRow );
-    }
-}
-
-void cbRowLayoutPlugin::OnLayoutRow( cbLayoutRowEvent& event )
-{
-    cbRowInfo* pRow = event.mpRow;
-    mpPane          = event.mpPane;
-
-    MinimzeNotFixedBars( pRow, NULL );
-
-    if ( !pRow->mHasOnlyFixedBars )
-    {
-        // do proportional resizing of not-fixed bars
-        ApplyLengthRatios( pRow );
-    }
-
-    cbBarInfo& lastBar  = *pRow->mBars[ pRow->mBars.Count() - 1 ];
-    cbBarInfo& firstBar = *pRow->mBars[ 0 ];
-
-    // FIXME:: Next line not used
-    // wxRect& bounds = lastBar.mBounds;
-
-    if ( lastBar.mBounds.x + lastBar.mBounds.width > mpPane->mPaneWidth )
-    {
-        lastBar.mBounds.x = mpPane->mPaneWidth - lastBar.mBounds.width;
-
-        // first simulate left-row-edge friction
-
-        SlideLeftSideBars( &lastBar );
-
-        if ( firstBar.mBounds.x < 0 )
-            firstBar.mBounds.x = 0;
-
-        // then left-row-edge function, though this
-        // may cause some of the right-side bars going
-        // out of row bounds, but left-side always
-        // has the highest "priority"
-
-        SlideRightSideBars( &firstBar );
-    }
-
-    event.Skip(); // pass event to the next handler
-}
-
-void cbRowLayoutPlugin::OnLayoutRows( cbLayoutRowsEvent& event )
-{
-    mpPane       = event.mpPane;
-
-    int curY = 0;
-
-    // FIXME:: Next line not used.
-    // RowArrayT& arr = mpPane->GetRowList();
-
-    size_t i;
-    for ( i = 0; i != mpPane->GetRowList().Count(); ++i )
-    {
-        cbRowInfo& row = *mpPane->GetRowList()[ i ];
-        //mpPane->CalcLengthRatios(& row);
-
-        // setup "has-handle" flags for rows, which depend on the existence
-        // of not-fixed bars in the row
-
-        if ( !row.mHasOnlyFixedBars )
-        {
-            if ( mpPane->mAlignment == FL_ALIGN_TOP ||
-                 mpPane->mAlignment == FL_ALIGN_LEFT   )
-            {
-                row.mHasLowerHandle = true;
-
-                row.mHasUpperHandle = false;
-            }
-            else
-            {
-                row.mHasUpperHandle = true;
-
-                row.mHasLowerHandle = false;
-            }
-        }
-        else
-        {
-            // otherwise, rows with fixed-bars only, have no height-resizing handles
-            row.mHasUpperHandle = false;
-            row.mHasLowerHandle = false;
-        }
-
-        // setup vertical positions for items in the row
-
-        row.mRowY = curY;
-
-        row.mRowWidth  = mpPane->mPaneWidth;
-        row.mRowHeight = CalcRowHeight( row );
-
-        LayoutItemsVertically( row );
-
-        if ( row.mHasUpperHandle )
-            row.mRowHeight += mpPane->mProps.mResizeHandleSize;
-        if ( row.mHasLowerHandle )
-            row.mRowHeight += mpPane->mProps.mResizeHandleSize;
-
-        curY += row.mRowHeight;
-    }
-
-    event.Skip(); // pass event to the next handler - other hookeds plugin
-                  // may also add some "refinements" to the layout now
-}
-
-void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
-{
-    // extract resize-event info
-    int     ofs            = event.mHandleOfs;
-    bool    forUpperHandle = event.mForUpperHandle;
-    cbRowInfo* pTheRow     = event.mpRow;
-            mpPane         = event.mpPane;
-
-    // FIXME:: Next line not used.
-    //int     newHeight      = pTheRow->mRowHeight;
-
-    if ( forUpperHandle )
-    {
-        // calculate available free space from above,
-        // which can be obtained by squeezing not-fixed height rows
-
-        cbRowInfo* pRow = pTheRow->mpPrev;
-
-        while( pRow )
-        {
-            pRow = pRow->mpPrev;
-        }
-    }
-    else
-    {
-        // calculate available free space from below,
-        // which can be obtained by squeezing not-fixed height rows
-
-        cbRowInfo* pRow = pTheRow->mpNext;
-
-        while( pRow )
-        {
-            pRow = pRow->mpNext;
-        }
-    }
-
-    mpLayout->GetUpdatesManager().OnStartChanges();
-
-    int clientSize;
-
-    // allow user adjusting pane vs. client-area space, for upper-handle
-
-    if ( mpPane->IsHorizontal() )
-
-        clientSize = mpLayout->GetClientHeight();
-    else
-        clientSize = mpLayout->GetClientWidth();
-
-    if ( forUpperHandle && ofs < -clientSize )
-    {
-        int needed = -(ofs + clientSize);
-
-        cbRowInfo* pRow = mpPane->GetRowList()[ 0 ];
-
-        // start squeezing rows from the top row towards bottom
-
-        while( pRow != pTheRow && needed )
-        {
-            // only not-fixed rows can be squeezed
-
-            if ( !pRow->mHasOnlyFixedBars )
-            {
-                int prevHeight = pRow->mRowHeight;
-
-                int newHeight  = wxMax( event.mpPane->GetMinimalRowHeight( pRow ),
-                                        prevHeight - needed );
-
-                if ( newHeight != prevHeight )
-                {
-                    event.mpPane->SetRowHeight( pRow, newHeight );
-
-                    needed -= prevHeight - pRow->mRowHeight;
-                }
-            }
-
-            pRow = pRow->mpNext;
-        }
-    }
-
-    // allow user adjusting pane vs. client-area space, for lower-handle
-
-    if ( !forUpperHandle && ofs > clientSize )
-    {
-        int needed = ofs - clientSize;
-
-        cbRowInfo* pRow = mpPane->GetRowList()[ mpPane->GetRowList().Count() - 1 ];
-
-        // start squeezing rows from the bottom towards the top row
-
-        while( pRow && needed )
-        {
-            // only not-fixed rows can be squeezed
-
-            if ( !pRow->mHasOnlyFixedBars )
-            {
-                int prevHeight = pRow->mRowHeight;
-
-                int newHeight  = wxMax( event.mpPane->GetMinimalRowHeight( pRow ),
-                                        prevHeight - needed );
-
-                if ( newHeight != prevHeight )
-                {
-                    event.mpPane->SetRowHeight( pRow, newHeight );
-
-                    needed -= prevHeight - pRow->mRowHeight;
-                }
-            }
-
-            pRow = pRow->mpPrev;
-        }
-    }
-
-    if ( forUpperHandle )
-
-        event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight + (-ofs) );
-    else
-        event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight +   ofs  );
-
-    mpLayout->RecalcLayout(false);
-
-    mpLayout->GetUpdatesManager().OnFinishChanges();
-    mpLayout->GetUpdatesManager().UpdateNow();
-}
-
diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
deleted file mode 100644
index bca90066b7..0000000000
--- a/contrib/src/fl/toolwnd.cpp
+++ /dev/null
@@ -1,1108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        toolwnd.cpp
-// Purpose:     wxToolWindow implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     06/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/toolwnd.h"
-
-#define _IMG_A  0xAA    // Note: modified from _A to _IMG_A, _A was already defined (cygwin)
-#define _IMG_B  0x00    // Note: modified from _B to _IMG_A, _B was already defined (cygwin)
-#define _IMG_C  0x55    // Note: modified from _C to _IMG_C, for consistency reasons.
-#define _IMG_D  0x00    // Note: modified from _D to _IMG_D, for consistency reasons.
-
-// FOR NOW:: static
-
-static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D,
-                                                _IMG_A,_IMG_B,_IMG_C,_IMG_D
-                                              };
-
-/***** Implementation for class wxToolWindow *****/
-
-IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxFrame)
-
-BEGIN_EVENT_TABLE( wxToolWindow, wxFrame )
-
-    EVT_PAINT    ( wxToolWindow::OnPaint )
-    EVT_MOTION   ( wxToolWindow::OnMotion )
-    EVT_LEFT_DOWN( wxToolWindow::OnLeftDown )
-    EVT_LEFT_UP  ( wxToolWindow::OnLeftUp )
-    EVT_SIZE     ( wxToolWindow::OnSize )
-
-
-    EVT_ERASE_BACKGROUND( wxToolWindow::OnEraseBackground )
-
-END_EVENT_TABLE()
-
-enum INTERNAL_HIT_CODES
-{
-    HITS_WND_NOTHING,
-    HITS_WND_CLIENT,
-    HITS_WND_TITLE,
-
-    HITS_WND_LEFT_EDGE,
-    HITS_WND_RIGHT_EDGE,
-    HITS_WND_TOP_EDGE,
-    HITS_WND_BOTTOM_EDGE,
-
-    HITS_WND_TOP_LEFT_CORNER,
-    HITS_WND_BOTTOM_RIGHT_CORNER,
-    HITS_WND_TOP_RIGHT_CORNER,
-    HITS_WND_BOTTOM_LEFT_CORNER
-};
-
-wxToolWindow::wxToolWindow()
-
-    : mpClientWnd   ( NULL ),
-
-#ifndef __WXMSW__
-    mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
-#else
-    // just to simulate MS-Dev style
-    mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif") ),
-#endif
-
-    mTitleHeight  ( 16 ),
-    mClntHorizGap ( 2 ),
-    mClntVertGap  ( 2 ),
-    mWndVertGap   ( 4 ),
-    mWndHorizGap  ( 4 ),
-
-    mButtonGap    ( 2 ),
-    mInTitleMargin( 4 ),
-    mHintBorder   ( 4 ),
-
-    mResizeStarted( false ),
-    mRealTimeUpdatesOn( true ),
-
-    mMTolerance   ( 5 ), // mouse-resizing tollerance
-
-    mCursorType( HITS_WND_NOTHING ),
-    mMouseCaptured( false ),
-
-    mpScrDc( NULL )
-
-{
-}
-
-wxToolWindow::~wxToolWindow()
-{
-    if ( mpScrDc ) delete mpScrDc;
-
-    for( size_t i = 0; i != mButtons.Count(); ++i )
-        delete mButtons[i];
-}
-
-void wxToolWindow::LayoutMiniButtons()
-{
-    int w,h;
-
-    GetSize( &w, &h );
-
-    int x = w - mWndHorizGap - mInTitleMargin - BTN_BOX_WIDTH;
-    int y = mWndVertGap + 2;
-
-    for( size_t i = 0; i != mButtons.Count(); ++i )
-    {
-        mButtons[i]->SetPos( wxPoint( x,y ) );
-        x-= BTN_BOX_WIDTH + mButtonGap;
-    }
-}
-
-void wxToolWindow::SetClient( wxWindow* pWnd )
-{
-    mpClientWnd = pWnd;
-}
-
-wxWindow* wxToolWindow::GetClient()
-{
-    return mpClientWnd;
-}
-
-void wxToolWindow::SetTitleFont( wxFont& font )
-{
-    mTitleFont = font;
-}
-
-void wxToolWindow::AddMiniButton( cbMiniButton* pBtn )
-{
-    pBtn->mpWnd = this;
-
-    mButtons.Add( pBtn );
-
-    // not necesserely now..
-    //LayoutMiniButtons();
-}
-
-void wxToolWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC pdc( this );
-    wxWindowDC dc( this );
-
-    int w,h;
-    GetSize( &w, &h );
-
-    wxBrush backGround( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID );
-    //dc.SetBrush( *wxLIGHT_GREY_BRUSH );
-    dc.SetBrush( backGround );
-    dc.SetPen( *wxTRANSPARENT_PEN );
-
-    int y = mWndVertGap + mTitleHeight + mClntVertGap;
-
-    dc.DrawRectangle( 0,0, w, y );                                      // Top grey part.
-    dc.DrawRectangle( 0,y-1, mWndHorizGap + mClntHorizGap, h - y );     // Left grey part.
-    dc.DrawRectangle( w - ( mWndHorizGap + mClntHorizGap ), y-1,
-                      mWndHorizGap + mClntHorizGap, h - y );            // Right grey part.
-    dc.DrawRectangle( 0, h - mWndVertGap - mClntVertGap, w, mWndVertGap + mClntVertGap ); // Bottom grey part.
-
-    // draw shades
-    dc.SetPen( *wxLIGHT_GREY_PEN );
-
-    dc.DrawLine( 0,0, w, 0 );
-    dc.DrawLine( 0,0, 0, h );
-
-    dc.SetPen( *wxWHITE_PEN );
-
-    dc.DrawLine( 1,1, w, 1 );
-    dc.DrawLine( 1,2, 1, h );
-
-    dc.SetPen( *wxGREY_PEN );
-
-    dc.DrawLine( w - 2, 1, w - 2, h - 1 );
-    dc.DrawLine( 1, h - 2, w - 2, h - 2 );
-
-    dc.SetPen( *wxBLACK_PEN );
-
-    dc.DrawLine( 0, h - 1, w, h - 1 );
-    dc.DrawLine( w-1, 0, w-1, h );
-
-    // fill inner area
-
-    dc.SetBrush( *wxTheBrushList->FindOrCreateBrush( wxColour( 0,0,128 ), wxSOLID ) );
-
-    dc.DrawRectangle( mWndHorizGap, mWndVertGap, w - mWndHorizGap*2, mTitleHeight );
-
-    dc.SetFont( mTitleFont );
-
-    for( size_t i = 0; i != mButtons.Count(); ++i )
-        mButtons[i]->Draw( dc );
-
-    int x1 = mWndHorizGap + mClntHorizGap;
-    int x2 = mButtons[ mButtons.GetCount() - 1 ]->mPos.x - mClntHorizGap*2;
-
-    dc.SetClippingRegion( x1, mWndVertGap + mClntVertGap, x2 - x1, mTitleHeight );
-
-    dc.SetTextForeground( *wxWHITE );
-    dc.SetBackgroundMode(  wxTRANSPARENT );
-    dc.DrawText( GetTitle(), mWndHorizGap + 2, mWndVertGap + 1 );
-}
-
-void wxToolWindow::GetScrWindowRect( wxRect& r )
-{
-    int x,y;
-    GetPosition(&x,&y);
-    int w,h;
-    GetSize( &w, &h );
-
-    r.x = x; r.y = y;
-    r.width = w; r.height = h;
-}
-
-void wxToolWindow::GetScrMousePos( wxMouseEvent& event, wxPoint& pos )
-{
-    int x = event.m_x, y = event.m_y;
-
-    ClientToScreen( &x, &y );
-
-    pos.x = x; pos.y = y;
-}
-
-int wxToolWindow::HitTestWindow( wxMouseEvent& event )
-{
-    wxPoint pos;
-    wxRect r;
-
-    GetScrMousePos( event, pos );
-    GetScrWindowRect( r );
-
-    int k = mMTolerance;
-
-    if ( !( pos.x >= r.x && pos.y >= r.y &&
-            pos.x < r.x + r.width &&
-            pos.y < r.y + r.height )
-       )
-        return HITS_WND_NOTHING;
-
-    if ( pos.y <= r.y + k )
-    {
-        if ( pos.x < r.x + k*2 )
-            return HITS_WND_TOP_LEFT_CORNER;
-        else
-        {
-            if ( pos.x >= r.x + r.width - k*2 )
-                return HITS_WND_TOP_RIGHT_CORNER;
-            else
-                return HITS_WND_TOP_EDGE;
-        }
-    }
-    else
-    {
-        if ( pos.y >= r.y + r.height - k )
-        {
-            if ( pos.x < r.x + k*2 )
-                return HITS_WND_BOTTOM_LEFT_CORNER;
-            else
-            {
-                if ( pos.x > r.x + r.width - k*2 )
-                    return HITS_WND_BOTTOM_RIGHT_CORNER;
-                else
-                    return HITS_WND_BOTTOM_EDGE;
-            }
-        }
-        else
-        {
-            if ( pos.x <= r.x + k )
-                return HITS_WND_LEFT_EDGE;
-            else
-            {
-                if ( pos.x >= r.x + r.width - k )
-                    return HITS_WND_RIGHT_EDGE;
-                else
-                {
-                    if ( pos.y <= r.y + mWndVertGap + mTitleHeight + mClntVertGap )
-                        return HITS_WND_TITLE;
-                    else
-                        return HITS_WND_CLIENT;
-                }
-            }
-        }
-    }
-}
-
-void wxToolWindow::DrawHintRect( const wxRect& r )
-{
-    // BUG BUG BUG (wx):: somehow stippled brush works only
-    //                    when the bitmap created on stack, not
-    //                    as a member of the class
-
-    int prevLF = mpScrDc->GetLogicalFunction();
-
-    mpScrDc->SetLogicalFunction( wxXOR );
-
-    wxBitmap checker( (const char*)_gCheckerImg, 8,8 );
-
-    wxBrush checkerBrush( checker );
-
-    mpScrDc->SetPen( *wxTRANSPARENT_PEN );
-    mpScrDc->SetBrush( checkerBrush );
-
-    int half = mHintBorder / 2;
-
-    mpScrDc->DrawRectangle( r.x - half, r.y - half,
-                            r.width + 2*half, mHintBorder );
-
-    mpScrDc->DrawRectangle( r.x - half, r.y + r.height - half,
-                            r.width + 2*half, mHintBorder );
-
-    mpScrDc->DrawRectangle( r.x - half, r.y + half - 1,
-                            mHintBorder, r.height - 2*half + 2);
-
-    mpScrDc->DrawRectangle( r.x + r.width - half,
-                            r.y + half - 1,
-                            mHintBorder, r.height - 2*half + 2);
-
-    mpScrDc->SetBrush( wxNullBrush );
-
-    mpScrDc->SetLogicalFunction( prevLF );
-}
-
-void wxToolWindow::SetHintCursor( int type )
-{
-    if ( mResizeStarted )
-        return;
-
-    if ( type == HITS_WND_NOTHING || type == HITS_WND_CLIENT )
-    {
-        // the cursor is out of window - reset to arrow
-
-        if ( mMouseCaptured )
-        {
-            ReleaseMouse();
-            mMouseCaptured = false;
-        }
-
-        SetCursor( wxCURSOR_ARROW );
-
-        mCursorType = type;
-
-        return;
-    }
-
-    // did the cursor actually changed?
-
-    if ( type != mCursorType )
-    {
-        mCursorType = type;
-
-        switch ( type )
-        {
-            case HITS_WND_LEFT_EDGE   : SetCursor( wxCURSOR_SIZEWE ); break;
-            case HITS_WND_RIGHT_EDGE  : SetCursor( wxCURSOR_SIZEWE ); break;
-            case HITS_WND_TOP_EDGE    : SetCursor( wxCURSOR_SIZENS ); break;
-            case HITS_WND_BOTTOM_EDGE : SetCursor( wxCURSOR_SIZENS ); break;
-
-            case HITS_WND_TOP_LEFT_CORNER     : SetCursor( wxCURSOR_SIZENWSE ); break;
-            case HITS_WND_BOTTOM_RIGHT_CORNER : SetCursor( wxCURSOR_SIZENWSE ); break;
-            case HITS_WND_TOP_RIGHT_CORNER    : SetCursor( wxCURSOR_SIZENESW ); break;
-            case HITS_WND_BOTTOM_LEFT_CORNER  : SetCursor( wxCURSOR_SIZENESW ); break;
-
-            case HITS_WND_TITLE  : SetCursor( wxCURSOR_ARROW ); break;
-            case HITS_WND_CLIENT : SetCursor( wxCURSOR_ARROW ); break;
-
-            default: break;
-        }
-
-        if (mMouseCaptured)
-        {
-            mMouseCaptured = false;
-            ReleaseMouse();
-        }
-    }
-
-    if ( !mMouseCaptured )
-    {
-        mMouseCaptured = true;
-        CaptureMouse();
-    }
-}
-
-#define FL_INFINITY 32768
-
-static inline void clip_to( int& value, long from, long till )
-{
-    if ( value < from )
-        value = from;
-
-    if ( value > till )
-        value = till;
-}
-
-void wxToolWindow::AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect )
-{
-    if ( mCursorType == HITS_WND_TOP_EDGE ||
-         mCursorType == HITS_WND_TOP_LEFT_CORNER )
-    {
-        newRect.x = original.x + original.width  - newDim.x;
-        newRect.y = original.y + original.height - newDim.y;
-    }
-    else
-    if ( mCursorType == HITS_WND_LEFT_EDGE ||
-         mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
-    {
-        newRect.x = original.x + original.width  - newDim.x;
-        newRect.y = original.y;
-    }
-    else
-    if ( mCursorType == HITS_WND_RIGHT_EDGE ||
-         mCursorType == HITS_WND_TOP_RIGHT_CORNER )
-    {
-        newRect.x = original.x;
-        newRect.y = original.y + original.height - newDim.y;
-    }
-    else
-    if ( mCursorType == HITS_WND_BOTTOM_EDGE ||
-         mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
-    {
-        newRect.x = original.x;
-        newRect.y = original.y;
-    }
-
-    newRect.width  = newDim.x;
-    newRect.height = newDim.y;
-}
-
-void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize& minDim )
-{
-    // Microsoft's rect-coordinates are best suited
-    // for the case of corner-clipping
-
-    int left   = mInitialRect.x;
-    int top    = mInitialRect.y;
-    int right  = mInitialRect.x + mInitialRect.width;
-    int bottom = mInitialRect.y + mInitialRect.height;
-
-    // constraint delta edge is dragged
-
-    switch ( mCursorType )
-    {
-        case HITS_WND_LEFT_EDGE   : delta.y = 0; break;
-        case HITS_WND_RIGHT_EDGE  : delta.y = 0; break;
-        case HITS_WND_TOP_EDGE    : delta.x = 0; break;
-        case HITS_WND_BOTTOM_EDGE : delta.x = 0; break;
-        default: break;
-    }
-
-    if ( mCursorType == HITS_WND_TOP_EDGE ||
-         mCursorType == HITS_WND_TOP_LEFT_CORNER )
-    {
-        left += delta.x;
-        top  += delta.y;
-
-        clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
-        clip_to( top,  -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
-    }
-    else
-    if ( mCursorType == HITS_WND_LEFT_EDGE ||
-         mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
-    {
-        left   += delta.x;
-        bottom += delta.y;
-
-        clip_to( left,    -FL_INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
-        clip_to( bottom,  mInitialRect.y + minDim.y, FL_INFINITY );
-    }
-    else
-    if ( mCursorType == HITS_WND_RIGHT_EDGE ||
-        mCursorType == HITS_WND_TOP_RIGHT_CORNER )
-    {
-        right += delta.x;
-        top   += delta.y;
-
-        clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
-        clip_to( top,   -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
-    }
-    else
-    if ( mCursorType == HITS_WND_BOTTOM_EDGE ||
-         mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
-    {
-        right  += delta.x;
-        bottom += delta.y;
-
-        clip_to( right,  mInitialRect.x + minDim.x,  FL_INFINITY );
-        clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );
-    }
-    else
-    {
-        wxFAIL_MSG( _T("what did the cursor hit?") );
-    }
-
-    rect.x = left;
-    rect.y = top;
-    rect.width  = right - left;
-    rect.height = bottom - top;
-}
-
-wxSize wxToolWindow::GetMinimalWndDim()
-{
-    return wxSize( (mWndHorizGap + mClntHorizGap)*2 + BTN_BOX_WIDTH*4,
-                   (mWndVertGap  + mClntVertGap )*2 + mTitleHeight );
-}
-
-void wxToolWindow::OnMotion( wxMouseEvent& event )
-{
-    if ( !mResizeStarted )
-    {
-        for( size_t i = 0; i != mButtons.Count(); ++i )
-            mButtons[i]->OnMotion( wxPoint( event.m_x, event.m_y ) );
-
-        SetHintCursor( HitTestWindow( event ) );
-        return;
-    }
-
-    wxPoint pos;
-    GetScrMousePos( event, pos );
-
-    if ( mCursorType == HITS_WND_TITLE )
-    {
-        int w,h;
-        GetSize( &w, &h );
-
-        SetSize( mInitialRect.x + pos.x - mDragOrigin.x,
-                 mInitialRect.y + pos.y - mDragOrigin.y,
-                 w,h, 0 );
-    }
-
-    else
-    {
-        wxPoint delta( pos.x - mDragOrigin.x, pos.y - mDragOrigin.y );
-
-        wxRect newRect;
-
-        wxSize minDim = GetMinimalWndDim();
-
-        CalcResizedRect( newRect, delta, minDim );
-
-        wxSize borderDim( ( mWndHorizGap + mClntHorizGap )*2,
-                          ( mWndVertGap  + mClntVertGap  )*2 + mTitleHeight );
-
-        wxSize preferred = GetPreferredSize( wxSize( newRect.width  - borderDim.x,
-                                             newRect.height - borderDim.y ) );
-
-        preferred.x += borderDim.x;
-        preferred.y += borderDim.y;
-
-        //CalcResizedRect( newRect, delta, preferred );
-
-        wxRect finalRect = newRect;
-
-        AdjustRectPos( newRect, preferred, finalRect );
-
-        if ( mRealTimeUpdatesOn )
-        {
-            SetSize( finalRect.x, finalRect.y,
-                     finalRect.width, finalRect.height, 0 );
-        }
-        else
-        {
-            DrawHintRect( mPrevHintRect );
-            DrawHintRect( finalRect );
-
-            ::wxLogTrace(wxT("wxToolWindow"),wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
-        }
-
-        mPrevHintRect = finalRect;
-    }
-}
-
-void wxToolWindow::OnLeftDown( wxMouseEvent& event )
-{
-    int result = HitTestWindow( event );
-
-    for( size_t i = 0; i != mButtons.Count(); ++i )
-    {
-        mButtons[i]->OnLeftDown( wxPoint( event.m_x, event.m_y ) );
-
-        if ( mButtons[i]->IsPressed() )
-            return; // button hitted,
-    }
-
-    if ( result >= HITS_WND_LEFT_EDGE || result == HITS_WND_TITLE )
-    {
-        GetScrMousePos( event, mDragOrigin );
-
-        /*
-        if ( mMouseCaptured `)
-        {
-            ReleaseMouse();
-            mMouseCaptured = false;
-        }*/
-
-        if ( result == HITS_WND_TITLE &&
-             HandleTitleClick( event ) )
-            return;
-
-        mResizeStarted = true;
-
-        int x,y;
-        GetPosition( &x, &y );
-
-        mInitialRect.x = x;
-        mInitialRect.y = y;
-
-        GetSize( &x, &y );
-        mInitialRect.width  = x;
-        mInitialRect.height = y;
-
-        mPrevHintRect = mInitialRect;
-
-        if ( mCursorType != HITS_WND_TITLE && !mRealTimeUpdatesOn )
-        {
-            mpScrDc = new wxScreenDC();
-
-            wxScreenDC::StartDrawingOnTop( (wxRect*)NULL );
-
-            DrawHintRect( mInitialRect );
-        }
-    }
-}
-
-void wxToolWindow::OnLeftUp( wxMouseEvent& event )
-{
-    for( size_t i = 0; i != mButtons.Count(); ++i )
-    {
-        mButtons[i]->OnLeftUp( wxPoint( event.m_x, event.m_y ) );
-
-        if ( mButtons[i]->WasClicked() )
-        {
-            OnMiniButtonClicked( i ); // notify derived classes
-            mButtons[i]->Reset();
-        }
-    }
-
-    if ( mResizeStarted )
-    {
-        mResizeStarted = false;
-
-        if ( mCursorType != HITS_WND_TITLE )
-        {
-            if ( !mRealTimeUpdatesOn )
-            {
-                DrawHintRect( mPrevHintRect );
-
-                wxScreenDC::EndDrawingOnTop();
-
-                delete mpScrDc;
-
-                mpScrDc = NULL;
-
-                SetSize( mPrevHintRect.x, mPrevHintRect.y,
-                         mPrevHintRect.width, mPrevHintRect.height, 0 );
-            }
-        }
-    }
-}
-
-void wxToolWindow::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-    if ( mpClientWnd )
-    {
-        int w,h;
-        GetSize( &w, &h );
-
-        int x = mWndHorizGap + mClntHorizGap;
-        int y = mWndVertGap  + mTitleHeight + mClntVertGap;
-
-        mpClientWnd->SetSize( x-1, y-1,
-                              w - 2*(mWndHorizGap + mClntHorizGap),
-                              h - y - mClntVertGap - mWndVertGap,
-                              0
-                            );
-    }
-
-    LayoutMiniButtons();
-}
-
-wxSize wxToolWindow::GetPreferredSize( const wxSize& given )
-{
-    return given;
-}
-
-void wxToolWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
-{
-    // nothing
-}
-
-/***** Implementation for class cbMiniButton *****/
-
-cbMiniButton::cbMiniButton()
-
-    : mVisible( true ),
-      mEnabled( true ),
-
-      mpLayout( NULL ),
-      mpPane  ( NULL ),
-      mpPlugin( NULL ),
-      mpWnd   ( NULL ),
-
-      mWasClicked( false ),
-      mDragStarted( false ),
-      mPressed( false )
-{}
-
-void cbMiniButton::SetPos( const wxPoint& pos )
-{
-    mPos = pos;
-}
-
-bool cbMiniButton::HitTest( const wxPoint& pos )
-{
-    if ( !mVisible ) return false;
-
-    return ( pos.x >= mPos.x && pos.y >= mPos.y &&
-             pos.x < mPos.x + BTN_BOX_WIDTH     &&
-             pos.y < mPos.y + BTN_BOX_HEIGHT );
-}
-
-void cbMiniButton::OnLeftDown( const wxPoint& pos )
-{
-    if ( !mVisible || mDragStarted ) return;
-
-    if ( HitTest( pos ) && mEnabled )
-    {
-        if ( mpPlugin )
-        {
-            mpLayout->CaptureEventsForPane( mpPane );
-            mpLayout->CaptureEventsForPlugin( mpPlugin );
-        }
-        else
-            mpWnd->CaptureMouse();
-
-        mDragStarted = true;
-        mPressed     = true;
-        mWasClicked  = false;
-
-        Refresh();
-    }
-}
-
-void cbMiniButton::OnLeftUp( const wxPoint& WXUNUSED(pos) )
-{
-    if ( !mVisible || !mDragStarted ) return;
-
-    if ( mpPlugin )
-    {
-        mpLayout->ReleaseEventsFromPane( mpPane );
-        mpLayout->ReleaseEventsFromPlugin( mpPlugin );
-    }
-    else
-        mpWnd->ReleaseMouse();
-
-    mWasClicked  = mPressed;
-    mDragStarted = false;
-
-    mPressed = false;
-    Refresh();
-}
-
-void cbMiniButton::OnMotion( const wxPoint& pos )
-{
-    if ( !mVisible ) return;
-
-    if ( mDragStarted )
-    {
-        mPressed = HitTest( pos );
-
-        Refresh();
-    }
-}
-
-void cbMiniButton::Refresh()
-{
-    if ( mpLayout )
-    {
-         wxClientDC dc( &mpLayout->GetParentFrame() );
-
-         Draw( dc );
-    }
-    else
-    {
-        wxWindowDC dc( mpWnd );
-
-        Draw( dc );
-    }
-}
-
-void cbMiniButton::Draw( wxDC& dc )
-{
-    if ( !mVisible ) return;
-
-    dc.SetPen( *wxTRANSPARENT_PEN );
-
-    dc.SetBrush( *wxLIGHT_GREY_BRUSH );
-
-    dc.DrawRectangle( mPos.x + 1, mPos.y + 1, BTN_BOX_WIDTH - 2, BTN_BOX_HEIGHT - 2 );
-
-    // "hard-code" metafile
-
-    if ( !mPressed )
-        dc.SetPen( *wxWHITE_PEN );
-    else
-        dc.SetPen( *wxBLACK_PEN );
-
-    dc.DrawLine( mPos.x, mPos.y, mPos.x + BTN_BOX_WIDTH, mPos.y );
-    dc.DrawLine( mPos.x, mPos.y, mPos.x, mPos.y + BTN_BOX_HEIGHT );
-
-    dc.SetPen( *wxGREY_PEN );
-
-    if ( !mPressed )
-    {
-        dc.DrawLine( mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2,
-                     mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT - 2 );
-
-        dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1,
-                     mPos.x + BTN_BOX_WIDTH - 2, mPos.y + BTN_BOX_HEIGHT - 1 );
-    }
-    else
-    {
-        dc.DrawLine( mPos.x + 1, mPos.y + 1,
-                     mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1 );
-
-        dc.DrawLine( mPos.x + 1, mPos.y + 1,
-                     mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2 );
-    }
-
-    if ( !mPressed )
-        dc.SetPen( *wxBLACK_PEN );
-    else
-        dc.SetPen( *wxWHITE_PEN );
-
-    dc.DrawLine( mPos.x, mPos.y + BTN_BOX_HEIGHT - 1,
-                 mPos.x + BTN_BOX_WIDTH, mPos.y + BTN_BOX_HEIGHT - 1 );
-
-    dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 1, mPos.y ,
-                 mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT );
-}
-
-bool cbMiniButton::WasClicked()
-{
-    return mWasClicked;
-}
-
-void cbMiniButton::Reset()
-{
-    mWasClicked = false;
-}
-
-/***** Implementation fro class cbCloseBox *****/
-
-void cbCloseBox::Draw( wxDC& dc )
-{
-    cbMiniButton::Draw( dc );
-
-    dc.SetPen( *wxBLACK_PEN );
-
-    int width = BTN_BOX_WIDTH - 7;
-
-    int xOfs = (mPressed) ? 4 : 3;
-    int yOfs = (mPressed) ? 4 : 3;
-
-    for( int i = 0; i != BTN_X_WEIGHT; ++i )
-    {
-        dc.DrawLine( mPos.x + xOfs + i,
-                     mPos.y + yOfs,
-                     mPos.x + xOfs + i + width,
-                     mPos.y + yOfs + width );
-
-        dc.DrawLine( mPos.x + xOfs + i + width - 1,
-                     mPos.y + yOfs,
-                     mPos.x + xOfs + i - 1,
-                     mPos.y + yOfs + width );
-    }
-}
-
-/***** Implementation fro class cbCollapseBox *****/
-
-inline static void my_swap( int& a, int& b )
-{
-    long tmp = a;
-    a = b;
-    b = tmp;
-}
-
-void cbCollapseBox::Draw( wxDC& dc )
-{
-    cbMiniButton::Draw( dc );
-
-    dc.SetPen( *wxTRANSPARENT_PEN );
-
-    wxPoint arr[3];
-
-    int yOfs  = (mPressed) ? 3 : 2;
-    int xOfs  = (mPressed) ? 5 : 4;
-    int width = BTN_BOX_WIDTH - 8;
-
-    // rotating/shifting triangle inside collapse box
-
-    arr[0].x = xOfs;
-    arr[0].y = yOfs-1;
-    arr[2].x = xOfs;
-    arr[2].y = BTN_BOX_HEIGHT - yOfs - 1;
-    arr[1].x = xOfs + width;
-    arr[1].y = (arr[2].y + arr[0].y)/2;
-
-    if ( !mIsAtLeft )
-    {
-        arr[0].x = BTN_BOX_WIDTH - arr[0].x;
-        arr[1].x = BTN_BOX_WIDTH - arr[1].x;
-        arr[2].x = BTN_BOX_WIDTH - arr[2].x;
-    }
-
-    if ( !mpPane->IsHorizontal() )
-    {
-        my_swap( arr[0].y, arr[0].x );
-        my_swap( arr[1].y, arr[1].x );
-        my_swap( arr[2].y, arr[2].x );
-
-        arr[0].x += 1;
-        arr[1].x += 1;
-        arr[2].x += 1;
-
-        //arr[1].y -= 1;
-    }
-
-    arr[0].x += mPos.x;
-    arr[0].y += mPos.y;
-    arr[1].x += mPos.x;
-    arr[1].y += mPos.y;
-    arr[2].x += mPos.x;
-    arr[2].y += mPos.y;
-
-    if ( !mEnabled ) dc.SetBrush( *wxGREY_BRUSH );
-    else dc.SetBrush( *wxBLACK_BRUSH );
-
-    dc.DrawPolygon( 3, arr );
-    dc.SetBrush( wxNullBrush );
-}
-
-/***** Implementation for class cbDockBoxBox *****/
-
-void cbDockBox::Draw( wxDC& dc )
-{
-    cbMiniButton::Draw( dc );
-
-    int width = BTN_BOX_WIDTH - 7;
-
-    int xOfs = (mPressed) ? 4 : 3;
-    int yOfs = (mPressed) ? 4 : 3;
-
-    dc.SetPen( *wxBLACK_PEN );
-    dc.SetBrush( *wxBLACK_BRUSH );
-
-    dc.DrawRectangle( mPos.x + xOfs, mPos.y + yOfs, width, width );
-
-    xOfs += 1;
-    yOfs += 1;
-
-    dc.SetBrush( *wxWHITE_BRUSH );
-
-    dc.DrawRectangle( mPos.x + xOfs, mPos.y + yOfs, width-2, width-2 );
-}
-
-/***** Implementation for class wxToolWindow *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbFloatedBarWindow, wxToolWindow )
-
-BEGIN_EVENT_TABLE( cbFloatedBarWindow, wxToolWindow )
-
-    EVT_LEFT_DCLICK( cbFloatedBarWindow::OnDblClick )
-
-END_EVENT_TABLE()
-
-cbFloatedBarWindow::cbFloatedBarWindow()
-
-    : mpBar( NULL )
-{
-    AddMiniButton( new cbCloseBox() );
-    AddMiniButton( new cbDockBox()  );
-}
-
-void cbFloatedBarWindow::SetBar( cbBarInfo* pBar )
-{
-    mpBar = pBar;
-}
-
-cbBarInfo* cbFloatedBarWindow::GetBar()
-{
-    return mpBar;
-}
-
-void cbFloatedBarWindow::SetLayout( wxFrameLayout* pLayout )
-{
-    mpLayout = pLayout;
-}
-
-void cbFloatedBarWindow::PositionFloatedWnd( int scrX,  int scrY,
-                                             int width, int height )
-{
-    wxSize minDim = GetMinimalWndDim();
-
-    SetSize( scrX - mWndHorizGap - mClntHorizGap,
-             scrY - mClntVertGap - mTitleHeight - mWndVertGap,
-             width + minDim.x, height + minDim.y, 0 );
-}
-
-wxSize cbFloatedBarWindow::GetPreferredSize( const wxSize& given )
-{
-    if ( mpBar->mDimInfo.GetDimHandler() )
-    {
-        cbBarDimHandlerBase* pHandler = mpBar->mDimInfo.GetDimHandler();
-
-        wxSize prefDim;
-
-        // int vtad = *((int*)pHandler);
-
-        pHandler->OnResizeBar( mpBar, given, prefDim );
-
-        return prefDim;
-    }
-    else
-    {
-        if ( mpBar->IsFixed() )
-            return mpBar->mDimInfo.mSizes[ wxCBAR_FLOATING ];
-        else
-            return given; // not-fixed bars are resized exactly the way user wants
-    }
-}
-
-void cbFloatedBarWindow::OnMiniButtonClicked( int btnIdx )
-{
-    // #1 - close mini-button
-    // #0 - dock mini-button
-
-    if ( btnIdx == 0 )
-    {
-        mpBar->mAlignment = -1; // sepcial "marking" for hidden bars out of floated state
-        mpLayout->SetBarState( mpBar, wxCBAR_HIDDEN, true );
-    }
-    else
-        mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, true );
-}
-
-bool cbFloatedBarWindow::HandleTitleClick( wxMouseEvent& event )
-{
-    ReleaseMouse();
-    mMouseCaptured = false;
-
-    wxPoint scrPos;
-    GetScrMousePos( event, scrPos );
-
-    int msX = scrPos.x,
-        msY = scrPos.y;
-
-    mpLayout->GetParentFrame().ScreenToClient( &msX, &msY );
-
-    int x,y;
-    GetPosition(&x,&y);
-    int w,h;
-    GetSize( &w, &h );
-
-    wxSize minDim = GetMinimalWndDim();
-
-    w -= minDim.x;
-    h -= minDim.y;
-
-    x += mWndHorizGap + mClntHorizGap;
-    y += mWndVertGap  + mTitleHeight + mClntVertGap;
-
-    mpLayout->GetParentFrame().ScreenToClient( &x, &y );
-
-    wxRect& bounds = mpBar->mDimInfo.mBounds[ wxCBAR_FLOATING ];
-
-    bounds.x = x;
-    bounds.y = y;
-    bounds.width  = w;
-    bounds.height = h;
-
-    cbStartBarDraggingEvent dragEvt( mpBar, wxPoint(msX,msY),
-                                     mpLayout->GetPanesArray()[FL_ALIGN_TOP] );
-
-    mpLayout->FirePluginEvent( dragEvt );
-
-    return true;
-}
-
-void cbFloatedBarWindow::OnDblClick( wxMouseEvent& WXUNUSED(event) )
-{
-    mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, true );
-
-    //wxMessageBox("toolWnd - dblClick!");
-}
-
diff --git a/contrib/src/fl/updatesmgr.cpp b/contrib/src/fl/updatesmgr.cpp
deleted file mode 100644
index 58e9244d26..0000000000
--- a/contrib/src/fl/updatesmgr.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        updatesmgr.cpp
-// Purpose:     cbSimpleUpdatesMgr implementation.
-// Author:      Aleksandras Gluchovas
-// Modified by:
-// Created:     19/10/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas 
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/fl/updatesmgr.h"
-
-// helper function
-
-static inline bool rect_hits_rect( const wxRect& r1, const wxRect& r2 )
-{
-    if ( ( r2.x >= r1.x && r2.x <= r1.x + r1.width ) ||
-         ( r1.x >= r2.x && r1.x <= r2.x + r2.width ) )
-
-        if ( ( r2.y >= r1.y && r2.y <= r1.y + r1.height ) ||
-             ( r1.y >= r2.y && r1.y <= r2.y + r2.height ) )
-             
-            return 1;
-
-    return 0;
-}
-
-/***** Implementation for class cbSimpleUpdatesMgr *****/
-
-IMPLEMENT_DYNAMIC_CLASS( cbSimpleUpdatesMgr, cbUpdatesManagerBase )
-
-cbSimpleUpdatesMgr::cbSimpleUpdatesMgr( wxFrameLayout* pPanel )
-    : cbUpdatesManagerBase( pPanel )
-{}
-
-bool cbSimpleUpdatesMgr::WasChanged( cbUpdateMgrData& data, wxRect& currentBounds )
-{
-    return (   data.IsDirty() ||
-
-             ( data.mPrevBounds.x      != currentBounds.x     ||
-               data.mPrevBounds.y      != currentBounds.y     ||
-               data.mPrevBounds.width  != currentBounds.width ||
-               data.mPrevBounds.height != currentBounds.height  )
-           );
-}
-
-void cbSimpleUpdatesMgr::OnStartChanges()
-{
-    // memorize states of ALL items in the layout -
-    // this is quite excessive, but OK for the simple 
-    // implementation of updates manager
-
-    mpLayout->GetPrevClientRect() = mpLayout->GetClientRect();
-
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    for( int n = 0; n != MAX_PANES; ++n )
-    {
-        cbDockPane& pane = *panes[n];
-        // store pane state
-        pane.mUMgrData.StoreItemState( pane.mBoundsInParent );
-        pane.mUMgrData.SetDirty( false );
-
-        for( size_t i = 0; i != pane.GetRowList().Count(); ++i )
-        {
-            cbRowInfo& row = *pane.GetRowList()[ i ];
-
-            // store row state
-            row.mUMgrData.StoreItemState( row.mBoundsInParent );
-            row.mUMgrData.SetDirty( false );
-
-            for( size_t k = 0; k != row.mBars.Count(); ++k )
-            {
-                cbBarInfo& bar = *row.mBars[ k ];
-
-                // store bar state
-                bar.mUMgrData.StoreItemState( bar.mBoundsInParent );
-                bar.mUMgrData.SetDirty( false );
-            }
-        }
-    }
-}
-
-void cbSimpleUpdatesMgr::OnFinishChanges()
-{
-    // nothing here, could be overriden by more sophisticated updates-managers
-}
-
-void cbSimpleUpdatesMgr::OnRowWillChange( cbRowInfo* WXUNUSED(pRow), cbDockPane* WXUNUSED(pInPane) )
-{
-    // -/-
-}
-
-void cbSimpleUpdatesMgr::OnBarWillChange( cbBarInfo* WXUNUSED(pBar), 
-                                          cbRowInfo* WXUNUSED(pInRow), cbDockPane* WXUNUSED(pInPane) )
-{
-    // -/-
-}
-
-void cbSimpleUpdatesMgr::OnPaneMarginsWillChange( cbDockPane* WXUNUSED(pPane) )
-{
-    // -/-
-}
-
-void cbSimpleUpdatesMgr::OnPaneWillChange( cbDockPane* WXUNUSED(pPane) )
-{
-    // -/-
-}
-
-void cbSimpleUpdatesMgr::UpdateNow()
-{
-    cbDockPane** panes = mpLayout->GetPanesArray();
-
-    wxRect& r1 = mpLayout->GetClientRect();
-    wxRect& r2 = mpLayout->GetPrevClientRect();
-
-    // detect changes in client window's area
-
-    bool clientWindowChanged = ( r1.x      != r2.x     ||
-                                 r1.y      != r2.y     ||
-                                 r1.width  != r2.width ||
-                                 r1.height != r2.height );
-
-    // step #1 - detect changes in each row of each pane,
-    //           and repaint decorations around changed windows
-
-    wxList mBarsToRefresh;
-    wxList mPanesList;
-
-    for( int n = 0; n != MAX_PANES; ++n )
-    {
-        cbDockPane& pane = *(panes[n]);
-
-        bool paneChanged = WasChanged( pane.mUMgrData, pane.mBoundsInParent );
-
-        if ( paneChanged )
-        {
-            wxClientDC dc( &mpLayout->GetParentFrame() );
-            pane.PaintPaneBackground( dc );
-        }
-
-        wxRect realBounds;
-
-        for( size_t i = 0; i != pane.GetRowList().Count(); ++i )
-        {
-            cbRowInfo& row = *pane.GetRowList()[ i ];
-
-            wxDC* pDc = NULL;
-
-            bool rowChanged = false;
-
-            // FIXME:: the below should not be fixed
-            cbBarInfo* barsToRepaint[256];
-
-            // number of bars, that were changed in the current row
-            int nBars = 0; 
-
-            if ( WasChanged( row.mUMgrData, row.mBoundsInParent ) )
-            
-                rowChanged = true;
-            else
-                for( size_t k = 0; k != row.mBars.Count(); ++k )
-
-                    if ( WasChanged( row.mBars[k]->mUMgrData, 
-                         row.mBars[k]->mBoundsInParent ) 
-                       )
-                    
-                        barsToRepaint[nBars++] = row.mBars[k];
-
-            if ( nBars || rowChanged )
-            {
-                realBounds = row.mBoundsInParent;
-
-                // include 1-pixel thick shades around the row
-                realBounds.x -= 1;
-                realBounds.y -= 1;
-                realBounds.width  += 2;
-                realBounds.height += 2;
-
-                pDc = pane.StartDrawInArea( realBounds );
-            }
-
-            if ( rowChanged )
-            {
-                // postphone the resizing and refreshing the changed
-                // bar windows
-
-                for( size_t k = 0; k != row.mBars.Count(); ++k )
-                {
-                    mBarsToRefresh.Append( (wxObject*)row.mBars[k] );
-                    mPanesList.Append( &pane );
-                }
-
-                // draw only their decorations now
-
-                pane.PaintRow( &row, *pDc );
-            }
-            else
-            if ( nBars != 0 )
-            {
-                for( int i = 0; i != nBars; ++i )
-                {
-                    // postphone the resizement and refreshing the changed
-                    // bar windows
-
-                    mBarsToRefresh.Append( (wxObject*)barsToRepaint[i] );
-                    mPanesList.Append( &pane );
-                }
-
-                // redraw decorations of entire row, regardless of how much
-                // of the bars were changed
-                pane.PaintRow( &row, *pDc );
-            }
-
-            if ( pDc )
-        
-                pane.FinishDrawInArea( realBounds );
-        } // end of while
-
-        if ( paneChanged )
-        {
-            wxClientDC dc( &mpLayout->GetParentFrame() );
-            pane.PaintPaneDecorations( dc );
-        }
-
-    } // end of for
-
-    if ( clientWindowChanged )
-    {
-        mpLayout->PositionClientWindow();
-        // ptr to client-window object is "marked" as 0
-    }
-
-    // step #2 - do ordered refreshing and resizing of bar window objects now
-
-    wxNode* pNode     = mBarsToRefresh.GetFirst();
-    wxNode* pPaneNode = mPanesList.GetFirst();
-
-    while( pNode )
-    {
-        cbBarInfo*  pBar  = (cbBarInfo*) pNode->GetData();
-        cbDockPane* pPane = (cbDockPane*)pPaneNode->GetData();
-
-        pPane->SizeBar( pBar );
-
-        pNode     = pNode->GetNext();
-        pPaneNode = pPaneNode->GetNext();
-    }
-
-    pNode = mBarsToRefresh.GetFirst();
-
-    while( pNode )
-    {
-        cbBarInfo* pBar = (cbBarInfo*)pNode->GetData();
-
-        if ( pBar->mpBarWnd ) 
-        {
-            pBar->mpBarWnd->Refresh();
-
-            // FIXME::
-            //info.mpBarWnd->Show(false);
-            //info.mpBarWnd->Show(true);
-        }
-
-        pNode  = pNode->GetNext();
-    }
-
-    if ( clientWindowChanged )
-    {
-        // FIXME:: excessive?
-
-        mpLayout->GetFrameClient()->Refresh();
-    }
-}
-
-
diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in
deleted file mode 100644
index 40581ad27f..0000000000
--- a/contrib/src/foldbar/Makefile.in
+++ /dev/null
@@ -1,307 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-FOLDBARDLL_CXXFLAGS = $(__foldbardll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_FOLDBAR $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARDLL_OBJECTS =  \
-	$(__foldbardll___win32rc) \
-	foldbardll_captionbar.o \
-	foldbardll_foldpanelbar.o \
-	foldbardll_foldpanelitem.o
-FOLDBARDLL_ODEP =  $(___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname)
-FOLDBARLIB_CXXFLAGS = $(__foldbarlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-FOLDBARLIB_OBJECTS =  \
-	foldbarlib_captionbar.o \
-	foldbarlib_foldpanelbar.o \
-	foldbarlib_foldpanelitem.o
-FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___foldbardll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_SHARED_1@__foldbardll___depname = $(COND_SHARED_1___foldbardll___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_foldbardll___depname = install_foldbardll
-@COND_SHARED_1@__uninstall_foldbardll___depname = uninstall_foldbardll
-COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__foldbardll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd)
-COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
-COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__foldbardll___importlib = $(COND_WINDOWS_IMPLIB_1___foldbardll___importlib)
-@COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
-@COND_ICC_PCH_1@__foldbardll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_foldbardll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_foldbardll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___foldbardll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__foldbardll___soname_flags = $(COND_USE_SOVERLINUX_1___foldbardll___soname_flags)
-COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__foldbardll___soname_flags = $(COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
-	-f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__foldbardll___win32rc = foldbardll_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___foldbarlib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__foldbarlib___depname = $(COND_SHARED_0___foldbarlib___depname)
-@COND_SHARED_0@__install_foldbarlib___depname = install_foldbarlib
-@COND_SHARED_0@__uninstall_foldbarlib___depname = uninstall_foldbarlib
-@COND_GCC_PCH_1@__foldbarlib_PCH_INC = -I.pch/wxprec_foldbarlib
-@COND_ICC_PCH_1@__foldbarlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_foldbarlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_foldbarlib/wx/wxprec.h.gch
-@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: $(__foldbardll___depname) $(__foldbarlib___depname)
-
-install: all $(__install_foldbardll___depname) $(__install_foldbarlib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.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_foldbardll___depname) $(__uninstall_foldbarlib___depname)
-	for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.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)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(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)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS) $(__foldbardll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___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@	$(__foldbardll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_foldbardll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_foldbardll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_foldbardll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(FOLDBARLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_foldbarlib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_foldbarlib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
-
-foldbardll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FOLDBARDLL_ODEP)
-	$(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)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/captionbar.cpp
-
-foldbardll_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
-
-foldbardll_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARDLL_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
-
-foldbarlib_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/captionbar.cpp
-
-foldbarlib_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
-
-foldbarlib_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARLIB_ODEP)
-	$(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_foldbardll uninstall_foldbardll install_foldbarlib uninstall_foldbarlib
diff --git a/contrib/src/foldbar/captionbar.cpp b/contrib/src/foldbar/captionbar.cpp
deleted file mode 100644
index bc1a6eb8e1..0000000000
--- a/contrib/src/foldbar/captionbar.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        captionbar.cpp
-// Purpose:     wxCaptionBar class belonging to the wxFoldPanel (but can be used independent)
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     18/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/foldbar/foldpanelbar.h"
-
-/*
- * wxCaptionBar
- */
-
-BEGIN_EVENT_TABLE(wxCaptionBar, wxWindow)
-    EVT_PAINT(wxCaptionBar::OnPaint)
-    EVT_CHAR(wxCaptionBar::OnChar)
-    EVT_MOUSE_EVENTS(wxCaptionBar::OnMouseEvent)
-    EVT_SIZE(wxCaptionBar::OnSize)
-END_EVENT_TABLE()
-
-wxCaptionBar::wxCaptionBar(wxWindow* parent, const wxString &caption, wxImageList *images, wxWindowID id,
-                           const wxCaptionBarStyle &cbstyle, const wxPoint& pos, const wxSize& size, long style)
-    : wxWindow(parent, id, pos, size, style)
-    , m_caption(caption)
-    , m_foldIcons(images)
-    , m_rightIndent(wxFPB_BMP_RIGHTSPACE)
-    , m_iconWidth(16)
-    , m_iconHeight(16)
-    , m_collapsed(false)
-{
-    // do initialisy thingy stuff
-
-    ApplyCaptionStyle(cbstyle, true);
-
-    // set initial size
-    if(m_foldIcons)
-    {
-        wxASSERT(m_foldIcons->GetImageCount() > 1);
-        m_foldIcons->GetSize(0, m_iconWidth, m_iconHeight);
-    }
-}
-
-wxCaptionBar::~wxCaptionBar()
-{
-
-}
-
-void wxCaptionBar::ApplyCaptionStyle(const wxCaptionBarStyle &cbstyle, bool applyDefault)
-{
-    wxASSERT(GetParent());
-
-    wxCaptionBarStyle newstyle = cbstyle;
-
-    // set defaults in newly created style copy if needed
-    if(applyDefault)
-    {
-        // get first colour from style or make it default
-        if(!newstyle.FirstColourUsed())
-            newstyle.SetFirstColour(*wxWHITE);
-
-        // get second colour from style or make it default
-        if(!newstyle.SecondColourUsed())
-        {
-            // make the second colour slightly darker then the background
-            wxColour col = GetParent()->GetBackgroundColour();
-            col.Set((unsigned char)((col.Red() >> 1) + 20),
-                    (unsigned char)((col.Green() >> 1) + 20),
-                    (unsigned char)((col.Blue() >> 1) + 20));
-            newstyle.SetSecondColour(col);
-        }
-
-        // get text colour
-        if(!newstyle.CaptionColourUsed())
-            newstyle.SetCaptionColour(*wxBLACK);
-
-        // get font colour
-        if(!newstyle.CaptionFontUsed())
-            newstyle.SetCaptionFont(GetParent()->GetFont());
-
-        // apply caption style
-        if(!newstyle.CaptionStyleUsed())
-            newstyle.SetCaptionStyle(wxCAPTIONBAR_GRADIENT_V);
-    }
-
-    // apply the style
-    m_captionStyle = newstyle;
-}
-
-void wxCaptionBar::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    wxRect wndRect = GetRect();
-    bool vertical = IsVertical();
-
-    // TODO: Maybe first a memory DC should draw all, and then paint it on the
-    // caption. This way a flickering arrow during resize is not visible
-
-    // draw basics
-
-    FillCaptionBackground(dc);
-
-    dc.SetFont(m_captionStyle.GetCaptionFont());
-    if(vertical)
-        dc.DrawText(m_caption, 4, (wxFPB_EXTRA_Y / 2));
-    else
-        dc.DrawRotatedText(m_caption, (wxFPB_EXTRA_Y / 2) , wndRect.GetBottom() - 4 , 90 );
-
-    // draw small icon, either collapsed or expanded
-    // based on the state of the bar. If we have
-    // any bmp's
-
-    if(m_foldIcons)
-    {
-        wxCHECK2(m_foldIcons->GetImageCount() > 1, return);
-
-        int index = 0;
-        if(m_collapsed)
-            index = 1;
-
-        if(vertical)
-            m_foldIcons->Draw(index,
-                              dc,
-                              wndRect.GetRight() - m_iconWidth - m_rightIndent,
-                              (wndRect.GetHeight() - m_iconHeight) / 2,
-                              wxIMAGELIST_DRAW_TRANSPARENT);
-        else
-            m_foldIcons->Draw(index,
-                              dc,
-                              (wndRect.GetWidth() - m_iconWidth) / 2,
-                              m_rightIndent,
-                              wxIMAGELIST_DRAW_TRANSPARENT);
-    }
-}
-
-void wxCaptionBar::FillCaptionBackground(wxPaintDC &dc)
-{
-    // dispatch right style for caption drawing
-
-    switch(m_captionStyle.GetCaptionStyle())
-    {
-    case wxCAPTIONBAR_GRADIENT_V:
-        if (IsVertical())
-            DrawVerticalGradient(dc, GetRect());
-        else
-            DrawHorizontalGradient(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_GRADIENT_H:
-        if (IsVertical())
-            DrawHorizontalGradient(dc, GetRect());
-        else
-            DrawVerticalGradient(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_SINGLE:
-        DrawSingleColour(dc, GetRect());
-        break;
-    case wxCAPTIONBAR_RECTANGLE:
-    case wxCAPTIONBAR_FILLED_RECTANGLE:
-        DrawSingleRectangle(dc, GetRect());
-        break;
-    default:
-        break;
-    }
-}
-
-void wxCaptionBar::OnMouseEvent(wxMouseEvent& event)
-{
-    // if clicked on the arrow (single) or double on the caption
-    // we change state and an event must be fired to let this
-    // panel collapse or expand
-
-    bool send_event = false;
-
-    if (event.LeftDown() && m_foldIcons)
-    {
-        wxPoint pt(event.GetPosition());
-        wxRect rect = GetRect();
-        bool vertical = IsVertical();
-
-        if((vertical && pt.x > (rect.GetWidth() - m_iconWidth - m_rightIndent))||
-           (!vertical && pt.y < m_iconHeight + m_rightIndent))
-            send_event = true;
-    }
-    else if(event.LeftDClick())
-        send_event = true;
-
-    // send the collapse, expand event to the parent
-
-    if(send_event)
-    {
-        wxCaptionBarEvent event(wxEVT_CAPTIONBAR);
-        event.SetCaptionBar(this);
-
-        ::wxPostEvent(this, event);
-
-    }
-}
-
-void wxCaptionBar::OnChar(wxKeyEvent &event)
-{
-    // TODO: Anything here?
-
-    event.Skip();
-}
-
-wxSize wxCaptionBar::DoGetBestSize() const
-{
-    int x,y;
-
-    if(IsVertical())
-        GetTextExtent(m_caption, &x, &y);
-    else
-        GetTextExtent(m_caption, &y, &x);
-
-    if(x < m_iconWidth)
-        x = m_iconWidth;
-
-    if(y < m_iconHeight)
-        y = m_iconHeight;
-
-    // TODO: The extra wxFPB_EXTRA_X constants should be adjustable as well
-
-    return wxSize(x + wxFPB_EXTRA_X, y + wxFPB_EXTRA_Y);
-}
-
-
-void wxCaptionBar::DrawVerticalGradient(wxDC &dc, const wxRect &rect )
-{
-    // gradient fill from colour 1 to colour 2 with top to bottom
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    int size = rect.height;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-
-    // calculate gradient coefficients
-    wxColour col2 = m_captionStyle.GetSecondColour(),
-             col1 = m_captionStyle.GetFirstColour();
-
-    double rstep = double((col2.Red() -   col1.Red())) / double(size), rf = 0,
-           gstep = double((col2.Green() - col1.Green())) / double(size), gf = 0,
-           bstep = double((col2.Blue() -  col1.Blue())) / double(size), bf = 0;
-
-    wxColour currCol;
-    for(int y = rect.y; y < rect.y + size; y++)
-    {
-        currCol.Set(
-            (unsigned char)(col1.Red() + rf),
-            (unsigned char)(col1.Green() + gf),
-            (unsigned char)(col1.Blue() + bf)
-        );
-        dc.SetBrush( wxBrush( currCol, wxSOLID ) );
-        dc.DrawRectangle( rect.x, rect.y + (y - rect.y), rect.width, size );
-        //currCol.Set(currCol.Red() + rstep, currCol.Green() + gstep, currCol.Blue() + bstep);
-        rf += rstep; gf += gstep; bf += bstep;
-    }
-}
-
-void wxCaptionBar::DrawHorizontalGradient(wxDC &dc, const wxRect &rect )
-{
-    // gradient fill from colour 1 to colour 2 with left to right
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    int size = rect.width;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    // calculate gradient coefficients
-    wxColour col2 = m_captionStyle.GetSecondColour(),
-             col1 = m_captionStyle.GetFirstColour();
-
-    double rstep = double((col2.Red() -   col1.Red())) / double(size), rf = 0,
-           gstep = double((col2.Green() - col1.Green())) / double(size), gf = 0,
-           bstep = double((col2.Blue() -  col1.Blue())) / double(size), bf = 0;
-
-    wxColour currCol;
-    for(int x = rect.x; x < rect.x + size; x++)
-    {
-        currCol.Set(
-            (unsigned char)(col1.Red() + rf),
-            (unsigned char)(col1.Green() + gf),
-            (unsigned char)(col1.Blue() + bf)
-        );
-        dc.SetBrush( wxBrush( currCol, wxSOLID ) );
-        dc.DrawRectangle( rect.x + (x - rect.x), rect.y, 1, rect.height );
-        rf += rstep; gf += gstep; bf += bstep;
-    }
-}
-
-void wxCaptionBar::DrawSingleColour(wxDC &dc, const wxRect &rect )
-{
-    // single colour fill. This is the most easy one to find
-
-    if(rect.height < 1 || rect.width < 1)
-        return;
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    // draw simple rectangle
-    dc.SetBrush( wxBrush( m_captionStyle.GetFirstColour(), wxSOLID ) );
-    dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height );
-}
-
-void wxCaptionBar::DrawSingleRectangle(wxDC &dc, const wxRect &rect )
-{
-    wxASSERT(GetParent());
-
-    // single colour fill. This is the most easy one to find
-
-    if(rect.height < 2 || rect.width < 1)
-        return;
-
-    // single frame, set up internal fill colour
-
-    wxBrush br;
-    br.SetStyle(wxSOLID);
-
-    if(m_captionStyle.GetCaptionStyle() == wxCAPTIONBAR_RECTANGLE)
-        br.SetColour(GetParent()->GetBackgroundColour());
-    else
-        br.SetColour(m_captionStyle.GetFirstColour());
-
-    // setup the pen frame
-
-    wxPen pen(m_captionStyle.GetSecondColour());
-    dc.SetPen(pen);
-
-    dc.SetBrush( br );
-    dc.DrawRectangle( rect.x, rect.y, rect.width, rect.height - 1);
-
-    wxPen bgpen(GetParent()->GetBackgroundColour());
-    dc.SetPen(bgpen);
-    dc.DrawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1);
-}
-
-
-void wxCaptionBar::OnSize(wxSizeEvent &event)
-{
-    wxSize size = event.GetSize();
-
-    if(m_foldIcons)
-    {
-        // What I am doing here is simply invalidating the part of the window exposed. So when I
-        // make a rect with as width the newly exposed part, and the x,y of the old window size origin,
-        // I don't need a bitmap calulation in it, or do I ? The bitmap needs redrawing anyway. Leave it
-        // like this until I figured it out
-
-        // set rect to redraw as old bitmap area which is entitled to redraw
-
-        wxRect rect(size.GetWidth() - m_iconWidth - m_rightIndent, 0, m_iconWidth + m_rightIndent,
-                    m_iconWidth + m_rightIndent);
-
-        // adjust rectangle when more is slided so we need to redraw all
-        // the old stuff but not all (ugly flickering)
-
-        int diffX = size.GetWidth() - m_oldSize.GetWidth();
-        if(diffX > 1)
-        {
-            // adjust the rect with all the crap to redraw
-
-            rect.SetWidth(rect.GetWidth() + diffX + 10);
-            rect.SetX(rect.GetX() - diffX - 10);
-        }
-
-        RefreshRect(rect);
-    }
-    else
-    {
-        wxRect rect = GetRect();
-        RefreshRect(rect);
-    }
-
-    m_oldSize = size;
-}
-
-void wxCaptionBar::RedrawIconBitmap()
-{
-    if(m_foldIcons)
-    {
-        // invalidate the bitmap area and force a redraw
-
-        wxRect rect = GetRect();
-
-        rect.SetX(rect.GetWidth() - m_iconWidth - m_rightIndent);
-        rect.SetWidth(m_iconWidth + m_rightIndent);
-        RefreshRect(rect);
-    }
-}
-
-bool wxCaptionBar::IsVertical() const
-{
-    // parent of wxCaptionBar is wxFoldPanelItem
-    // default is vertical
-    wxFoldPanelItem *bar = wxDynamicCast(GetParent(), wxFoldPanelItem);
-    wxCHECK_MSG( bar, true, _T("wrong parent") );
-    return bar->IsVertical();
-}
-
-/*
- * wxCaptionBarEvent
- */
-
-DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-
-wxCaptionBarEvent::wxCaptionBarEvent(const wxCaptionBarEvent &event)
-    : wxCommandEvent(event)
-{
-    m_captionBar = event.m_captionBar;
-}
-
-//DEFINE_EVENT_TYPE(wxEVT_CAPTIONBAR)
-//IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCaptionBarEvent, wxCommandEvent)
diff --git a/contrib/src/foldbar/foldpanelbar.cpp b/contrib/src/foldbar/foldpanelbar.cpp
deleted file mode 100644
index 17ce202366..0000000000
--- a/contrib/src/foldbar/foldpanelbar.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelbar.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/foldbar/foldpanelbar.h"
-#include "icon_collapsed.xpm"
-#include "icon_expanded.xpm"
-#include "icon_theresmore.xpm"
-
-//----------------------------------------------------------------------------
-// wxFoldPanelBar
-//----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS( wxFoldPanelBar, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelBar,wxPanel)
-    EVT_SIZE(wxFoldPanelBar::OnSizePanel)
-    //EVT_PAINT(wxFoldPanelBar::OnPaint)
-    EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelBar::OnPressCaption)
-END_EVENT_TABLE()
-
-wxFoldPanelBar::wxFoldPanelBar()
-    : wxPanel()
-    , m_foldPanel(NULL)
-    , m_bottomPanel(NULL)
-    , m_controlCreated(false)
-{
-
-}
-
-wxFoldPanelBar::wxFoldPanelBar( wxWindow *parent, wxWindowID id, const wxPoint &position,
-                                const wxSize& size, long style, long extraStyle)
-    : wxPanel()
-    , m_foldPanel(NULL)
-    , m_bottomPanel(NULL)
-    , m_controlCreated(false)
-{
-    Create( parent, id, position, size, style, extraStyle);
-}
-
-void wxFoldPanelBar::Create( wxWindow *parent, wxWindowID id, const wxPoint &position,
-                             const wxSize& size, long style, long extraStyle )
-{
-
-    m_extraStyle = extraStyle;
-
-    // make sure there is any orientation
-    if ( ( style & wxFPB_HORIZONTAL ) != wxFPB_HORIZONTAL )
-        style |= wxFPB_VERTICAL;
-
-    // create the panel (duh!). This causes a size event, which we are going
-    // to skip when we are not initialised
-
-    wxPanel::Create(parent, id, position, size, style);
-
-    // the fold panel area
-
-    m_foldPanel = new wxPanel(this, wxID_ANY, position, size, wxNO_BORDER|wxTAB_TRAVERSAL);
-
-    // the extra area for some icons / context menu etc
-
-#if 0
-    m_bottomPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22), wxNO_BORDER|wxTAB_TRAVERSAL);
-    m_bottomPanel->SetBackgroundColour(*wxWHITE);
-#endif
-
-    // create the fold icons to be used in the captions
-
-    m_images = new wxImageList(16, 16);
-
-    wxBitmap *bmp = new wxBitmap(icon_expanded);
-    m_images->Add(*bmp);
-    delete bmp;
-
-    bmp = new wxBitmap(icon_collapsed);
-    m_images->Add(*bmp);
-    delete bmp;
-
-    m_moreBmp = new wxBitmap(icon_theresmore);
-
-    // do this as last, to check if create is already called
-
-    m_controlCreated = true;
-}
-
-wxFoldPanelBar::~wxFoldPanelBar()
-{
-    delete m_images;
-    delete m_moreBmp;
-}
-
-wxFoldPanel wxFoldPanelBar::AddFoldPanel(const wxString &caption, bool collapsedInitially, const wxCaptionBarStyle &style)
-{
-    wxASSERT(m_controlCreated);
-
-    // create a fold panel item, which is first only the caption.
-    // the user can now add a panel area which will be folded in
-    // when pressed.
-
-    wxFoldPanelItem *item = new wxFoldPanelItem(m_foldPanel, caption, m_images, collapsedInitially, style);
-
-    // look at the last added one and reposition this one
-    int pos = 0;
-    if(m_panels.GetCount() > 0)
-        pos = m_panels.Last()->GetItemPos() + m_panels.Last()->GetPanelLength();
-
-    item->Reposition(pos);
-    m_panels.Add(item);
-
-    //return wxFoldPanel(item);
-    return wxFoldPanel(item);
-}
-
-int wxFoldPanelBar::AddFoldPanelWindow(const wxFoldPanel &panel, wxWindow *window, int flags, int ySpacing, int leftSpacing,
-                                       int rightSpacing)
-{
-    wxCHECK(panel.IsOk(), -1);
-    panel.GetItem()->AddWindow(window, flags, ySpacing, leftSpacing, rightSpacing);
-
-    // TODO: Take old and new height, and if difference, reposition all the lower panels
-    // this is because the user can add new wxWindow controls somewhere in between
-    // when other panels are already present.
-
-    return 0;
-}
-
-int wxFoldPanelBar::AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color, int ySpacing, int leftSpacing,
-                                          int rightSpacing)
-{
-    wxCHECK(panel.IsOk(), -1);
-    panel.GetItem()->AddSeparator(color, ySpacing, leftSpacing, rightSpacing);
-
-    return 0;
-}
-
-void wxFoldPanelBar::OnSizePanel(wxSizeEvent &event)
-{
-    // skip all stuff when we are not initialised yet
-
-    if(!m_controlCreated)
-    {
-        event.Skip();
-        return;
-    }
-
-    // now size the fold panel area and the
-    // lower bar in such a way that the bar is always
-    // visible
-
-    wxRect foldrect = GetRect();
-
-    // fold panel itself. If too little space,
-    // don't show it
-
-#if 0
-    if(foldrect.GetHeight() < 23)
-        foldrect.SetHeight(0);
-    else
-        foldrect.SetHeight(foldrect.GetHeight() - 22);
-#endif
-
-    foldrect.SetX(0);
-    foldrect.SetY(0);
-    m_foldPanel->SetSize(foldrect);
-
-    if(m_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
-    {
-        wxRect rect = RepositionCollapsedToBottom();
-        bool vertical = IsVertical();
-        if((vertical && rect.GetHeight() > 0) || (!vertical && rect.GetWidth() > 0))
-            RefreshRect(rect);
-    }
-
-    // TODO: A smart way to check wether the old - new width of the
-    // panel changed, if so no need to resize the fold panel items
-
-    RedisplayFoldPanelItems();
-
-    // tool panel for icons and other stuff
-
-#if 0
-    wxRect bottomrect = GetRect();
-    if(bottomrect.GetHeight() < 22)
-        bottomrect.SetY(0);
-    else
-        bottomrect.SetY(bottomrect.GetHeight() - 22);
-
-    bottomrect.SetHeight(22);
-    bottomrect.SetX(0);
-    m_bottomPanel->SetSize(bottomrect);
-
-    // TODO: redraw the bitmap properly
-    // use the captionbar algorithm for that
-
-    m_bottomPanel->Refresh();
-#endif
-}
-
-void wxFoldPanelBar::OnPaint(wxPaintEvent &event)
-{
-    if(!m_controlCreated)
-        return;
-#if 0
-    // paint the bottom panel only, where the
-    // arrow is shown when there is more to show the user
-    // just as informative icon
-
-    wxPaintDC dc(m_bottomPanel);
-
-    wxSize size = m_bottomPanel->GetSize();
-    int offset = (size.GetHeight() - m_moreBmp->GetHeight()) / 2;
-
-    dc.DrawBitmap(*m_moreBmp, size.GetWidth() - m_moreBmp->GetWidth() - 2, offset, true);
-#endif
-
-    event.Skip();
-}
-
-void wxFoldPanelBar::OnPressCaption(wxCaptionBarEvent &event)
-{
-    // act upon the folding or expanding status of the bar
-    // to expand or collapse the panel(s)
-
-    if(event.GetFoldStatus())
-        Collapse(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
-    else
-        Expand(wxFoldPanel((wxFoldPanelItem *)event.GetTag()));
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(wxFoldPanelItem *item)
-{
-    wxASSERT(item);
-
-    int i = m_panels.Index(item);
-    if(i != wxNOT_FOUND)
-        RefreshPanelsFrom(i);
-}
-
-void wxFoldPanelBar::RefreshPanelsFrom(size_t i)
-{
-    Freeze();
-
-    // if collapse to bottom is on, the panels that are not expanded
-    // should be drawn at the bottom. All panels that are expanded
-    // are drawn on top. The last expanded panel gets all the extra space
-
-    if(m_extraStyle & wxFPB_COLLAPSE_TO_BOTTOM)
-    {
-        int offset = 0;
-
-        for(size_t j = 0; j < m_panels.GetCount(); j++)
-        {
-            if(m_panels.Item(j)->IsExpanded())
-                offset += m_panels.Item(j)->Reposition(offset);
-        }
-
-        // put all non collapsed panels at the bottom where there is space, else
-        // put them right behind the expanded ones
-
-        RepositionCollapsedToBottom();
-    }
-    else
-    {
-        int pos = m_panels.Item(i)->GetItemPos() + m_panels.Item(i)->GetPanelLength();
-        for(i++; i < m_panels.GetCount(); i++)
-            pos += m_panels.Item(i)->Reposition(pos);
-    }
-    Thaw();
-}
-
-void wxFoldPanelBar::RedisplayFoldPanelItems()
-{
-    // resize them all. No need to reposition
-
-    wxFoldPanelItem *item;
-    for(size_t i = 0; i < m_panels.GetCount(); i++)
-    {
-        item = m_panels.Item(i);
-        wxASSERT(item);
-
-        item->ResizePanel();
-    }
-}
-
-wxRect wxFoldPanelBar::RepositionCollapsedToBottom()
-{
-    wxRect value(0,0,0,0);
-    bool vertical = IsVertical();
-
-    // determine wether the number of panels left
-    // times the size of their captions is enough
-    // to be placed in the left over space
-
-    int expanded = 0, collapsed = 0, offset;
-    GetPanelsLength(collapsed, expanded);
-
-    // if no room stick them behind the normal ones, else
-    // at the bottom
-
-    if(((vertical ? GetSize().GetHeight() : GetSize().GetWidth()) - expanded - collapsed) < 0)
-        offset = expanded;
-    else
-    {
-        // value is the region which is left unpainted
-        // I will send it back as 'slack' so it does not need to
-        // be recalulated.
-
-        value.SetHeight(GetSize().GetHeight());
-        value.SetWidth(GetSize().GetWidth());
-
-        if(vertical)
-        {
-            value.SetY(expanded);
-            value.SetHeight(value.GetHeight() - expanded);
-        }
-        else
-        {
-            value.SetX(expanded);
-            value.SetWidth(value.GetWidth() - expanded);
-        }
-
-        offset = (vertical ? GetSize().GetHeight() : GetSize().GetWidth()) - collapsed;
-    }
-
-    // go reposition
-
-    for(size_t i = 0; i < m_panels.GetCount(); i++)
-    {
-        if(!m_panels.Item(i)->IsExpanded())
-            offset += m_panels.Item(i)->Reposition(offset);
-    }
-
-    return value;
-}
-
-int wxFoldPanelBar::GetPanelsLength(int &collapsed, int &expanded)
-{
-    int value = 0;
-
-    // assumed here that all the panels that are expanded
-    // are positioned after each other from 0,0 to end.
-
-    for(size_t j = 0; j < m_panels.GetCount(); j++)
-    {
-        int offset = m_panels.Item(j)->GetPanelLength();
-        value += offset;
-        if(m_panels.Item(j)->IsExpanded())
-            expanded += offset;
-        else
-            collapsed += offset;
-    }
-
-    return value;
-}
diff --git a/contrib/src/foldbar/foldpanelitem.cpp b/contrib/src/foldbar/foldpanelitem.cpp
deleted file mode 100644
index 48997c1372..0000000000
--- a/contrib/src/foldbar/foldpanelitem.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        foldpanelitem.cpp
-// Purpose:
-// Author:      Jorgen Bodde
-// Modified by: ABX - 19/12/2004 : possibility of horizontal orientation
-//                               : wxWidgets coding standards
-// Created:     22/06/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) Jorgen Bodde
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/foldbar/foldpanelbar.h"
-
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxFoldWindowItemArray);
-
-//----------------------------------------------------------------------------
-// wxFoldPanelItem
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS( wxFoldPanelItem, wxPanel )
-
-BEGIN_EVENT_TABLE(wxFoldPanelItem,wxPanel)
-    EVT_CAPTIONBAR(wxID_ANY, wxFoldPanelItem::OnPressCaption)
-    EVT_PAINT(wxFoldPanelItem::OnPaint)
-    //EVT_SIZE(wxFoldPanelItem::OnSize)
-END_EVENT_TABLE()
-
-wxFoldPanelItem::wxFoldPanelItem( wxWindow *parent, const wxString &caption, wxImageList *icons, bool collapsedInitially,
-                                  const wxCaptionBarStyle &style )
-    : m_controlCreated(false)
-    , m_userSize(0)
-    , m_panelSize(0)
-    , m_lastInsertPos(0)
-    , m_itemPos(0)
-    , m_userSized(false)
-{
-    wxCHECK2(parent, return);
-
-    wxPanel::Create(parent, wxID_ANY);
-
-    // create the caption bar, in collapsed or expanded state
-
-    m_captionBar = new wxCaptionBar(this, caption, icons, wxID_ANY, style, wxPoint(0,0));
-    //m_captionBar->SetBoldFont();
-
-    if(collapsedInitially)
-        m_captionBar->Collapse();
-
-    m_controlCreated = true;
-
-    // make initial size for component, if collapsed, the
-    // size is determined on the panel height and won't change
-
-    wxSize size = m_captionBar->GetSize();
-    m_panelSize = IsVertical()?size.GetHeight():size.GetWidth();
-    m_lastInsertPos = m_panelSize;
-}
-
-void wxFoldPanelItem::AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing)
-{
-    wxASSERT(window);
-
-    wxFoldWindowItem *wi = new wxFoldWindowItem(window, flags, ySpacing, leftSpacing, rightSpacing);
-    m_items.Add(wi);
-
-    bool vertical = this->IsVertical();
-
-    window->SetSize( vertical ? leftSpacing : m_lastInsertPos + ySpacing,
-                     vertical ? m_lastInsertPos + ySpacing : leftSpacing,
-                     wxDefaultCoord,
-                     wxDefaultCoord,
-                     wxSIZE_USE_EXISTING);
-
-    m_lastInsertPos += wi->GetWindowLength( vertical );
-
-    ResizePanel();
-}
-
-void wxFoldPanelItem::AddSeparator(const wxColour &color, int ySpacing, int leftSpacing, int rightSpacing)
-{
-    wxFoldWindowItem *wi = new wxFoldWindowItem(m_lastInsertPos, color, ySpacing, leftSpacing, rightSpacing);
-    m_items.Add(wi);
-
-    m_lastInsertPos += wi->GetWindowLength( this->IsVertical() );
-
-    ResizePanel();
-}
-
-
-wxFoldPanelItem::~wxFoldPanelItem()
-{
-    m_items.Clear();
-}
-
-void wxFoldPanelItem::OnPressCaption(wxCaptionBarEvent &event)
-{
-    // tell the upper container we are responsible
-    // for this event, so it can fold the panel item
-    // and do a refresh
-
-    event.SetTag((void *)this);
-    event.Skip();
-}
-
-/* Inactive */
-void wxFoldPanelItem::OnSize(wxSizeEvent &event)
-{
-    // deny access to pointers (yet)
-
-    if(!m_controlCreated)
-    {
-        event.Skip();
-        return;
-    }
-
-    // calculate the size needed for this window, so
-    // we get the parent size, and determine the size for the caption and the panel
-
-    //wxRect rect = GetRect();
-
-    //wxSize size(0,wxDefaultCoord);
-    //size.SetWidth(rect.GetWidth());
-    //m_captionBar->SetSize(size);
-
-}
-
-int wxFoldPanelItem::Reposition(int pos)
-{
-    // NOTE: Call Resize before Reposition when an item is added, because the new
-    // size needed will be calculated by Resize. Ofcourse the relative position
-    // of the controls have to be correct in respect to the caption bar
-
-    Freeze();
-
-    bool vertical = this->IsVertical();
-
-    SetSize( vertical ? wxDefaultCoord : pos,
-             vertical ? pos : wxDefaultCoord,
-             wxDefaultCoord,
-             wxDefaultCoord,
-             wxSIZE_USE_EXISTING);
-
-    m_itemPos = pos;
-
-    Thaw();
-
-    return GetPanelLength();
-}
-
-void wxFoldPanelItem::ResizePanel()
-{
-    bool vertical = IsVertical();
-
-    // prevent unnecessary updates by blocking repaints for a sec
-
-    Freeze();
-
-    // force this panel to take the width of the parent panel and the y of the
-    // user or calulated width (which will be recalculated by the contents here
-
-    wxSize size;
-    if(m_captionBar->IsCollapsed())
-    {
-        size = m_captionBar->GetSize();
-        m_panelSize = vertical ? size.GetHeight() : size.GetWidth();
-    }
-    else
-    {
-        size = GetBestSize();
-        m_panelSize = vertical ? size.GetHeight() : size.GetWidth();
-
-        if(m_userSized)
-        {
-            if ( vertical )
-                size.SetHeight(m_userSize);
-            else
-                size.SetWidth(m_userSize);
-        }
-    }
-
-    wxSize pnlsize = GetParent()->GetSize();
-    if ( vertical )
-        size.SetWidth(pnlsize.GetWidth());
-    else
-        size.SetHeight(pnlsize.GetHeight());
-
-    // resize caption bar
-    m_captionBar->SetSize( vertical ? size.GetWidth() : wxDefaultCoord,
-                          vertical ? wxDefaultCoord : size.GetHeight());
-
-    // resize the panel
-    SetSize(size);
-
-    // go by all the controls and call Layout
-
-    for(size_t i = 0; i < m_items.GetCount(); i++)
-        m_items.Item(i).ResizeItem( vertical ? size.GetWidth() : size.GetHeight() , vertical );
-
-    // and draw all
-
-    Thaw();
-}
-
-void wxFoldPanelItem::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    // draw all the items that are lines
-    wxPaintDC dc(this);
-    bool vertical = IsVertical();
-
-    for(size_t i = 0; i < m_items.GetCount(); i++)
-    {
-        wxFoldWindowItem &item = m_items.Item(i);
-        wxPen pen(item.GetLineColour(), 1, wxSOLID);
-        if(item.GetType() == wxFoldWindowItem::SEPARATOR)
-        {
-            dc.SetPen(pen);
-            int a = item.GetLeftSpacing();
-            int b = item.GetLineY() + item.GetSpacing();
-            int c = item.GetLineLength();
-            int d = a + c;
-            if (vertical)
-                dc.DrawLine(a, b, d, b);
-            else
-                dc.DrawLine(b, a, b, d);
-        }
-    }
-}
-
-bool wxFoldPanelItem::IsVertical() const
-{
-    // grandparent of wxFoldPanelItem is wxFoldPanelBar
-    // default is vertical
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    wxCHECK_MSG( panel, true, _T("wrong parent") );
-    wxFoldPanelBar *bar = wxDynamicCast(panel->GetParent(), wxFoldPanelBar);
-    wxCHECK_MSG( bar, true, _T("wrong parent") );
-    return bar->IsVertical();
-}
diff --git a/contrib/src/foldbar/icon_collapsed.old.xpm b/contrib/src/foldbar/icon_collapsed.old.xpm
deleted file mode 100644
index 583b47da9b..0000000000
--- a/contrib/src/foldbar/icon_collapsed.old.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_collapsed[] = {
-"16 16 3 1",
-" 	c #00FFFF",
-".	c None",
-"+	c #000000",
-"................",
-"................",
-".......+........",
-".......+........",
-"......+++.......",
-"......+++.......",
-".....+++++......",
-".....+++++......",
-"....+++++++.....",
-"....+++++++.....",
-"...+++++++++....",
-"...+++++++++....",
-"..+++++++++++...",
-"..+++++++++++...",
-"................",
-"................"};
diff --git a/contrib/src/foldbar/icon_collapsed.xpm b/contrib/src/foldbar/icon_collapsed.xpm
deleted file mode 100644
index ad999be33d..0000000000
--- a/contrib/src/foldbar/icon_collapsed.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_collapsed[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};
diff --git a/contrib/src/foldbar/icon_expanded.old.xpm b/contrib/src/foldbar/icon_expanded.old.xpm
deleted file mode 100644
index 2d6b0130a4..0000000000
--- a/contrib/src/foldbar/icon_expanded.old.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_expanded[] = {
-"16 16 3 1",
-" 	c #00FFFF",
-".	c None",
-"+	c #000000",
-"................",
-"................",
-"..+++++++++++...",
-"..+++++++++++...",
-"...+++++++++....",
-"...+++++++++....",
-"....+++++++.....",
-"....+++++++.....",
-".....+++++......",
-".....+++++......",
-"......+++.......",
-"......+++.......",
-".......+........",
-".......+........",
-"................",
-"................"};
diff --git a/contrib/src/foldbar/icon_expanded.xpm b/contrib/src/foldbar/icon_expanded.xpm
deleted file mode 100644
index 33d67d2319..0000000000
--- a/contrib/src/foldbar/icon_expanded.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *icon_expanded[] = {
-"16 16 16 2",
-"00 c black",
-"01 c #800000",
-"02 c #008000",
-"03 c #808000",
-"04 c #000080",
-"05 c #800080",
-"06 c #008080",
-"07 c #C0C0C0",
-"08 c #808080",
-"09 c red",
-"10 c green",
-"11 c yellow",
-"12 c blue",
-"13 c none",
-"14 c cyan",
-"15 c gray100",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313000000000000001313131313",
-"13131313000000000000001313131313",
-"13131313130000000000131313131313",
-"13131313130000000000131313131313",
-"13131313131300000013131313131313",
-"13131313131300000013131313131313",
-"13131313131313001313131313131313",
-"13131313131313001313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313",
-"13131313131313131313131313131313"
-};
diff --git a/contrib/src/foldbar/icon_theresmore.xpm b/contrib/src/foldbar/icon_theresmore.xpm
deleted file mode 100644
index b7cfeebd46..0000000000
--- a/contrib/src/foldbar/icon_theresmore.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char *icon_theresmore[] = {
-"7 10 16 2",
-"00 c black",
-"01 c none",
-"02 c gray100",
-"03 c gray100",
-"04 c gray100",
-"05 c gray100",
-"06 c gray100",
-"07 c gray100",
-"08 c gray100",
-"09 c gray100",
-"10 c gray100",
-"11 c gray100",
-"12 c gray100",
-"13 c gray100",
-"14 c gray100",
-"15 c gray100",
-"01010101010101",
-"01010100010101",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010100010100",
-"01010000000101",
-"01000001000001",
-"00000101010000",
-"00010101010100"
-};
diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
deleted file mode 100644
index 4ce41afff1..0000000000
--- a/contrib/src/gizmos/Makefile.in
+++ /dev/null
@@ -1,463 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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_XML = @EXTRALIBS_XML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSDLL_OBJECTS =  \
-	$(__gizmosdll___win32rc) \
-	gizmosdll_dynamicsash.o \
-	gizmosdll_editlbox.o \
-	gizmosdll_ledctrl.o \
-	gizmosdll_multicell.o \
-	gizmosdll_splittree.o \
-	gizmosdll_statpict.o
-GIZMOSDLL_ODEP =  $(___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname)
-GIZMOS_XRCDLL_CXXFLAGS = $(__gizmos_xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_GIZMOS_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCDLL_OBJECTS =  \
-	$(__gizmos_xrcdll___win32rc) \
-	gizmos_xrcdll_xh_statpict.o
-GIZMOS_XRCDLL_ODEP = \
-	$(___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname)
-GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-GIZMOSLIB_OBJECTS =  \
-	gizmoslib_dynamicsash.o \
-	gizmoslib_editlbox.o \
-	gizmoslib_ledctrl.o \
-	gizmoslib_multicell.o \
-	gizmoslib_splittree.o \
-	gizmoslib_statpict.o
-GIZMOSLIB_ODEP =  $(___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname)
-GIZMOS_XRCLIB_CXXFLAGS = $(__gizmos_xrclib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-GIZMOS_XRCLIB_OBJECTS =  \
-	gizmos_xrclib_xh_statpict.o
-GIZMOS_XRCLIB_ODEP = \
-	$(___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___gizmosdll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
-@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
-@COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
-COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gizmosdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gizmosdll___importlib = $(COND_PLATFORM_OS2_1___gizmosdll___importlib)
-COND_WINDOWS_IMPLIB_1___gizmosdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__gizmosdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmosdll___importlib)
-@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll
-@COND_ICC_PCH_1@__gizmosdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_gizmosdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_gizmosdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gizmosdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmosdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
-COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
-@COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
-@COND_SHARED_1_USE_XRC_1@	= install_gizmos_xrcdll
-@COND_SHARED_1_USE_XRC_1@__uninstall_gizmos_xrcdll___depname \
-@COND_SHARED_1_USE_XRC_1@	= uninstall_gizmos_xrcdll
-COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_PLATFORM_MACOSX_1@__gizmos_xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gizmos_xrcdll___importlib = $(COND_PLATFORM_OS2_1___gizmos_xrcdll___importlib)
-COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__gizmos_xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___gizmos_xrcdll___importlib)
-@COND_GCC_PCH_1@__gizmos_xrcdll_PCH_INC = -I.pch/wxprec_gizmos_xrcdll
-@COND_ICC_PCH_1@__gizmos_xrcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmos_xrcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-@COND_USE_SOVERLINUX_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___gizmos_xrcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_USE_SOVERSOLARIS_1@__gizmos_xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gizmos_xrcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
-	rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
-@COND_PLATFORM_WIN32_1@	gizmos_xrcdll_version_rc.o
-COND_MONOLITHIC_0___WXLIB_XRC_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-COND_SHARED_0___gizmoslib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname)
-@COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
-@COND_SHARED_0@__uninstall_gizmoslib___depname = uninstall_gizmoslib
-@COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib
-@COND_ICC_PCH_1@__gizmoslib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_gizmoslib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_gizmoslib/wx/wxprec.h.gch
-COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0_USE_XRC_1@__gizmos_xrclib___depname = $(COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname)
-@COND_SHARED_0_USE_XRC_1@__install_gizmos_xrclib___depname \
-@COND_SHARED_0_USE_XRC_1@	= install_gizmos_xrclib
-@COND_SHARED_0_USE_XRC_1@__uninstall_gizmos_xrclib___depname \
-@COND_SHARED_0_USE_XRC_1@	= uninstall_gizmos_xrclib
-@COND_GCC_PCH_1@__gizmos_xrclib_PCH_INC = -I.pch/wxprec_gizmos_xrclib
-@COND_ICC_PCH_1@__gizmos_xrclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gizmos_xrclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmos = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos = .0.$(SO_SUFFIX)
-@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_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 \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-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_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: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)
-
-install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depname) $(__install_gizmoslib___depname) $(__install_gizmos_xrclib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.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_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
-	for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___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@	$(__gizmosdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_gizmosdll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_gizmosdll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
-
-@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
-@COND_SHARED_1_USE_XRC_1@	$(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-@COND_SHARED_1_USE_XRC_1@	
-@COND_SHARED_1_USE_XRC_1@	$(__gizmos_xrcdll___so_symlinks_cmd)
-
-@COND_SHARED_1_USE_XRC_1@install_gizmos_xrcdll: 
-@COND_SHARED_1_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
-@COND_SHARED_1_USE_XRC_1@	(cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1_USE_XRC_1@uninstall_gizmos_xrcdll: 
-@COND_SHARED_1_USE_XRC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1_USE_XRC_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
-@COND_SHARED_1_USE_XRC_1@	(cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOSLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(GIZMOSLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_gizmoslib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_gizmoslib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
-
-@COND_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOS_XRCLIB_OBJECTS)
-@COND_SHARED_0_USE_XRC_1@	rm -f $@
-@COND_SHARED_0_USE_XRC_1@	$(AR) $(AROPTIONS) $@ $(GIZMOS_XRCLIB_OBJECTS)
-@COND_SHARED_0_USE_XRC_1@	$(RANLIB) $@
-
-@COND_SHARED_0_USE_XRC_1@install_gizmos_xrclib: 
-@COND_SHARED_0_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_XRC_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0_USE_XRC_1@uninstall_gizmos_xrclib: 
-@COND_SHARED_0_USE_XRC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
-
-gizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/dynamicsash.cpp
-
-gizmosdll_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/editlbox.cpp
-
-gizmosdll_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/ledctrl.cpp
-
-gizmosdll_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/multicell.cpp
-
-gizmosdll_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/splittree.cpp
-
-gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(srcdir)/statpict.cpp
-
-gizmos_xrcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOS_XRCDLL_ODEP)
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-gizmos_xrcdll_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCDLL_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(srcdir)/xh_statpict.cpp
-
-gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/dynamicsash.cpp
-
-gizmoslib_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/editlbox.cpp
-
-gizmoslib_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/ledctrl.cpp
-
-gizmoslib_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/multicell.cpp
-
-gizmoslib_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/splittree.cpp
-
-gizmoslib_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(srcdir)/statpict.cpp
-
-gizmos_xrclib_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCLIB_ODEP)
-	$(CXXC) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(srcdir)/xh_statpict.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_gizmosdll uninstall_gizmosdll install_gizmos_xrcdll uninstall_gizmos_xrcdll install_gizmoslib uninstall_gizmoslib install_gizmos_xrclib uninstall_gizmos_xrclib
diff --git a/contrib/src/gizmos/dynamicsash.cpp b/contrib/src/gizmos/dynamicsash.cpp
deleted file mode 100644
index ed9548212f..0000000000
--- a/contrib/src/gizmos/dynamicsash.cpp
+++ /dev/null
@@ -1,1471 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dynamicsash.cpp
-// Purpose:     A window which can be dynamically split to an arbitrary depth
-//              and later reunified through the user interface
-// Author:      Matt Kimball
-// Modified by:
-// Created:     7/15/2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Matt Kimball
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-#ifdef __WXMSW__
-#include "wx/mdi.h"
-#endif
-
-#include "wx/gizmos/dynamicsash.h"
-
-
-const wxChar* wxDynamicSashWindowNameStr = wxT("dynamicSashWindow");
-
-
-/*
-    wxDynamicSashWindow works by internally storing a tree of Implementation
-    objects (wxDynamicSsahWindowImpl) and Leaf objects
-    (wxDynamicSashWindowLeaf).  The wxDynamicSashWindow has a pointer to one
-    implementation, and each implementation either has a pointer to a one
-    leaf (m_leaf) or a pointer to two children implementation objects
-    (m_child).  The leaves each are responsible for drawing the frame and
-    decorations around one user-provided views and for responding to mouse
-    and scrollbar events.
-
-    A resulting tree might look something like this:
-
-    wxDynamicSashWindow
-     |
-     +- wxDynamicSashWindowImpl
-         |
-         +- wxDynamicSashWindowLeaf
-         |   |
-         |   +- user view window
-         |
-         +- wxDynamicSashWindowImpl
-             |
-             +- wxDynamicSashWindowLeaf
-             |   |
-             |   +- user view window
-             |
-             +- wxDynamicSashWindowLeaf
-                 |
-                 +- user view window
-
-    Each time a split occurs, one of the implementation objects removes its
-    leaf, generates two new implementation object children, each with a new
-    leaf, and reparents the user view which was connected to its old leaf
-    to be one of the new leaf's user view, and sends a Split event to the
-    user view in the hopes that it will generate a new user view for the
-    other new leaf.
-
-    When a unification ocurrs, an implementation object is replaced by one
-    of its children, and the tree of its other child is pruned.
-
-    One quirk is that the top-level implementation object (m_top) always
-    keeps a pointer to the implementation object where a new child is needed.
-    (m_add_child_target).  This is so that when a new uesr view is added
-    to the hierarchy, AddChild() is able to reparent the new user view to
-    the correct implementation object's leaf.
-
-*/
-
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"
-#include "wx/layout.h"
-#include "wx/scrolbar.h"
-#include "wx/settings.h"
-
-
-const wxEventType wxEVT_DYNAMIC_SASH_SPLIT = wxNewEventType();
-const wxEventType wxEVT_DYNAMIC_SASH_UNIFY = wxNewEventType();
-const wxEventType wxEVT_DYNAMIC_SASH_REPARENT = wxNewEventType();
-
-enum DynamicSashRegion
-{
-    DSR_NONE,
-    DSR_VERTICAL_TAB,
-    DSR_HORIZONTAL_TAB,
-    DSR_CORNER,
-    DSR_LEFT_EDGE,
-    DSR_TOP_EDGE,
-    DSR_RIGHT_EDGE,
-    DSR_BOTTOM_EDGE
-};
-
-
-/*
-    wxDynamicSashReparentEvent is generated by the AddChild() method of
-    wxDynamicSashWindow when it wants a Leaf to reparent a user view window
-    to its viewport at some time in the future.  We can't reparent the window
-    immediately, because switching parents in AddChild() confuses the wxWindow
-    class.  Instead, we queue up this event, and the window is actually
-    reparented the next time we process events in the idle loop.
-*/
-class wxDynamicSashReparentEvent : public wxEvent
-{
-public:
-    wxDynamicSashReparentEvent();
-    wxDynamicSashReparentEvent(wxObject *object);
-    wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt);
-
-    virtual wxEvent* Clone() const { return new wxDynamicSashReparentEvent(*this); }
-
-    DECLARE_DYNAMIC_CLASS(wxDynamicSashReparentEvent)
-};
-
-
-class wxDynamicSashWindowImpl : public wxEvtHandler
-{
-public:
-    wxDynamicSashWindowImpl(wxDynamicSashWindow *window);
-    ~wxDynamicSashWindowImpl();
-
-    bool Create();
-    void AddChild(wxWindow *window);
-    void DrawSash(int x, int y) const;
-    void ConstrainChildren(int px, int py);
-    void Split(int x, int y);
-    void Unify(int panel);
-    void Resize(int x, int y);
-    wxDynamicSashWindowImpl *FindParent(DynamicSashRegion side) const;
-    wxDynamicSashWindowImpl *FindUpperParent(wxDynamicSashWindowImpl *sash_a,
-                                             wxDynamicSashWindowImpl *sash_b) const;
-    wxWindow *FindFrame() const;
-    wxScrollBar *FindScrollBar(const wxWindow *child, int vert) const;
-
-    void OnSize(wxSizeEvent &event);
-    void OnPaint(wxPaintEvent &event);
-    void OnMouseMove(wxMouseEvent &event);
-    void OnLeave(wxMouseEvent &event);
-    void OnPress(wxMouseEvent &event);
-    void OnRelease(wxMouseEvent &event);
-
-    wxDynamicSashWindow *m_window;
-    wxDynamicSashWindowImpl *m_add_child_target;
-
-    /*  This is the window we are responsible for managing.  Either of
-        leaf or our children are in this window.  For the top level
-        implementation object, this is the same as m_window.
-        Otherwise it is a window we've created an will destroy when we
-        are deleted.  */
-    wxWindow *m_container;
-
-    wxDynamicSashWindowImpl *m_parent;
-    wxDynamicSashWindowImpl *m_top;
-    wxDynamicSashWindowImpl *m_child[2];
-
-    class wxDynamicSashWindowLeaf *m_leaf;
-
-    /*  If the implementation is split horizontally or vertically, m_split
-        is set to DSR_HORIZONTAL_TAB or DSR_VERTICAL_TAB, respectively.
-        Otherwise it is set to DSR_NONE.  */
-    DynamicSashRegion m_split;
-
-    /*  These are used to keep track of a sash as it is being dragged, for
-        drawing the user interface correctly.  */
-    DynamicSashRegion m_dragging;
-    int m_drag_x, m_drag_y;
-};
-
-class wxDynamicSashWindowLeaf : public wxEvtHandler
-{
-public:
-    wxDynamicSashWindowLeaf(wxDynamicSashWindowImpl *impl);
-    ~wxDynamicSashWindowLeaf();
-
-    bool Create();
-    void AddChild(wxWindow *window);
-    DynamicSashRegion GetRegion(int x, int y);
-    void ResizeChild(const wxSize& size);
-    wxScrollBar *FindScrollBar(const wxWindow *child, int vert) const;
-
-    void OnSize(wxSizeEvent &event);
-    void OnViewSize(wxSizeEvent &event);
-    void OnPaint(wxPaintEvent &event);
-    void OnScroll(wxScrollEvent &event);
-    void OnFocus(wxFocusEvent &event);
-    void OnMouseMove(wxMouseEvent &event);
-    void OnLeave(wxMouseEvent &event);
-    void OnPress(wxMouseEvent &event);
-    void OnRelease(wxMouseEvent &event);
-    void OnReparent(wxEvent &event);
-
-    wxDynamicSashWindowImpl *m_impl;
-
-    wxScrollBar *m_vscroll,
-                *m_hscroll;
-
-    /*  m_child is the window provided to us by the application developer.
-        m_viewport is a window we've created, and it is the immediately
-        parent of m_child.  We scroll m_child by moving it around within
-        m_viewport.  */
-    wxWindow *m_viewport,
-             *m_child;
-};
-
-
-// ============================================================================
-// wxDynamicSashWindow
-// ============================================================================
-
-wxDynamicSashWindow::wxDynamicSashWindow()
-{
-    m_impl = NULL;
-}
-
-wxDynamicSashWindow::wxDynamicSashWindow(wxWindow *parent,
-                                         wxWindowID id,
-                                         const wxPoint& pos,
-                                         const wxSize& size,
-                                         long style,
-                                         const wxString& name)
-{
-    m_impl = NULL;
-    Create(parent, id, pos, size, style, name);
-}
-
-wxDynamicSashWindow::~wxDynamicSashWindow()
-{
-    SetEventHandler(this);
-    delete m_impl;
-}
-
-bool wxDynamicSashWindow::Create(wxWindow *parent,
-                                 wxWindowID id,
-                                 const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style,
-                                 const wxString& name)
-{
-    if (m_impl)
-        return false;
-
-    if (!wxWindow::Create(parent, id, pos, size, style, name))
-        return false;
-
-    m_impl = new wxDynamicSashWindowImpl(this);
-    if (!m_impl)
-        return false;
-
-    if (!m_impl->Create())
-    {
-        delete m_impl;
-        m_impl = NULL;
-        return false;
-    }
-
-    return true;
-}
-
-void wxDynamicSashWindow::AddChild(wxWindowBase *child)
-{
-    wxWindow::AddChild(child);
-
-    m_impl->AddChild(wxDynamicCast(child, wxWindow));
-}
-
-wxScrollBar *wxDynamicSashWindow::GetHScrollBar(const wxWindow *child) const
-{
-    return m_impl->FindScrollBar(child, 0);
-}
-
-wxScrollBar *wxDynamicSashWindow::GetVScrollBar(const wxWindow *child) const
-{
-    return m_impl->FindScrollBar(child, 1);
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashWindow, wxWindow)
-
-
-// ============================================================================
-// wxDynamicSashWindowImpl
-// ============================================================================
-
-wxDynamicSashWindowImpl::wxDynamicSashWindowImpl(wxDynamicSashWindow *window)
-{
-    m_window = window;
-    m_add_child_target = this;
-
-    m_container = NULL;
-    m_parent = NULL;
-    m_top = this;
-    m_child[0] =
-    m_child[1] = NULL;
-    m_leaf = NULL;
-    m_dragging = DSR_NONE;
-    m_split = DSR_NONE;
-}
-
-wxDynamicSashWindowImpl::~wxDynamicSashWindowImpl()
-{
-    delete m_leaf;
-    delete m_child[0];
-    m_child[0] = NULL;
-    delete m_child[1];
-    m_child[1] = NULL;
-    m_leaf = NULL;
-
-    if (m_container != m_window && m_container)
-    {
-        m_container->SetEventHandler(m_container);
-        m_container->Destroy();
-    }
-}
-
-bool wxDynamicSashWindowImpl::Create()
-{
-    if (!m_container)
-        m_container = m_window;
-
-    wxCursor cursor(wxCURSOR_ARROW);
-    m_container->SetCursor(cursor);
-
-    m_leaf = new wxDynamicSashWindowLeaf(this);
-    if (!m_leaf)
-        return false;
-
-    if (!m_leaf->Create())
-    {
-        delete m_leaf;
-        m_leaf = NULL;
-        return false;
-    }
-
-    m_container->SetEventHandler(this);
-
-    Connect(wxEVT_SIZE, wxSizeEventHandler(wxDynamicSashWindowImpl::OnSize));
-    Connect(wxEVT_PAINT, wxPaintEventHandler(wxDynamicSashWindowImpl::OnPaint));
-    Connect(wxEVT_MOTION,
-            wxMouseEventHandler(wxDynamicSashWindowImpl::OnMouseMove));
-    Connect(wxEVT_ENTER_WINDOW,
-            wxMouseEventHandler(wxDynamicSashWindowImpl::OnMouseMove));
-    Connect(wxEVT_LEAVE_WINDOW,
-            wxMouseEventHandler(wxDynamicSashWindowImpl::OnLeave));
-    Connect(wxEVT_LEFT_DOWN,
-            wxMouseEventHandler(wxDynamicSashWindowImpl::OnPress));
-    Connect(wxEVT_LEFT_UP,
-            wxMouseEventHandler(wxDynamicSashWindowImpl::OnRelease));
-
-    return true;
-}
-
-void wxDynamicSashWindowImpl::AddChild(wxWindow *window)
-{
-    if (m_add_child_target && m_add_child_target->m_leaf)
-        m_add_child_target->m_leaf->AddChild(window);
-}
-
-void wxDynamicSashWindowImpl::DrawSash(int x, int y) const
-{
-    int i, j;
-
-    wxScreenDC dc;
-    dc.StartDrawingOnTop(m_container);
-
-    wxBitmap bmp(8, 8);
-    wxMemoryDC bdc;
-    bdc.SelectObject(bmp);
-    bdc.DrawRectangle(-1, -1, 10, 10);
-    for (i = 0; i < 8; i++)
-    {
-        for (j = 0; j < 8; j++)
-        {
-            if ((i + j) & 1)
-                bdc.DrawPoint(i, j);
-        }
-    }
-
-    wxBrush brush(bmp);
-    dc.SetBrush(brush);
-    dc.SetLogicalFunction(wxXOR);
-
-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
-    {
-        int cx = 0;
-        int cy = 0;
-
-        m_container->ClientToScreen(&cx, &cy);
-        m_container->ClientToScreen(&x, &y);
-
-        if (cx < x && cy < y)
-        {
-            dc.DrawRectangle(cx - 2, cy - 2, x - cx + 4, 4);
-            dc.DrawRectangle(x - 2, cy + 2, 4, y - cy);
-            dc.DrawRectangle(cx - 2, cy + 2, 4, y - cy);
-            dc.DrawRectangle(cx + 2, y - 2, x - cx - 4, 4);
-        }
-    }
-    else
-    {
-        int body_w, body_h;
-        m_container->GetClientSize(&body_w, &body_h);
-
-        if (y < 0)
-            y = 0;
-        if (y > body_h)
-            y = body_h;
-        if (x < 0)
-            x = 0;
-        if (x > body_w)
-            x = body_w;
-
-        if (m_dragging == DSR_HORIZONTAL_TAB)
-            x = 0;
-        else
-            y = 0;
-
-        m_container->ClientToScreen(&x, &y);
-
-        int w, h;
-        w = body_w;  h = body_h;
-
-        if (m_dragging == DSR_HORIZONTAL_TAB)
-            dc.DrawRectangle(x, y - 2, w, 4);
-        else
-            dc.DrawRectangle(x - 2, y, 4, h);
-    }
-
-    dc.EndDrawingOnTop();
-}
-
-wxDynamicSashWindowImpl *
-wxDynamicSashWindowImpl::FindParent(DynamicSashRegion side) const
-{
-    if (m_parent == NULL)
-        return NULL;
-
-    if (m_parent->m_split == DSR_HORIZONTAL_TAB)
-    {
-        if (side == DSR_TOP_EDGE && m_parent->m_child[1] == this)
-            return m_parent;
-        if (side == DSR_BOTTOM_EDGE && m_parent->m_child[0] == this)
-            return m_parent;
-    }
-    else if (m_parent->m_split == DSR_VERTICAL_TAB)
-    {
-        if (side == DSR_LEFT_EDGE && m_parent->m_child[1] == this)
-            return m_parent;
-        if (side == DSR_RIGHT_EDGE && m_parent->m_child[0] == this)
-            return m_parent;
-    }
-
-    return m_parent->FindParent(side);
-}
-
-wxDynamicSashWindowImpl *
-wxDynamicSashWindowImpl::FindUpperParent(wxDynamicSashWindowImpl *sash_a,
-                                         wxDynamicSashWindowImpl *sash_b) const
-{
-    wxWindow *win;
-    win = sash_a->m_container->GetParent();
-    while (win && !win->IsTopLevel())
-    {
-        if (win == sash_b->m_container)
-            return sash_b;
-
-        win = win->GetParent();
-    }
-
-    return sash_a;
-}
-
-
-wxWindow *wxDynamicSashWindowImpl::FindFrame() const
-{
-    wxWindow *win;
-
-    win = m_window->GetParent();
-    while (win && !win->IsTopLevel()
-#if defined(__WXMSW__) && wxUSE_MDI
-           && ! wxIsKindOf(win, wxMDIChildFrame)  // not top-level but still a frame
-#endif
-        )
-    {
-        win = win->GetParent();
-    }
-
-    return win;
-}
-
-wxScrollBar *
-wxDynamicSashWindowImpl::FindScrollBar(const wxWindow *child, int vert) const
-{
-    if (m_child[0] == NULL && m_leaf == NULL)
-        return NULL;
-
-    if (!m_child[0])
-    {
-        return m_leaf->FindScrollBar(child, vert);
-    }
-
-    wxScrollBar *ret = m_child[0]->FindScrollBar(child, vert);
-    if (!ret)
-        ret = m_child[1]->FindScrollBar(child, vert);
-
-    return ret;
-}
-
-void wxDynamicSashWindowImpl::ConstrainChildren(int px, int py)
-{
-    wxLayoutConstraints *layout = new wxLayoutConstraints();
-    layout->left.SameAs(m_container, wxLeft);
-    layout->top.SameAs(m_container, wxTop);
-    if (m_split == DSR_HORIZONTAL_TAB)
-    {
-        layout->right.SameAs(m_container, wxRight);
-        layout->height.PercentOf(m_container, wxHeight, py);
-    }
-    else
-    {
-        layout->bottom.SameAs(m_container, wxBottom);
-        layout->width.PercentOf(m_container, wxWidth, px);
-    }
-    m_child[0]->m_container->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    layout->right.SameAs(m_container, wxRight);
-    layout->bottom.SameAs(m_container, wxBottom);
-    if (m_split == DSR_HORIZONTAL_TAB)
-    {
-        layout->top.Below(m_child[0]->m_container, 1);
-        layout->left.SameAs(m_container, wxLeft);
-    }
-    else
-    {
-        layout->left.RightOf(m_child[0]->m_container, 1);
-        layout->top.SameAs(m_container, wxTop);
-    }
-    m_child[1]->m_container->SetConstraints(layout);
-}
-
-void wxDynamicSashWindowImpl::Unify(int panel)
-{
-    int other = panel == 0 ? 1 : 0;
-
-    if (m_child[panel]->m_leaf)
-    {
-        wxDynamicSashWindowImpl *child[2];
-
-        child[0] = m_child[0];
-        child[1] = m_child[1];
-
-        m_child[0] = m_child[1] = NULL;
-
-        m_leaf = new wxDynamicSashWindowLeaf(this);
-        m_leaf->Create();
-        m_leaf->m_child = child[panel]->m_leaf->m_child;
-
-        m_leaf->m_vscroll->SetScrollbar(child[panel]->m_leaf->m_vscroll->GetThumbPosition(),
-                                        child[panel]->m_leaf->m_vscroll->GetThumbSize(),
-                                        child[panel]->m_leaf->m_vscroll->GetRange(),
-                                        child[panel]->m_leaf->m_vscroll->GetPageSize());
-        m_leaf->m_hscroll->SetScrollbar(child[panel]->m_leaf->m_hscroll->GetThumbPosition(),
-                                        child[panel]->m_leaf->m_hscroll->GetThumbSize(),
-                                        child[panel]->m_leaf->m_hscroll->GetRange(),
-                                        child[panel]->m_leaf->m_hscroll->GetPageSize());
-        m_add_child_target = NULL;
-        wxDynamicSashReparentEvent event(m_leaf);
-        m_leaf->ProcessEvent(event);
-
-        delete child[0];
-        delete child[1];
-
-        m_split = DSR_NONE;
-
-        wxDynamicSashUnifyEvent unify(m_leaf->m_child);
-        m_leaf->m_child->ProcessEvent(unify);
-    }
-    else
-    {
-        m_split = m_child[panel]->m_split;
-
-        delete m_child[other];
-
-        wxDynamicSashWindowImpl *child_panel = m_child[panel];
-        m_child[0] = child_panel->m_child[0];
-        m_child[1] = child_panel->m_child[1];
-
-        m_child[0]->m_parent = this;
-        m_child[1]->m_parent = this;
-
-        m_add_child_target = NULL;
-        m_child[0]->m_container->Reparent(m_container);
-        m_child[1]->m_container->Reparent(m_container);
-
-        child_panel->m_child[0] = child_panel->m_child[1] = NULL;
-        delete child_panel;
-
-        wxSize size = m_container->GetSize();
-        wxSize child_size = m_child[0]->m_container->GetSize();
-
-        ConstrainChildren(child_size.GetWidth() * 100 / size.GetWidth(),
-                            child_size.GetHeight() * 100 / size.GetHeight());
-
-        m_container->Layout();
-    }
-}
-
-void wxDynamicSashWindowImpl::Split(int px, int py)
-{
-
-    m_add_child_target = NULL;
-
-    m_child[0] = new wxDynamicSashWindowImpl(m_window);
-    m_child[0]->m_container = new wxWindow(m_container, wxID_ANY);
-    m_child[0]->m_parent = this;
-    m_child[0]->m_top = m_top;
-    m_child[0]->Create();
-    if (m_leaf->m_child)
-    {
-        m_leaf->m_child->Reparent(m_container);
-        m_child[0]->AddChild(m_leaf->m_child);
-    }
-
-    m_child[1] = new wxDynamicSashWindowImpl(m_window);
-    m_child[1]->m_container = new wxWindow(m_container, wxID_ANY);
-    m_child[1]->m_parent = this;
-    m_child[1]->m_top = m_top;
-    m_child[1]->Create();
-
-    m_split = m_dragging;
-    ConstrainChildren(px, py);
-
-    m_top->m_add_child_target = m_child[1];
-    wxDynamicSashSplitEvent split(m_child[0]->m_leaf->m_child);
-    m_child[0]->m_leaf->m_child->ProcessEvent(split);
-
-    m_child[0]->m_leaf->m_vscroll->SetScrollbar(m_leaf->m_vscroll->GetThumbPosition(),
-                                                m_leaf->m_vscroll->GetThumbSize(),
-                                                m_leaf->m_vscroll->GetRange(),
-                                                m_leaf->m_vscroll->GetPageSize());
-    m_child[0]->m_leaf->m_hscroll->SetScrollbar(m_leaf->m_hscroll->GetThumbPosition(),
-                                                m_leaf->m_hscroll->GetThumbSize(),
-                                                m_leaf->m_hscroll->GetRange(),
-                                                m_leaf->m_hscroll->GetPageSize());
-    m_child[1]->m_leaf->m_vscroll->SetScrollbar(m_leaf->m_vscroll->GetThumbPosition(),
-                                                m_leaf->m_vscroll->GetThumbSize(),
-                                                m_leaf->m_vscroll->GetRange(),
-                                                m_leaf->m_vscroll->GetPageSize());
-    m_child[1]->m_leaf->m_hscroll->SetScrollbar(m_leaf->m_hscroll->GetThumbPosition(),
-                                                m_leaf->m_hscroll->GetThumbSize(),
-                                                m_leaf->m_hscroll->GetRange(),
-                                                m_leaf->m_hscroll->GetPageSize());
-    delete m_leaf;
-    m_leaf = NULL;
-
-    m_container->Layout();
-}
-
-
-/*  This code is called when you finish resizing a view by dragging the
-    corner tab, but I think this implementation is lousy and will surprise
-    the user more often than it will do what they are trying to do.  What
-    I really need to be doing here is do a rewrite such that *no* sashes
-    move except the ones immediately to the bottom and right of this window,
-    and handle the case where you resize a window larger than it's neighbors
-    by destroying the neighbors.
-
-    But this will do for now.  */
-void wxDynamicSashWindowImpl::Resize(int x, int y)
-{
-    wxDynamicSashWindowImpl *h_parent = FindParent(DSR_BOTTOM_EDGE);
-    wxDynamicSashWindowImpl *v_parent = FindParent(DSR_RIGHT_EDGE);
-    int h_unify = -1;
-    int v_unify = -1;
-    wxWindow *frame = FindFrame();
-
-    if (x < 0)
-        x = 0;
-    if (y < 0)
-        y = 0;
-
-    if (h_parent)
-    {
-        m_container->ClientToScreen(NULL, &y);
-        h_parent->m_container->ScreenToClient(NULL, &y);
-
-        int py = (int)((y * 100) / h_parent->m_container->GetSize().GetHeight() + 0.5);
-
-        if (py < 10)
-        {
-            wxDynamicSashWindowImpl *ho_parent = FindParent(DSR_TOP_EDGE);
-
-            if (ho_parent)
-            {
-                if (FindUpperParent(h_parent, ho_parent) == ho_parent)
-                {
-                    h_unify = 1;
-                }
-                else
-                {
-                    py = (int)((ho_parent->m_child[0]->m_container->GetSize().GetHeight() * 100)
-                                / h_parent->m_container->GetSize().GetHeight() + 0.5);
-                    h_parent->m_child[0]->m_container->GetConstraints()->height.PercentOf(
-                            h_parent->m_container, wxHeight, py);
-
-                    h_parent = ho_parent;
-                    h_unify = 0;
-                }
-            }
-            else
-            {
-                h_unify = 1;
-            }
-        }
-        else if (py > 90)
-        {
-            h_unify = 0;
-        }
-        else
-        {
-            h_parent->m_child[0]->m_container->GetConstraints()->height.PercentOf(
-                    h_parent->m_container, wxHeight, py);
-            h_parent->m_container->Layout();
-        }
-    }
-    else
-    {
-        int do_resize = 1;
-        h_parent = FindParent(DSR_TOP_EDGE);
-
-        if (h_parent)
-        {
-            int py = (int)((y * 100) /
-                        (h_parent->m_container->GetSize().GetHeight() +
-                                y - m_container->GetSize().GetHeight()) + 0.5);
-
-            if (py < 10)
-                h_unify = 0;
-        }
-        else if (y < 64)
-        {
-            do_resize = 0;
-        }
-
-        if (do_resize)
-        {
-            wxSize size = frame->GetSize();
-            frame->SetSize(size.GetWidth(), size.GetHeight() + y - m_container->GetSize().GetHeight());
-        }
-    }
-
-    if (v_parent)
-    {
-        m_container->ClientToScreen(&x, NULL);
-        v_parent->m_container->ScreenToClient(&x, NULL);
-
-        int px = (int)((x * 100) / v_parent->m_container->GetSize().GetWidth() + 0.5);
-
-        if (px < 10)
-        {
-            wxDynamicSashWindowImpl *vo_parent = FindParent(DSR_LEFT_EDGE);
-
-            if (vo_parent)
-            {
-                if (FindUpperParent(v_parent, vo_parent) == vo_parent)
-                {
-                    v_unify = 1;
-                }
-                else
-                {
-                    px = (int)((vo_parent->m_child[0]->m_container->GetSize().GetWidth() * 100)
-                                / v_parent->m_container->GetSize().GetWidth() + 0.5);
-                    v_parent->m_child[0]->m_container->GetConstraints()->width.PercentOf(
-                            v_parent->m_container, wxWidth, px);
-
-                    v_parent = vo_parent;
-                    v_unify = 0;
-                }
-            }
-            else
-            {
-                v_unify = 1;
-            }
-        }
-        else if (px > 90)
-        {
-            v_unify = 0;
-        }
-        else
-        {
-            v_parent->m_child[0]->m_container->GetConstraints()->width.PercentOf(
-                    v_parent->m_container, wxWidth, px);
-            v_parent->m_container->Layout();
-        }
-    }
-    else
-    {
-        int do_resize = 1;
-        v_parent = FindParent(DSR_LEFT_EDGE);
-
-        if (v_parent)
-        {
-            int px = (int)((x * 100) /
-                        (v_parent->m_container->GetSize().GetWidth() +
-                                x - m_container->GetSize().GetWidth()) + 0.5);
-
-            if (px < 10)
-                v_unify = 0;
-        }
-        else if (x < 64)
-        {
-            do_resize = 0;
-        }
-
-        if (do_resize)
-        {
-            wxSize size = frame->GetSize();
-            frame->SetSize(size.GetWidth() + x - m_container->GetSize().GetWidth(), size.GetHeight());
-        }
-    }
-
-    if (h_unify != -1 && v_unify != -1)
-    {
-        wxDynamicSashWindowImpl *parent = FindUpperParent(h_parent, v_parent);
-
-        if (parent == h_parent)
-        {
-            h_parent->Unify(h_unify);
-        }
-        else
-        {
-            v_parent->Unify(v_unify);
-        }
-    }
-    else if (h_unify != -1)
-    {
-        h_parent->Unify(h_unify);
-    }
-    else if (v_unify != -1)
-    {
-        v_parent->Unify(v_unify);
-    }
-}
-
-
-void wxDynamicSashWindowImpl::OnSize(wxSizeEvent &event)
-{
-    m_container->Layout();
-
-    if (m_leaf)
-        m_leaf->OnSize(event);
-}
-
-void wxDynamicSashWindowImpl::OnPaint(wxPaintEvent &event)
-{
-    if (m_leaf)
-        m_leaf->OnPaint(event);
-    else
-    {
-        wxPaintDC dc(m_container);
-        dc.SetBackground(wxBrush(m_container->GetBackgroundColour(), wxSOLID));
-        dc.Clear();
-    }
-}
-
-void wxDynamicSashWindowImpl::OnMouseMove(wxMouseEvent &event)
-{
-    if (m_dragging)
-    {
-        DrawSash(m_drag_x, m_drag_y);
-        m_drag_x = event.m_x;  m_drag_y = event.m_y;
-        DrawSash(m_drag_x, m_drag_y);
-    }
-    else if (m_leaf)
-    {
-        m_leaf->OnMouseMove(event);
-    }
-}
-
-void wxDynamicSashWindowImpl::OnLeave(wxMouseEvent &event)
-{
-    if (m_leaf)
-        m_leaf->OnLeave(event);
-}
-
-void wxDynamicSashWindowImpl::OnPress(wxMouseEvent &event)
-{
-    if (m_leaf)
-    {
-        m_leaf->OnPress(event);
-    }
-    else
-    {
-        m_dragging = m_split;
-        m_drag_x = event.m_x;
-        m_drag_y = event.m_y;
-        DrawSash(m_drag_x, m_drag_y);
-        m_container->CaptureMouse();
-    }
-}
-
-void wxDynamicSashWindowImpl::OnRelease(wxMouseEvent &event)
-{
-    if ((m_dragging == DSR_CORNER) &&
-        (m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
-    {
-        DrawSash(m_drag_x, m_drag_y);
-        m_container->ReleaseMouse();
-
-        Resize(event.m_x, event.m_y);
-
-        m_dragging = DSR_NONE;
-    }
-    else if (m_dragging)
-    {
-        DrawSash(m_drag_x, m_drag_y);
-        m_container->ReleaseMouse();
-
-        wxSize size = m_container->GetSize();
-        int px = (int)((event.m_x * 100) / size.GetWidth() + 0.5);
-        int py = (int)((event.m_y * 100) / size.GetHeight() + 0.5);
-
-        if ((m_dragging == DSR_HORIZONTAL_TAB && py >= 10 && py <= 90)
-                    || (m_dragging == DSR_VERTICAL_TAB && px >= 10 && px <= 90))
-        {
-            if (m_child[0] == NULL)
-            {
-                Split(px, py);
-            }
-            else
-            {
-                /*  It would be nice if moving *this* sash didn't implicitly move
-                    the sashes of our children (if any).  But this will do.  */
-                wxLayoutConstraints *layout = m_child[0]->m_container->GetConstraints();
-                if (m_split == DSR_HORIZONTAL_TAB)
-                {
-                    layout->height.PercentOf(m_container, wxHeight, py);
-                }
-                else
-                {
-                    layout->width.PercentOf(m_container, wxWidth, px);
-                }
-                m_container->Layout();
-            }
-        }
-        else
-        {
-            if (m_child[0] != NULL)
-            {
-                if ((m_dragging == DSR_HORIZONTAL_TAB && py <= 10)
-                        || (m_dragging == DSR_VERTICAL_TAB && px <= 10))
-                {
-                    Unify(1);
-                }
-                else
-                {
-                    Unify(0);
-                }
-            }
-        }
-
-        wxCursor cursor;
-        if (m_split == DSR_HORIZONTAL_TAB)
-            cursor = wxCursor(wxCURSOR_SIZENS);
-        else if (m_split == DSR_VERTICAL_TAB)
-            cursor = wxCursor(wxCURSOR_SIZEWE);
-        else
-            cursor = wxCursor(wxCURSOR_ARROW);
-
-        m_container->SetCursor(cursor);
-
-        m_dragging = DSR_NONE;
-    }
-    else if (m_leaf)
-    {
-        m_leaf->OnRelease(event);
-    }
-}
-
-// ============================================================================
-// wxDynamicSashWindowLeaf
-// ============================================================================
-
-wxDynamicSashWindowLeaf::wxDynamicSashWindowLeaf(wxDynamicSashWindowImpl *impl)
-{
-    m_impl = impl;
-
-    m_hscroll =
-    m_vscroll = NULL;
-
-    m_child = NULL;
-}
-
-wxDynamicSashWindowLeaf::~wxDynamicSashWindowLeaf()
-{
-    m_hscroll->SetEventHandler(m_hscroll);
-    m_vscroll->SetEventHandler(m_vscroll);
-
-    m_hscroll->Destroy();
-    m_vscroll->Destroy();
-    m_viewport->Destroy();
-}
-
-bool wxDynamicSashWindowLeaf::Create()
-{
-    m_hscroll = new wxScrollBar();
-    m_vscroll = new wxScrollBar();
-    m_viewport = new wxWindow();
-
-    wxDynamicSashWindowImpl *add_child_target = m_impl->m_add_child_target;
-    m_impl->m_add_child_target = NULL;
-
-    bool success = m_hscroll->Create(m_impl->m_container, wxID_ANY,
-                                     wxDefaultPosition, wxDefaultSize,
-                                     wxSB_HORIZONTAL);
-    if ( success )
-        success = m_vscroll->Create(m_impl->m_container, wxID_ANY,
-                                    wxDefaultPosition, wxDefaultSize,
-                                    wxSB_VERTICAL);
-    if ( success )
-        success = m_viewport->Create(m_impl->m_container, wxID_ANY);
-    if ( !success )
-        return false;
-
-    m_impl->m_add_child_target = add_child_target;
-
-    wxCursor cursor(wxCURSOR_ARROW);
-    m_hscroll->SetCursor(cursor);
-    m_vscroll->SetCursor(cursor);
-    m_viewport->SetCursor(cursor);
-
-    // the viewport must resize its child when it is itself resized, but it's
-    // more convenient to do it in our own method instead of deriving a new
-    // class just for this: this is why we pass this as last Connect() argument
-    m_viewport->Connect(wxEVT_SIZE,
-                        wxSizeEventHandler(wxDynamicSashWindowLeaf::OnViewSize),
-                        NULL, this);
-
-    Connect(wxEVT_DYNAMIC_SASH_REPARENT,
-            wxEventHandler(wxDynamicSashWindowLeaf::OnReparent));
-
-    if (m_impl->m_window->GetWindowStyle() & wxDS_MANAGE_SCROLLBARS)
-    {
-        m_hscroll->SetEventHandler(this);
-        m_vscroll->SetEventHandler(this);
-
-        Connect(wxEVT_SET_FOCUS,
-                wxFocusEventHandler(wxDynamicSashWindowLeaf::OnFocus));
-        Connect(wxEVT_SCROLL_TOP,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_BOTTOM,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_LINEUP,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_LINEDOWN,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_PAGEUP,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_PAGEDOWN,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_THUMBTRACK,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-        Connect(wxEVT_SCROLL_THUMBRELEASE,
-                wxScrollEventHandler(wxDynamicSashWindowLeaf::OnScroll));
-    }
-
-    wxLayoutConstraints *layout = new wxLayoutConstraints();
-    if (!layout)
-        return false;
-
-    wxSize size = m_hscroll->GetBestSize();
-
-    layout->left.SameAs(m_impl->m_container, wxLeft, 10);
-    layout->right.LeftOf(m_vscroll);
-    layout->bottom.SameAs(m_impl->m_container, wxBottom, 3);
-    layout->height.Absolute(size.GetHeight());
-    m_hscroll->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    if (!layout)
-        return false;
-
-    size = m_vscroll->GetBestSize();
-
-    layout->top.SameAs(m_impl->m_container, wxTop, 10);
-    layout->bottom.Above(m_hscroll);
-    layout->right.SameAs(m_impl->m_container, wxRight, 3);
-    layout->width.Absolute(size.GetWidth());
-    m_vscroll->SetConstraints(layout);
-
-    layout = new wxLayoutConstraints();
-    if (!layout)
-        return false;
-    layout->left.SameAs(m_impl->m_container, wxLeft, 3);
-    layout->right.LeftOf(m_vscroll);
-    layout->top.SameAs(m_impl->m_container, wxTop, 3);
-    layout->bottom.Above(m_hscroll);
-    m_viewport->SetConstraints(layout);
-
-    m_impl->m_container->Layout();
-
-    return true;
-}
-
-void wxDynamicSashWindowLeaf::AddChild(wxWindow *window)
-{
-    if (m_child)
-        m_child->Destroy();
-
-    m_child = window;
-
-    wxDynamicSashReparentEvent event(this);
-    AddPendingEvent(event);
-}
-
-DynamicSashRegion wxDynamicSashWindowLeaf::GetRegion(int x, int y)
-{
-    wxSize size = m_impl->m_container->GetSize();
-    int w = size.GetWidth();
-    int h = size.GetHeight();
-    size = m_hscroll->GetSize();
-    int sh = size.GetHeight();
-    size = m_vscroll->GetSize();
-    int sw = size.GetWidth();
-
-    if (x >= w - sw - 3 && x < w && y >= h - sh - 3 && y < h)
-        return DSR_CORNER;
-    if (x >= 3 && x < 10 && y >= h - sh - 3 && y < h - 2)
-        return DSR_VERTICAL_TAB;
-    if (x >= w - sw - 3 && x < w - 2 && y >= 3 && y < 10)
-        return DSR_HORIZONTAL_TAB;
-    if (x < 3)
-        return DSR_LEFT_EDGE;
-    if (y < 3)
-        return DSR_TOP_EDGE;
-    if (x >= w - 2)
-        return DSR_RIGHT_EDGE;
-    if (y >= h - 2)
-        return DSR_BOTTOM_EDGE;
-
-    return DSR_NONE;
-}
-
-void wxDynamicSashWindowLeaf::ResizeChild(const wxSize& size)
-{
-    if (m_child)
-    {
-        if (m_impl->m_window->HasFlag(wxDS_MANAGE_SCROLLBARS))
-        {
-            wxSize best_size = m_child->GetBestSize();
-            if (best_size.GetWidth() < size.GetWidth())
-                best_size.SetWidth(size.GetWidth());
-            if (best_size.GetHeight() < size.GetHeight())
-                best_size.SetHeight(size.GetHeight());
-            m_child->SetSize(best_size);
-
-            int hpos = m_hscroll->GetThumbPosition();
-            int vpos = m_vscroll->GetThumbPosition();
-
-            if (hpos < 0)
-                hpos = 0;
-            if (vpos < 0)
-                vpos = 0;
-            if (hpos > best_size.GetWidth() - size.GetWidth())
-                hpos = best_size.GetWidth() - size.GetWidth();
-            if (vpos > best_size.GetHeight() - size.GetHeight())
-                vpos = best_size.GetHeight() - size.GetHeight();
-
-            m_hscroll->SetScrollbar(hpos, size.GetWidth(),
-                                    best_size.GetWidth(), size.GetWidth());
-            m_vscroll->SetScrollbar(vpos, size.GetHeight(),
-                                    best_size.GetHeight(), size.GetHeight());
-
-            //  Umm, the scrollbars are doing something insane under GTK+ and subtracting
-            //  one from the position I pass in.  This works around that.
-            m_hscroll->SetThumbPosition(hpos + hpos - m_hscroll->GetThumbPosition());
-            m_vscroll->SetThumbPosition(vpos + vpos - m_vscroll->GetThumbPosition());
-
-            wxPoint pos = m_child->GetPosition();
-            m_viewport->ScrollWindow(-hpos - pos.x, -vpos - pos.y);
-        }
-        else // !wxDS_MANAGE_SCROLLBARS
-        {
-            m_child->SetSize(size);
-        }
-    }
-}
-
-wxScrollBar *
-wxDynamicSashWindowLeaf::FindScrollBar(const wxWindow *child, int vert) const
-{
-    if (m_child == child)
-    {
-        return vert ? m_vscroll : m_hscroll;
-    }
-
-    return NULL;
-}
-
-void wxDynamicSashWindowLeaf::OnSize(wxSizeEvent &WXUNUSED(event))
-{
-    m_impl->m_container->Refresh();
-}
-
-void wxDynamicSashWindowLeaf::OnViewSize(wxSizeEvent &WXUNUSED(event))
-{
-    if ( m_viewport )
-        ResizeChild(m_viewport->GetSize());
-}
-
-void wxDynamicSashWindowLeaf::OnPaint(wxPaintEvent &WXUNUSED(event))
-{
-    wxPaintDC dc(m_impl->m_container);
-    dc.SetBackground(wxBrush(m_impl->m_container->GetBackgroundColour(), wxSOLID));
-    dc.Clear();
-
-    wxPen highlight(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT), 1, wxSOLID);
-    wxPen shadow(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), 1, wxSOLID);
-    wxPen black(*wxBLACK, 1, wxSOLID);
-
-    wxSize size = m_impl->m_container->GetSize();
-    int w = size.GetWidth();
-    int h = size.GetHeight();
-    size = m_hscroll->GetSize();
-    int sh = size.GetHeight();
-    size = m_vscroll->GetSize();
-    int sw = size.GetWidth();
-
-    dc.SetPen(shadow);
-    dc.DrawLine(1, 1, 1, h - 2);
-    dc.DrawLine(1, 1, w - 2, 1);
-    dc.SetPen(black);
-    dc.DrawLine(2, 2, 2, h - 3);
-    dc.DrawLine(2, 2, w - 3, 2);
-    dc.SetPen(highlight);
-    dc.DrawLine(w - 2, 2, w - 2, h - sh - 2);
-    dc.DrawLine(w - 2, h - sh - 2, w - sw - 2, h - sh - 2);
-    dc.DrawLine(w - sw - 2, h - sh - 2, w - sw - 2, h - 2);
-    dc.DrawLine(w - sw - 2, h - 2, 2, h - 2);
-
-    dc.SetPen(highlight);
-    dc.DrawLine(w - sw - 2, 8, w - sw - 2, 4);
-    dc.DrawLine(w - sw - 2, 4, w - 5, 4);
-    dc.SetPen(shadow);
-    dc.DrawLine(w - 5, 4, w - 5, 8);
-    dc.DrawLine(w - 5, 8, w - sw - 2, 8);
-    dc.SetPen(black);
-    dc.DrawLine(w - 4, 3, w - 4, 9);
-    dc.DrawLine(w - 4, 9, w - sw - 3, 9);
-
-    dc.SetPen(highlight);
-    dc.DrawLine(4, h - 5, 4, h - sh - 2);
-    dc.DrawLine(4, h - sh - 2, 8, h - sh - 2);
-    dc.SetPen(shadow);
-    dc.DrawLine(8, h - sh - 2, 8, h - 5);
-    dc.DrawLine(8, h - 5, 4, h - 5);
-    dc.SetPen(black);
-    dc.DrawLine(9, h - sh - 3, 9, h - 4);
-    dc.DrawLine(9, h - 4, 3, h - 4);
-
-    int cy = (h - sh + h - 6) / 2 + 1;
-    int cx = (w - sw + w - 6) / 2 + 1;
-    int sy = cy;
-    while (sy > h - sh)
-        sy -= 4;
-    int sx = cx;
-    while (sx > w - sw)
-        sx -= 4;
-
-    int x, y;
-    for (y = sy; y < h - 2; y += 4)
-    {
-        for (x = sx; x < w - 2; x += 4)
-        {
-            if (x - cx >= -(y - cy))
-            {
-                dc.SetPen(highlight);
-                dc.DrawPoint(x, y);
-                dc.SetPen(shadow);
-                dc.DrawPoint(x + 1, y + 1);
-            }
-        }
-    }
-}
-
-void wxDynamicSashWindowLeaf::OnScroll(wxScrollEvent &WXUNUSED(event))
-{
-    int nx = -m_hscroll->GetThumbPosition();
-    int ny = -m_vscroll->GetThumbPosition();
-
-    if (m_child)
-    {
-        wxPoint pos = m_child->GetPosition();
-
-        m_viewport->ScrollWindow(nx - pos.x, ny - pos.y);
-    }
-}
-
-void wxDynamicSashWindowLeaf::OnFocus(wxFocusEvent &event)
-{
-    if ( event.GetEventObject() == m_hscroll ||
-            event.GetEventObject() == m_vscroll )
-    {
-        m_child->SetFocus();
-    }
-}
-
-
-void wxDynamicSashWindowLeaf::OnMouseMove(wxMouseEvent &event)
-{
-    if (m_impl->m_dragging)
-        return;
-
-    DynamicSashRegion region = GetRegion(event.m_x, event.m_y);
-
-    wxCursor cursor(wxCURSOR_ARROW);
-    if (region == DSR_HORIZONTAL_TAB)
-    {
-        cursor = wxCursor(wxCURSOR_SIZENS);
-    }
-    else if (region == DSR_VERTICAL_TAB)
-    {
-        cursor = wxCursor(wxCURSOR_SIZEWE);
-    }
-    else if ((region == DSR_CORNER) &&
-               (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) != 0)
-    {
-        cursor = wxCursor(wxCURSOR_SIZENWSE);
-    }
-    else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
-                || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE)
-    {
-        if (m_impl->FindParent(region))
-        {
-            if (region == DSR_LEFT_EDGE || region == DSR_RIGHT_EDGE)
-            {
-                cursor = wxCursor(wxCURSOR_SIZEWE);
-            }
-            else
-            {
-                cursor = wxCursor(wxCURSOR_SIZENS);
-            }
-        }
-    }
-
-    m_impl->m_container->SetCursor(cursor);
-}
-
-void wxDynamicSashWindowLeaf::OnLeave(wxMouseEvent &WXUNUSED(event))
-{
-    wxCursor cursor(wxCURSOR_ARROW);
-    m_impl->m_container->SetCursor(cursor);
-}
-
-
-void wxDynamicSashWindowLeaf::OnPress(wxMouseEvent &event)
-{
-    DynamicSashRegion region = GetRegion(event.m_x, event.m_y);
-
-    if ((region == DSR_CORNER) && (m_impl->m_window->GetWindowStyle() & wxDS_DRAG_CORNER) == 0)
-        return;
-
-    if (region == DSR_HORIZONTAL_TAB || region == DSR_VERTICAL_TAB || region == DSR_CORNER)
-    {
-        m_impl->m_dragging = region;
-        m_impl->m_drag_x = event.m_x;
-        m_impl->m_drag_y = event.m_y;
-        m_impl->DrawSash(event.m_x, event.m_y);
-        m_impl->m_container->CaptureMouse();
-    }
-    else if (region == DSR_LEFT_EDGE || region == DSR_TOP_EDGE
-                || region == DSR_RIGHT_EDGE || region == DSR_BOTTOM_EDGE)
-    {
-        wxDynamicSashWindowImpl *parent = m_impl->FindParent(region);
-
-        if (parent)
-        {
-            int x = event.m_x;
-            int y = event.m_y;
-
-            m_impl->m_container->ClientToScreen(&x, &y);
-            parent->m_container->ScreenToClient(&x, &y);
-
-            parent->m_dragging = parent->m_split;
-            parent->m_drag_x = x;
-            parent->m_drag_y = y;
-            parent->DrawSash(x, y);
-            parent->m_container->CaptureMouse();
-        }
-    }
-}
-
-void wxDynamicSashWindowLeaf::OnRelease(wxMouseEvent &WXUNUSED(event))
-{
-}
-
-void wxDynamicSashWindowLeaf::OnReparent(wxEvent &WXUNUSED(event))
-{
-    if (m_child)
-    {
-        m_child->Reparent(m_viewport);
-    }
-
-    ResizeChild(m_viewport->GetSize());
-}
-
-// ============================================================================
-// events
-// ============================================================================
-
-wxDynamicSashSplitEvent::wxDynamicSashSplitEvent()
-{
-    m_eventObject = NULL;
-    m_eventType = wxEVT_DYNAMIC_SASH_SPLIT;
-}
-
-wxDynamicSashSplitEvent::wxDynamicSashSplitEvent(wxObject *object)
-{
-    m_eventObject = object;
-    m_eventType = wxEVT_DYNAMIC_SASH_SPLIT;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashSplitEvent, wxCommandEvent)
-
-wxDynamicSashUnifyEvent::wxDynamicSashUnifyEvent()
-{
-    m_eventObject = NULL;
-    m_eventType = wxEVT_DYNAMIC_SASH_UNIFY;
-}
-
-wxDynamicSashUnifyEvent::wxDynamicSashUnifyEvent(wxObject *object)
-{
-    m_eventObject = object;
-    m_eventType = wxEVT_DYNAMIC_SASH_UNIFY;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashUnifyEvent, wxCommandEvent)
-
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent()
-{
-    m_eventObject = NULL;
-    m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
-}
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(wxObject *object)
-{
-    m_eventObject = object;
-    m_eventType = wxEVT_DYNAMIC_SASH_REPARENT;
-}
-
-wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(const wxDynamicSashReparentEvent& evt)
-    : wxEvent(evt)
-{
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)
-
diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
deleted file mode 100644
index 38fd1429e2..0000000000
--- a/contrib/src/gizmos/editlbox.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        editlbox.cpp
-// Purpose:     ListBox with editable items
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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
-
-#include "wx/gizmos/editlbox.h"
-#include "wx/sizer.h"
-#include "wx/listctrl.h"
-
-
-
-
-// list control with auto-resizable column:
-class CleverListCtrl : public wxListCtrl
-{
-public:
-   CleverListCtrl(wxWindow *parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint &pos = wxDefaultPosition,
-                  const wxSize &size = wxDefaultSize,
-                  long style = wxLC_ICON,
-                  const wxValidator& validator = wxDefaultValidator,
-                  const wxString &name = wxListCtrlNameStr)
-         : wxListCtrl(parent, id, pos, size, style, validator, name)
-    {
-        CreateColumns();
-    }
-
-    void CreateColumns()
-    {
-        InsertColumn(0, _T("item"));
-        SizeColumns();
-    }
-
-    void SizeColumns()
-    {
-         int w = GetSize().x;
-#ifdef __WXMSW__
-         w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6;
-#else
-         w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-#endif
-         SetColumnWidth(0, w);
-    }
-
-private:
-    DECLARE_EVENT_TABLE()
-    void OnSize(wxSizeEvent& event)
-    {
-        SizeColumns();
-        event.Skip();
-    }
-};
-
-BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
-   EVT_SIZE(CleverListCtrl::OnSize)
-END_EVENT_TABLE()
-
-#include "eldel.xpm"
-#include "eldown.xpm"
-#include "eledit.xpm"
-#include "elnew.xpm"
-#include "elup.xpm"
-
-IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
-
-// NB: generate the IDs at runtime to avoid conflict with XRCID values,
-//     they could cause XRCCTRL() failures in XRC-based dialogs
-const int wxID_ELB_DELETE = wxNewId();
-const int wxID_ELB_EDIT = wxNewId();
-const int wxID_ELB_NEW = wxNewId();
-const int wxID_ELB_UP = wxNewId();
-const int wxID_ELB_DOWN = wxNewId();
-const int wxID_ELB_LISTCTRL = wxNewId();
-
-BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
-    EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
-    EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit)
-    EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem)
-    EVT_BUTTON(wxID_ELB_UP, wxEditableListBox::OnUpItem)
-    EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem)
-    EVT_BUTTON(wxID_ELB_EDIT, wxEditableListBox::OnEditItem)
-    EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem)
-END_EVENT_TABLE()
-
-wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
-                          const wxString& label,
-                          const wxPoint& pos, const wxSize& size,
-                          long style,
-                          const wxString& name)
-   : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name)
-{
-    m_style = style;
-    m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
-
-    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-
-    wxPanel *subp = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
-    wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
-    subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4);
-
-#ifdef __WXMSW__
-    #define BTN_BORDER 4
-    // FIXME - why is this needed? There's some reason why sunken border is
-    //         ignored by sizers in wxMSW but not in wxGTK that I can't
-    //         figure out...
-#else
-    #define BTN_BORDER 0
-#endif
-
-    if ( m_style & wxEL_ALLOW_EDIT )
-    {
-        m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, wxBitmap(eledit_xpm));
-        subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-    }
-
-    if ( m_style & wxEL_ALLOW_NEW )
-    {
-        m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, wxBitmap(elnew_xpm));
-        subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-    }
-
-    if ( m_style & wxEL_ALLOW_DELETE )
-    {
-        m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm));
-        subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-    }
-
-    if (!(m_style & wxEL_NO_REORDER))
-    {
-        m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm));
-        subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-
-        m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm));
-        subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
-    }
-
-#if wxUSE_TOOLTIPS
-    if ( m_bEdit ) m_bEdit->SetToolTip(_("Edit item"));
-    if ( m_bNew ) m_bNew->SetToolTip(_("New item"));
-    if ( m_bDel ) m_bDel->SetToolTip(_("Delete item"));
-    if ( m_bUp ) m_bUp->SetToolTip(_("Move up"));
-    if ( m_bDown ) m_bDown->SetToolTip(_("Move down"));
-#endif
-
-    subp->SetSizer(subsizer);
-    subsizer->Fit(subp);
-
-    sizer->Add(subp, 0, wxEXPAND);
-
-    long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER;
-    if ( style & wxEL_ALLOW_EDIT )
-         st |= wxLC_EDIT_LABELS;
-    m_listCtrl = new CleverListCtrl(this, wxID_ELB_LISTCTRL,
-                                    wxDefaultPosition, wxDefaultSize, st);
-    wxArrayString empty_ar;
-    SetStrings(empty_ar);
-
-    sizer->Add(m_listCtrl, 1, wxEXPAND);
-
-    SetSizer(sizer);
-    Layout();
-}
-
-void wxEditableListBox::SetStrings(const wxArrayString& strings)
-{
-    m_listCtrl->DeleteAllItems();
-    size_t i;
-
-    for (i = 0; i < strings.GetCount(); i++)
-        m_listCtrl->InsertItem(i, strings[i]);
-
-    m_listCtrl->InsertItem(strings.GetCount(), wxEmptyString);
-    m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::GetStrings(wxArrayString& strings) const
-{
-    strings.Clear();
-
-    for (int i = 0; i < m_listCtrl->GetItemCount()-1; i++)
-        strings.Add(m_listCtrl->GetItemText(i));
-}
-
-void wxEditableListBox::OnItemSelected(wxListEvent& event)
-{
-    m_selection = event.GetIndex();
-    if (!(m_style & wxEL_NO_REORDER))
-    {
-        m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1);
-        m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2);
-    }
-
-    if (m_style & wxEL_ALLOW_EDIT)
-        m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1);
-    if (m_style & wxEL_ALLOW_DELETE)
-        m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1);
-}
-
-void wxEditableListBox::OnNewItem(wxCommandEvent& WXUNUSED(event))
-{
-    m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1,
-                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-    m_listCtrl->EditLabel(m_selection);
-}
-
-void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
-{
-    if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 &&
-         !event.GetText().empty() )
-    {
-        // The user edited last (empty) line, i.e. added new entry. We have to
-        // add new empty line here so that adding one more line is still
-        // possible:
-        m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
-
-        // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
-        // so that the buttons are enabled/disabled properly
-        wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
-        selectionEvent.m_itemIndex = event.GetIndex();
-        m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
-    }
-}
-
-void wxEditableListBox::OnDelItem(wxCommandEvent& WXUNUSED(event))
-{
-    m_listCtrl->DeleteItem(m_selection);
-    m_listCtrl->SetItemState(m_selection,
-                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event))
-{
-    m_listCtrl->EditLabel(m_selection);
-}
-
-void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))
-{
-    wxString t1, t2;
-
-    t1 = m_listCtrl->GetItemText(m_selection - 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection - 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
-    m_listCtrl->SetItemState(m_selection - 1,
-                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
-{
-    wxString t1, t2;
-
-    t1 = m_listCtrl->GetItemText(m_selection + 1);
-    t2 = m_listCtrl->GetItemText(m_selection);
-    m_listCtrl->SetItemText(m_selection + 1, t2);
-    m_listCtrl->SetItemText(m_selection, t1);
-    m_listCtrl->SetItemState(m_selection + 1,
-                             wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
diff --git a/contrib/src/gizmos/eldel.xpm b/contrib/src/gizmos/eldel.xpm
deleted file mode 100644
index 9b83bb0441..0000000000
--- a/contrib/src/gizmos/eldel.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * eldel_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #7F0000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-" ..+        ..+ ",
-" ....+     ..+  ",
-"  ....+   ..+   ",
-"    ...+ .+     ",
-"     .....+     ",
-"      ...+      ",
-"     .....+     ",
-"    ...+ ..+    ",
-"   ...+   ..+   ",
-"  ...+     .+   ",
-"  ...+      .+  ",
-"   .         .  ",
-"                "};
diff --git a/contrib/src/gizmos/eldown.xpm b/contrib/src/gizmos/eldown.xpm
deleted file mode 100644
index 656cb9c4f1..0000000000
--- a/contrib/src/gizmos/eldown.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * eldown_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"         ...    ",
-"        ...     ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"   ...........  ",
-"    .........   ",
-"     .......    ",
-"      .....     ",
-"       ...      ",
-"        .       ",
-"                ",
-"                "};
diff --git a/contrib/src/gizmos/eledit.xpm b/contrib/src/gizmos/eledit.xpm
deleted file mode 100644
index 4cbd05eafd..0000000000
--- a/contrib/src/gizmos/eledit.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * eledit_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #00007F",
-"                ",
-"                ",
-"      .. ..     ",
-"        .       ",
-"        .       ",
-"  ++++  .  ++++ ",
-"     ++ . ++  ++",
-"  +++++ . ++++++",
-" ++  ++ . ++    ",
-" ++  ++ . ++  ++",
-"  +++++ .  ++++ ",
-"        .       ",
-"        .       ",
-"      .. ..     ",
-"                ",
-"                "};
diff --git a/contrib/src/gizmos/elnew.xpm b/contrib/src/gizmos/elnew.xpm
deleted file mode 100644
index 3d0d67f4ac..0000000000
--- a/contrib/src/gizmos/elnew.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * elnew_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #7F7F7F",
-"+	c #FFFFFF",
-"@	c #FFFF00",
-"#	c #000000",
-"                ",
-"                ",
-" .  .+ .@       ",
-"  . .@.@# # #   ",
-"  @.@+....   #  ",
-" ... @@         ",
-"  @ . @.     #  ",
-" .# .@          ",
-"    .        #  ",
-"  #             ",
-"             #  ",
-"  #             ",
-"             #  ",
-"  # # # # # #   ",
-"                ",
-"                "};
diff --git a/contrib/src/gizmos/elup.xpm b/contrib/src/gizmos/elup.xpm
deleted file mode 100644
index 01193ed821..0000000000
--- a/contrib/src/gizmos/elup.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * elup_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"        .       ",
-"       ...      ",
-"      .....     ",
-"     .......    ",
-"    .........   ",
-"   ...........  ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"      ...       ",
-"     ...        ",
-"                ",
-"                ",
-"                "};
diff --git a/contrib/src/gizmos/ledctrl.cpp b/contrib/src/gizmos/ledctrl.cpp
deleted file mode 100644
index 458af3f4cc..0000000000
--- a/contrib/src/gizmos/ledctrl.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-// ============================================================================
-// headers
-// ============================================================================
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/gizmos/ledctrl.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// A LED digit is build up like this, with maximum 7 Lines :
-//
-// 111
-// 6 2
-// 777
-// 5 3
-// 444
-//
-// Each number contains combinations of the lines, and they are set up below.
-
-const int LINE1 = 1;
-const int LINE2 = 2;
-const int LINE3 = 4;
-const int LINE4 = 8;
-const int LINE5 = 16;
-const int LINE6 = 32;
-const int LINE7 = 64;
-const int DECIMALSIGN = 128;
-
-const int DIGIT0 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6;
-const int DIGIT1 = LINE2 | LINE3;
-const int DIGIT2 = LINE1 | LINE2 | LINE4 | LINE5 | LINE7;
-const int DIGIT3 = LINE1 | LINE2 | LINE3 | LINE4 | LINE7;
-const int DIGIT4 = LINE2 | LINE3 | LINE6 | LINE7;
-const int DIGIT5 = LINE1 | LINE3 | LINE4 | LINE6 | LINE7;
-const int DIGIT6 = LINE1 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT7 = LINE1 | LINE2 | LINE3;
-const int DIGIT8 = LINE1 | LINE2 | LINE3 | LINE4 | LINE5 | LINE6 | LINE7;
-const int DIGIT9 = LINE1 | LINE2 | LINE3 | LINE6 | LINE7;
-const int DASH   = LINE7;
-
-const int DIGITALL = -1;
-
-// ============================================================================
-// wxLEDNumberCtrl class implementation
-// ============================================================================
-
-wxLEDNumberCtrl::wxLEDNumberCtrl()
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(false),
-    m_LeftStartPos(-1)
-{
-}
-
-
-wxLEDNumberCtrl::wxLEDNumberCtrl(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-:   m_Alignment(wxLED_ALIGN_LEFT),
-    m_LineMargin(-1),
-    m_DigitMargin(-1),
-    m_LineLength(-1),
-    m_LineWidth(-1),
-    m_DrawFaded(false),
-    m_LeftStartPos(-1)
-{
-    Create(parent, id, pos, size, style);
-}
-
-
-bool wxLEDNumberCtrl::Create(wxWindow *parent, wxWindowID id,
-                                 const wxPoint& pos, const wxSize& size,
-                                 long style)
-{
-    bool RetVal = wxControl::Create(parent, id, pos, size, style);
-
-    if ((style & wxLED_DRAW_FADED) != 0)
-        SetDrawFaded(true);
-    if ((style & wxLED_ALIGN_MASK) != 0)
-        SetAlignment((wxLEDValueAlign)(style & wxLED_ALIGN_MASK));
-
-    SetBackgroundColour(*wxBLACK);
-    SetForegroundColour(*wxGREEN);
-
-    return RetVal;
-}
-
-
-void wxLEDNumberCtrl::SetAlignment(wxLEDValueAlign Alignment, bool Redraw)
-{
-    if (Alignment != m_Alignment)
-    {
-        m_Alignment = Alignment;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(false);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetDrawFaded(bool DrawFaded, bool Redraw)
-{
-    if (DrawFaded != m_DrawFaded)
-    {
-        m_DrawFaded = DrawFaded;
-
-        if (Redraw)
-            Refresh(false);
-    }
-}
-
-
-void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
-{
-    if (Value != m_Value)
-    {
-#ifdef __WXDEBUG__
-        if (!Value.empty())
-        {
-            for(size_t i=0; i<Value.Length(); i++) {
-                wxChar ch = Value[i];
-                wxASSERT_MSG((ch>='0' && ch<='9') || ch=='-' || ch==' ' || ch=='.',
-                             wxT("wxLEDNumberCtrl can only display numeric string values."));
-            }
-        }
-#endif
-
-        m_Value = Value;
-        RecalcInternals(GetClientSize());
-
-        if (Redraw)
-            Refresh(false);
-    }
-}
-
-
-BEGIN_EVENT_TABLE(wxLEDNumberCtrl, wxControl)
-    EVT_ERASE_BACKGROUND(wxLEDNumberCtrl::OnEraseBackground)
-    EVT_PAINT(wxLEDNumberCtrl::OnPaint)
-    EVT_SIZE(wxLEDNumberCtrl::OnSize)
-END_EVENT_TABLE()
-
-
-void wxLEDNumberCtrl::OnEraseBackground(wxEraseEvent &WXUNUSED(event))
-{
-}
-
-
-void wxLEDNumberCtrl::OnPaint(wxPaintEvent &WXUNUSED(event))
-{
-    wxPaintDC Dc(this);
-
-    int Width, Height;
-    GetClientSize(&Width, &Height);
-
-    wxBitmap *pMemoryBitmap = new wxBitmap(Width, Height);
-    wxMemoryDC MemDc;
-
-    MemDc.SelectObject(*pMemoryBitmap);
-
-    // Draw background.
-    MemDc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-    MemDc.DrawRectangle(wxRect(0, 0, Width, Height));
-    MemDc.SetBrush(wxNullBrush);
-
-    // Iterate each digit in the value, and draw.
-    const int DigitCount = m_Value.Len();
-    for (int offset=0, i = 0; offset < DigitCount; ++offset, ++i)
-    {
-        wxChar c = m_Value.GetChar(offset);
-
-        // Draw faded lines if wanted.
-        if (m_DrawFaded && (c != _T('.')))
-            DrawDigit(MemDc, DIGITALL, i);
-
-        // Draw the digits.
-        switch (c)
-        {
-            case _T('0') :
-                DrawDigit(MemDc, DIGIT0, i);
-                break;
-            case _T('1') :
-                DrawDigit(MemDc, DIGIT1, i);
-                break;
-            case _T('2') :
-                DrawDigit(MemDc, DIGIT2, i);
-                break;
-            case _T('3') :
-                DrawDigit(MemDc, DIGIT3, i);
-                break;
-            case _T('4') :
-                DrawDigit(MemDc, DIGIT4, i);
-                break;
-            case _T('5') :
-                DrawDigit(MemDc, DIGIT5, i);
-                break;
-            case _T('6') :
-                DrawDigit(MemDc, DIGIT6, i);
-                break;
-            case _T('7') :
-                DrawDigit(MemDc, DIGIT7, i);
-                break;
-            case _T('8') :
-                DrawDigit(MemDc, DIGIT8, i);
-                break;
-            case _T('9') :
-                DrawDigit(MemDc, DIGIT9, i);
-                break;
-            case _T('-') :
-                DrawDigit(MemDc, DASH, i);
-                break;
-            case _T('.') :
-                // Display the decimal in the previous segment
-                i--;
-                DrawDigit(MemDc, DECIMALSIGN, i);
-                break;
-            case _T(' ') :
-                // just skip it
-                break;
-            default :
-                wxFAIL_MSG(wxT("Unknown digit value"));
-                break;
-        }
-    }
-
-    // Blit the memory dc to screen.
-    Dc.Blit(0, 0, Width, Height, &MemDc, 0, 0, wxCOPY);
-    delete pMemoryBitmap;
-}
-
-
-void wxLEDNumberCtrl::DrawDigit(wxDC &Dc, int Digit, int Column)
-{
-    wxColour LineColor(GetForegroundColour());
-
-    if (Digit == DIGITALL)
-    {
-        const unsigned char R = (unsigned char)(LineColor.Red() / 16);
-        const unsigned char G = (unsigned char)(LineColor.Green() / 16);
-        const unsigned char B = (unsigned char)(LineColor.Blue() / 16);
-
-        LineColor.Set(R, G, B);
-    }
-
-    int XPos = m_LeftStartPos + Column * (m_LineLength + m_DigitMargin);
-
-    // Create a pen and draw the lines.
-    wxPen Pen(LineColor, m_LineWidth, wxSOLID);
-    Dc.SetPen(Pen);
-
-    if ((Digit & LINE1))
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineMargin,
-            XPos + m_LineLength + m_LineMargin*2, m_LineMargin);
-    }
-
-    if (Digit & LINE2)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin*3, m_LineMargin*2,
-            XPos + m_LineLength + m_LineMargin*3, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE3)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin*3, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineLength + m_LineMargin*3, m_LineLength*2 + (m_LineMargin*4));
-    }
-
-    if (Digit & LINE4)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*5),
-            XPos + m_LineLength + m_LineMargin*2, m_LineLength*2 + (m_LineMargin*5));
-    }
-
-    if (Digit & LINE5)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineLength + (m_LineMargin*4),
-            XPos + m_LineMargin, m_LineLength*2 + (m_LineMargin*4));
-    }
-
-    if (Digit & LINE6)
-    {
-        Dc.DrawLine(XPos + m_LineMargin, m_LineMargin*2,
-            XPos + m_LineMargin, m_LineLength + (m_LineMargin*2));
-    }
-
-    if (Digit & LINE7)
-    {
-        Dc.DrawLine(XPos + m_LineMargin*2, m_LineLength + (m_LineMargin*3),
-            XPos + m_LineMargin*2 + m_LineLength, m_LineLength + (m_LineMargin*3));
-    }
-
-    if (Digit & DECIMALSIGN)
-    {
-        Dc.DrawLine(XPos + m_LineLength + m_LineMargin*4, m_LineLength*2 + (m_LineMargin*5),
-            XPos + m_LineLength + m_LineMargin*4, m_LineLength*2 + (m_LineMargin*5));
-    }
-
-    Dc.SetPen(wxNullPen);
-}
-
-
-void wxLEDNumberCtrl::RecalcInternals(const wxSize &CurrentSize)
-{
-    // Dimensions of LED segments
-    //
-    // Size of character is based on the HEIGH of the widget, NOT the width.
-    // Segment height is calculated as follows:
-    // Each segment is m_LineLength pixels long.
-    // There is m_LineMargin pixels at the top and bottom of each line segment
-    // There is m_LineMargin pixels at the top and bottom of each digit
-    //
-    //  Therefore, the heigth of each character is:
-    //  m_LineMargin                            : Top digit boarder
-    //  m_LineMargin+m_LineLength+m_LineMargin  : Top half of segment
-    //  m_LineMargin+m_LineLength+m_LineMargin  : Bottom half of segment
-    //  m_LineMargin                            : Bottom digit boarder
-    //  ----------------------
-    //  m_LineMargin*6 + m_LineLength*2 == Total height of digit.
-    //  Therefore, (m_LineMargin*6 + m_LineLength*2) must equal Height
-    //
-    //  Spacing between characters can then be calculated as follows:
-    //  m_LineMargin                            : before the digit,
-    //  m_LineMargin+m_LineLength+m_LineMargin  : for the digit width
-    //  m_LineMargin                            : after the digit
-    //  = m_LineMargin*4 + m_LineLength
-    const int Height = CurrentSize.GetHeight();
-
-    if ((Height * 0.075) < 1)
-        m_LineMargin = 1;
-    else
-        m_LineMargin = (int)(Height * 0.075);
-
-    if ((Height * 0.275) < 1)
-        m_LineLength = 1;
-    else
-        m_LineLength = (int)(Height * 0.275);
-
-    m_LineWidth = m_LineMargin;
-
-    m_DigitMargin = m_LineMargin * 4;
-
-    // Count the number of characters in the string; '.' characters are not
-    // included because they do not take up space in the display
-    int count = 0;
-    for (unsigned int i = 0; i < m_Value.Len(); i++)
-        if (m_Value.GetChar(i) != '.')
-            count++;
-    const int ValueWidth = (m_LineLength + m_DigitMargin) * count;
-    const int ClientWidth = CurrentSize.GetWidth();
-
-    switch (m_Alignment)
-    {
-        case wxLED_ALIGN_LEFT :
-            m_LeftStartPos = m_LineMargin;
-            break;
-        case wxLED_ALIGN_RIGHT :
-            m_LeftStartPos = ClientWidth - ValueWidth - m_LineMargin;
-            break;
-        case wxLED_ALIGN_CENTER :
-            m_LeftStartPos = (ClientWidth - ValueWidth) / 2;
-            break;
-        default :
-            wxFAIL_MSG(wxT("Unknown alignent value for wxLEDNumberCtrl."));
-            break;
-    }
-}
-
-
-void wxLEDNumberCtrl::OnSize(wxSizeEvent &Event)
-{
-    RecalcInternals(Event.GetSize());
-
-    Event.Skip();
-}
diff --git a/contrib/src/gizmos/makedocs.vc b/contrib/src/gizmos/makedocs.vc
deleted file mode 100644
index 94d50692a6..0000000000
--- a/contrib/src/gizmos/makedocs.vc
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# File:         makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=gizmos
-WAITFLAG=/WAIT
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\manual.tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: touchmanual $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: touchmanual $(DOCDIR)\htmlhelp\$(NAME).chm
-htb:	$(DOCDIR)\htb\$(NAME).htb
-hlp: touchmanual $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
-	touch $(DOCSOURCEDIR)\manual.tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp:         $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
-        cd $(DOCSOURCEDIR)
-        -erase $(NAME).ph
-        hcw /c /e $(NAME)
-        move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
-        move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
-        cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
-	echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm:         $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -mkdir $(DOCDIR)\html\$(NAME)
-        copy *.gif $(DOCDIR)\html\$(NAME)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\manual.tex $(DOCDIR)\html\$(NAME)\$(NAME) -html -twice 
-        -erase $(DOCDIR)\html\$(NAME)\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\$(NAME)\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
-	cd $(DOCDIR)\html\$(NAME)
-	-hhc $(NAME).hhp
-    -erase $(DOCDIR)\htmlhelp\$(NAME).chm
-    move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-	cd $(DOCDIR)\html\$(NAME)
-    -erase $(NAME).zip $(NAME).htb
-    zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
-    cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi:	$(DOCSOURCES)
-	cd $(DOCSOURCEDIR)
-        -latex $(NAME)
-        -latex $(NAME)
-        -makeindx $(NAME)
-        -bibtex $(NAME)
-        -latex $(NAME)
-        -latex $(NAME)
-        cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps:	$(DOCSOURCEDIR)\$(NAME).dvi
-	cd $(DOCSOURCEDIR)
-        -dvips32 -o $(NAME).ps $(NAME)
-        move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
-        cd $(THISDIR)
-
diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp
deleted file mode 100644
index 555bc6f659..0000000000
--- a/contrib/src/gizmos/multicell.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        multicell.cpp
-// Purpose:     provide two new classes for layout, wxMultiCellSizer and wxMultiCellCanvas
-// Author:      Jonathan Bayer
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) Jonathan Bayer
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// This was inspired by the gbsizer class written by Alex Andruschak
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/gizmos/multicell.h"
-
-
-
-
-//---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxMultiCellSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxMultiCellItemHandle, wxObject);
-
-//---------------------------------------------------------------------------
-// wxMultiCellItemHandle
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellItemHandle :: wxMultiCellItemHandle
- *
- *Parameters:    int         row
- *               int         column
- *               int         height
- *               int         width
- *               wxSize      size
- *               wxResizable Style
- *               wxSize      weight
- *               int         align
- *
- *Description:   This is the constructor for the class.
- *
- */
-
-void wxMultiCellItemHandle :: Initialize( int row, int column, int height, int width, wxSize size, wxResizable Style, wxSize weight, int align)
-{
-    m_column = column;
-    m_row = row;
-    m_width = width;
-    m_height = height;
-
-    m_style = Style;
-    m_fixedSize = size;
-    m_alignment = align;
-    m_weight = weight;
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, int height, int width, wxSize size, wxResizable Style, wxSize weight, int align)
-{
-    Initialize(row, column,height, width, size, Style, weight, align);
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style, wxSize weight, int align)
-{
-    Initialize(row, column,1, 1, size, style, weight, align);
-}
-//---------------------------------------------------------------------------
-wxMultiCellItemHandle :: wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight, int align)
-{
-    Initialize(row, column, 1, 1, wxSize(1, 1), style, weight, align);
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetColumn() const
-{
-    return m_column;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetRow() const
-{
-    return m_row;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetWidth() const
-{
-    return m_width;
-}
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle::GetHeight() const
-{
-    return m_height;
-}
-//---------------------------------------------------------------------------
-wxResizable    wxMultiCellItemHandle :: GetStyle() const
-{
-    return m_style;
-};
-//---------------------------------------------------------------------------
-wxSize wxMultiCellItemHandle :: GetLocalSize() const
-{
-    return m_fixedSize;
-};
-//---------------------------------------------------------------------------
-int wxMultiCellItemHandle :: GetAlignment() const
-{
-    return m_alignment;
-};
-//---------------------------------------------------------------------------
-wxSize wxMultiCellItemHandle :: GetWeight() const
-{
-    return m_weight;
-};
-
-
-
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// wxMultiCellSizer
-//---------------------------------------------------------------------------
-
-/*
- *Function Name: wxMultiCellSizer::Initialize
- *
- *Parameters:    wxsize Initial size of sizer
- *
- *Description:   This is a common function to initialize all the members of
- *               this class.  It is only called from the constructors
- *
- */
-
-void wxMultiCellSizer::Initialize( wxSize size )
-{
-    m_cell_count = size;
-    m_maxHeight = (int *)malloc((1 + m_cell_count.GetHeight()) * sizeof(int));
-    m_maxWidth = (int *)malloc( (1 + m_cell_count.GetWidth()) * sizeof(int));
-    m_rowStretch = (int *)malloc( (1 + m_cell_count.GetHeight()) * sizeof(int));
-    m_colStretch = (int *)malloc((1 + m_cell_count.GetWidth()) * sizeof(int));
-
-    m_weights = (wxSize **)malloc((1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
-    m_minSizes = (wxSize **)malloc((1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
-    for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-    {
-        m_weights[x] = new wxSize(0,0);
-        m_minSizes[x] = new wxSize(0,0);
-    }
-
-    m_maxWeights = 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth());
-    m_defaultCellSize = wxSize(5, 5);
-    m_win = NULL;
-    m_pen = wxRED_PEN;
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::wxMultiCellSizer( wxSize & size )
-{
-    Initialize(size);
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::wxMultiCellSizer( int rows, int cols)
-{
-    wxSize size(cols, rows);
-    Initialize(size);
-}
-//---------------------------------------------------------------------------
-wxMultiCellSizer::~wxMultiCellSizer()
-{
-    WX_CLEAR_LIST(wxSizerItemList, m_children);
-
-    free(m_maxHeight);
-    free(m_maxWidth);
-    free(m_rowStretch);
-    free(m_colStretch);
-
-    for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-    {
-        delete m_weights[x];
-        delete m_minSizes[x];
-    }
-    free(m_weights);
-    free(m_minSizes);
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::EnableGridLines(wxWindow *win)
-{
-    m_win = win;
-    return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetGridPen(const wxPen *pen)
-{
-    m_pen = pen;
-    return true;
-}
-
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetDefaultCellSize(wxSize size)
-{
-    m_defaultCellSize = size;
-    return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetColumnWidth(int column, int colSize, bool expandable)
-{
-    if (expandable)
-    {
-        m_minSizes[column]->SetWidth(-colSize);
-    }
-    else
-    {
-        m_minSizes[column]->SetWidth(colSize);
-    }
-    return true;
-}
-//---------------------------------------------------------------------------
-bool wxMultiCellSizer::SetRowHeight(int row, int rowSize, bool expandable)
-{
-    if (expandable)
-    {
-        m_minSizes[row]->SetHeight(-rowSize);
-    }
-    else
-    {
-        m_minSizes[row]->SetHeight(rowSize);
-    }
-    return true;
-}
-//---------------------------------------------------------------------------
-void wxMultiCellSizer::RecalcSizes()
-{
-    if (m_children.GetCount() == 0)
-        return;
-    wxSize size = GetSize();
-    wxPoint pos = GetPosition();
-
-    GetMinimums();
-
-    // We need to take the unused space and equally give it out to all the rows/columns
-    // which are stretchable
-
-    int unUsedWidth = size.GetWidth() - Sum(m_maxWidth, m_cell_count.GetWidth());
-    int unUsedHeight = size.GetHeight() - Sum(m_maxHeight, m_cell_count.GetHeight());
-    int totalWidthWeight = 0;
-    int totalHeightWeight = 0;
-    int x;
-
-    for (x = 0; x < wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-    {
-        if (m_rowStretch[x])
-        {
-            totalHeightWeight += m_weights[x]->GetHeight();
-        }
-        if (x < m_cell_count.GetWidth() && m_colStretch[x])
-        {
-            totalWidthWeight += m_weights[x]->GetWidth();
-        }
-    }
-    for (x = 0; x < wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-    {
-        if (x < m_cell_count.GetHeight() && m_rowStretch[x])
-        {
-            m_maxHeight[x] += unUsedHeight * m_weights[x]->GetHeight() / totalHeightWeight;
-        }
-        if (x < m_cell_count.GetWidth() && m_colStretch[x])
-        {
-            m_maxWidth[x] += unUsedWidth * m_weights[x]->GetWidth() / totalWidthWeight;
-        }
-    }
-    // We now have everything we need to figure each cell position and size
-    // The arrays m_maxHeight and m_maxWidth now contain the final widths and height of
-    // each row and column.
-
-    double cell_width = (double)size.GetWidth() / (double)m_cell_count.GetWidth();
-    double cell_height = (double)size.GetHeight() / (double)m_cell_count.GetHeight();
-    wxPoint c_point;
-    wxSize  c_size;
-
-    wxSizerItemList::compatibility_iterator current = m_children.GetFirst();
-    while (current)
-    {
-        wxSizerItem *item = current->GetData();
-
-        wxMultiCellItemHandle *rect;
-        if (item != NULL &&
-            (rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL)
-        {
-            c_point.x = pos.x + (int)(rect->GetColumn() * cell_width);
-            c_point.y = pos.y + (int)(rect->GetRow() * cell_height);
-
-            c_point.x = pos.x + Sum(m_maxWidth, rect->GetColumn());
-            c_point.y = pos.y + Sum(m_maxHeight, rect->GetRow());
-
-
-            c_size = rect->GetLocalSize();
-            wxSize minSize( item->CalcMin() );
-            if (c_size.GetHeight() != wxDefaultCoord ||
-                c_size.GetWidth() != wxDefaultCoord)
-            {
-                minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
-                minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
-            }
-            if (rect->GetStyle() & wxHORIZONTAL_RESIZABLE ||
-                rect->GetWidth() > 1
-                || m_minSizes[rect->GetColumn()]->GetWidth() < 0)
-            {
-                int w = 0;
-                for (int x = 0; x < rect->GetWidth(); x++)
-                {
-                    w += m_maxWidth[rect->GetColumn() + x];
-                }
-                c_size.SetWidth(w);
-            }
-            else
-            {
-                c_size.SetWidth(minSize.GetWidth() );
-            }
-            if (rect->GetStyle() & wxVERTICAL_RESIZABLE ||
-                rect->GetHeight() > 1 ||
-                m_minSizes[rect->GetRow()]->GetHeight() < 0)
-            {
-                int h = 0;
-                for (int x = 0; x < rect->GetHeight(); x++)
-                {
-                    h += m_maxHeight[rect->GetRow() + x];
-                }
-                c_size.SetHeight(h);
-            }
-            else
-            {
-                c_size.SetHeight(minSize.GetHeight());
-            }
-            int extraHeight = (m_maxHeight[rect->GetRow()] - c_size.GetHeight());
-            int extraWidth = (m_maxWidth[rect->GetColumn()] - c_size.GetWidth());
-
-            if (rect->GetWidth() == 1 && rect->GetAlignment() & wxALIGN_CENTER_HORIZONTAL)
-            {
-                c_point.x += extraWidth / 2;
-            }
-            if (rect->GetWidth() == 1 && rect->GetAlignment() & wxALIGN_RIGHT)
-            {
-                c_point.x += extraWidth;
-            }
-            if (rect->GetHeight() == 1 && rect->GetAlignment() & wxALIGN_CENTER_VERTICAL)
-            {
-                c_point.y += extraHeight / 2;
-            }
-            if (rect->GetHeight() == 1 && rect->GetAlignment() & wxALIGN_BOTTOM)
-            {
-                c_point.y += extraHeight;
-            }
-            item->SetDimension(c_point, c_size);
-        }
-        current = current->GetNext();
-    }
-}
-//---------------------------------------------------------------------------
-wxSize wxMultiCellSizer::CalcMin()
-{
-    if (m_children.GetCount() == 0)
-        return wxSize(10,10);
-
-    GetMinimums();
-    int m_minWidth = Sum(m_maxWidth, m_cell_count.GetWidth());
-    int m_minHeight = Sum(m_maxHeight, m_cell_count.GetHeight());
-    return wxSize( m_minWidth, m_minHeight );
-}
-//---------------------------------------------------------------------------
-void wxMultiCellSizer :: GetMinimums()
-{
-    // We first initial all the arrays EXCEPT for the m_minsizes array.
-
-    memset(m_maxHeight, 0, sizeof(int) * m_cell_count.GetHeight());
-    memset(m_maxWidth, 0, sizeof(int) * m_cell_count.GetWidth());
-    memset(m_rowStretch, 0, sizeof(int) * m_cell_count.GetHeight());
-    memset(m_colStretch, 0, sizeof(int) * m_cell_count.GetWidth());
-    for (int x = 0; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-    {
-        m_weights[x]->SetHeight(0);
-        m_weights[x]->SetWidth(0);
-    }
-
-    wxSizerItemList::compatibility_iterator     node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-        wxMultiCellItemHandle *rect;
-        if (item != NULL &&
-            (rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL)
-        {
-            int row = rect->GetRow();
-            int col = rect->GetColumn();
-
-            // First make sure that the control knows about the max rows and columns
-
-            int changed = false;
-            if (row + 1 > m_cell_count.GetHeight())
-            {
-                changed++;
-                m_maxHeight = (int *)realloc(m_maxHeight, (1 + row) * sizeof(int));
-                m_rowStretch = (int *)realloc(m_rowStretch, (1 + row) * sizeof(int));
-                for (int x = m_cell_count.GetHeight(); x < row + 1; x++)
-                {
-                    m_maxHeight[x - 1] = 0;
-                    m_rowStretch[x - 1] = 0;
-                }
-                m_cell_count.SetHeight(row + 1);
-            }
-            if (col + 1 > m_cell_count.GetWidth())
-            {
-                changed++;
-                m_maxWidth = (int *)realloc(m_maxWidth, (1 + col) * sizeof(int));
-                m_colStretch = (int *)realloc(m_colStretch, ( 1 + col) * sizeof(int));
-                for (int x = m_cell_count.GetWidth(); x < col + 1; x++)
-                {
-                    m_maxWidth[x - 1] = 0;
-                    m_colStretch[x - 1] = 0;
-                }
-                m_cell_count.SetWidth(col + 1);
-            }
-            if (changed)
-            {
-                m_weights = (wxSize **)realloc(m_weights, (1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
-                m_minSizes = (wxSize **)realloc(m_minSizes, (1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth())) * sizeof(wxSize *));
-                for (int x = m_maxWeights; x < 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth()); x++)
-                {
-                    m_weights[x - 1] = new wxSize(0,0);
-                    m_minSizes[x - 1] = new wxSize(0,0);
-                }
-                m_maxWeights = 1 + wxMax(m_cell_count.GetHeight(), m_cell_count.GetWidth());
-            }
-
-            // Sum the m_weights for each row/column, but only if they are resizable
-
-            wxSize minSize( item->CalcMin() );
-            wxSize c_size = rect->GetLocalSize();
-            if (c_size.GetHeight() != wxDefaultCoord ||
-                c_size.GetWidth() != wxDefaultCoord)
-            {
-                minSize.SetHeight(wxMax(minSize.GetHeight(), c_size.GetHeight()));
-                minSize.SetWidth(wxMax(minSize.GetWidth(), c_size.GetWidth()));
-            }
-
-            // For each row, calculate the max height for those fields which are not
-            // resizable in the vertical pane
-
-            if (!(rect->GetStyle() & wxVERTICAL_RESIZABLE || m_minSizes[row]->GetHeight() < 0))
-            {
-                m_maxHeight[row] = wxMax(m_maxHeight[row], minSize.GetHeight() / rect->GetHeight());
-            }
-            else
-            {
-                m_rowStretch[row] = 1;
-                if (m_minSizes[row]->GetHeight())
-                {
-                    m_maxHeight[row] = abs(m_minSizes[row]->GetHeight());
-                }
-                else
-                {
-                    m_maxHeight[row] = wxMax(m_maxHeight[row], m_defaultCellSize.GetHeight());
-                }
-                m_weights[row]->SetHeight(wxMax(m_weights[row]->GetHeight(), rect->GetWeight().GetHeight()));
-            }
-
-            // For each column, calculate the max width for those fields which are not
-            // resizable in the horizontal pane
-
-            if (!(rect->GetStyle() & wxHORIZONTAL_RESIZABLE || m_minSizes[col]->GetWidth() < 0))
-            {
-                if (m_minSizes[col]->GetWidth())
-                {
-                    m_maxWidth[col] = abs(m_minSizes[col]->GetWidth());
-                }
-                else
-                {
-                    m_maxWidth[col] = wxMax(m_maxWidth[col], minSize.GetWidth() / rect->GetWidth());
-                }
-            }
-            else
-            {
-                m_colStretch[col] = 1;
-                m_maxWidth[col] = wxMax(m_maxWidth[col], m_defaultCellSize.GetWidth());
-                m_weights[col]->SetWidth(wxMax(m_weights[col]->GetWidth(), rect->GetWeight().GetWidth()));
-            }
-            node = node->GetNext();
-        }
-    }
-} // wxMultiCellSizer :: GetMinimums
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellSizer :: Sum
- *
- *Parameters:    int* pointer to array of ints
- *               int  Number of cells to sum up
- *
- *Description:   This member function sums up all the elements of the array which
- *               preceed the specified cell.
- *
- *Returns:       int Sum
- *
- */
-
-/* static */ int wxMultiCellSizer :: Sum(int *array, int x)
-{
-    int sum = 0;
-    while (x--)
-    {
-        sum += array[x];
-    }
-    return sum;
-}
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxMultiCellSizer :: DrawGridLines
- *
- *Parameters:    wxDC Device context
- *
- *Description:   This function draws the grid lines in the specified device context.
- *
- */
-
-void wxMultiCellSizer :: DrawGridLines(wxDC& dc)
-{
-    RecalcSizes();
-    int maxW = Sum(m_maxWidth, m_cell_count.GetWidth());
-    int maxH = Sum(m_maxHeight, m_cell_count.GetHeight());
-    int x;
-
-    // Draw the columns
-    dc.SetPen(* m_pen);
-    for (x = 1; x < m_cell_count.GetWidth(); x++)
-    {
-        int colPos = Sum(m_maxWidth, x) ;
-        dc.DrawLine(colPos, 0, colPos, maxH);
-    }
-
-    // Draw the rows
-    for (x = 1; x < m_cell_count.GetHeight(); x++)
-    {
-        int rowPos = Sum(m_maxHeight, x);
-        dc.DrawLine(0, rowPos, maxW, rowPos);
-    }
-}
-//---------------------------------------------------------------------------
-// Define the repainting behaviour
-/*
- *Function Name: wxMultiCellSizer::OnPaint
- *
- *Parameters:    wxDC Device context
- *
- *Description:   This function calls the DrawGridLines() member if a window
- *               has been previously specified.  This functions MUST be called
- *               from an OnPaint member belonging to the window which the sizer
- *               is attached to.
- *
- */
-
-void wxMultiCellSizer::OnPaint(wxDC& dc )
-{
-    if (m_win)
-    {
-        DrawGridLines(dc);
-    }
-}
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-
-
-#define CELL_LOC(row, col) ((row) * m_maxCols + col)
-
-//---------------------------------------------------------------------------
-// wxCell
-//---------------------------------------------------------------------------
-/*
- *Function Name: wxCell : wxLayoutConstraints
- *
- *Description:   This class is used by wxMultiCellCanvas for internal storage
- *
- */
-
-class wxCell : public wxLayoutConstraints
-{
-public:
-    wxCell(wxWindow *win)
-    {
-        m_window = win;
-    };
-
-    wxWindow    *m_window;
-};
-
-
-
-//---------------------------------------------------------------------------
-// wxMultiCellCanvas
-//---------------------------------------------------------------------------
-wxMultiCellCanvas :: wxMultiCellCanvas(wxWindow *par, int numRows, int numCols)
-   : wxFlexGridSizer(numRows, numCols, 0, 0)
-{
-    m_cells = (wxCell **)calloc(numRows * numCols, sizeof(wxCell *));
-
-    m_parent = par;
-    m_maxRows = numRows;
-    m_maxCols = numCols;
-    m_minCellSize = wxSize(5, 5);
-}
-//---------------------------------------------------------------------------
-void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col)
-{
-  // thanks to unsigned data row and col are always >= 0
-    wxASSERT_MSG( /* row >= 0 && */ row < m_maxRows,
-                 wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) );
-    wxASSERT_MSG( /* col >= 0 && */ col < m_maxCols,
-                 wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) );
-
-    wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied"));
-
-    wxCell *newCell = new wxCell(win);
-    m_cells[CELL_LOC(row,col)] = newCell;
-}
-//---------------------------------------------------------------------------
-void wxMultiCellCanvas :: CalculateConstraints()
-{
-    unsigned int    row, col;
-    for (row = 0; row < m_maxRows; row++)
-    {
-        for (col = 0; col < m_maxCols; col++)
-        {
-            if (!m_cells[CELL_LOC(row, col)])
-            {
-                // Create an empty static text field as a placeholder
-                m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, wxID_ANY, wxEmptyString));
-            }
-            wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window);
-        }
-    }
-}
-
-/*** End of File ***/
diff --git a/contrib/src/gizmos/multicell.txt b/contrib/src/gizmos/multicell.txt
deleted file mode 100644
index 5de8cb27a2..0000000000
--- a/contrib/src/gizmos/multicell.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-These two classes make it easier to lay objects out on a screen.  The
-first class is the wxMultiCellCanvas, which uses the wxFlexGridSizer
-control, so it is subject to the same limitations of that control.  Among
-them is the fact that if the window is resized smaller than the control,
-then some of the objects will be obscured by the window edge.
-
-The second class is the wxMultiCellSizer, which is significantly more
-powerful than the wxMultiCell Canvas.  This control supports resizing of
-objects on the fly, objects spanning cells, etc.
-
-Use the wxMultiCellCanvas when you have a simple layout which won't resize
-and doesn't have any unusual requirements.  Use the wxMultiCellSizer when
-your needs are greater
-
-
-wxMultiCellCanvas
-=================
-
-The wxMultiCellCanvas class allows you to add objects to a wxFlexGridSizer
-by specifying a row and a column location.  When all objects have been
-added, you need to call a member function CalculateConstraints(), which
-will insert the objects into the wxFlexGridSizer.  If there are empty
-cells the canvas will insert empty wxStaticText objects as placeholders.
-
-Upon creation of the canvas the size of the canvas needs to be specified.
-Attempting to insert a cell outside those limits will cause an assertion
-error.
-
-When adding cells, the cell locations are specified as a row,column
-location, both being zero-based.  0,0 is the upper left corner of the
-canvas.
-
-
-wxMultiCellSizer
-================
-
-The wxMultiCellSizer class manages a collection of child windows in a way
-similar to that of data stored in a spreadsheet.  A multicell canvas is a
-two-dimensional array of cells with an origin of (0,0) in the upper-left
-corner.  Windows are added to a multicell sizer by first creating a
-wxMultiCellItemHandle object which specifies a starting cell and,
-optionally, a number of contiguous columns, rows, or a combination
-thereof, and then adding it to the sizer.
-
-This class bases the initial cell sizes on the minimum sizes returned by
-each child window of the sizer.  You can override the minimum sizes
-provided by the wxWindows Class Library by doing either of the following:
-
- o Specifying the size when creating the wxMultiCellItemHandle object
- o Creating a derived class and implementing a CalcMin function
-
-The wxMultiCellItemHandle must be passed the row and column of the item,
-at a minimum.  Optionally, more information can be passed:
-
- int                    row             Row position, zero based
- int                    column          Column position, zero based
- int                    height          Number of rows this cell will occupy, default is 1
- int                    width           Number of columns this cell will occupy, default is 1
-
-                                        Note that if the height or width is greater than one that
-                                        dimension is assumed to be resizable because it is spanning
-                                        multiple cells.
-
- wxSize                 minSize         Minimum size of the object.
- wxResizable            Style           Is this object resizable, and if so, how.  Allowable styles are:
-                                                wxNOT_RESIZABLE
-                                                wxHORIZENTAL_RESIZABLE
-                                                wxVERTICAL_RESIZABLE
-                                                wxRESIZABLE
- wxSize                 weight          If this is a resizable object, the weight applied to the specific dimension.
-                                        This is useful if you have several resizable rows and/or columns, and you want
-                                        one to get more of the available space than the others.
- int                    align           This is a wxAlignment value, it is an integer so you can 'or multiple
-                                        values together.  The acceptable values are:
-                                                wxALIGN_NOT
-                                                wxALIGN_CENTER_HORIZONTAL
-                                                wxALIGN_CENTRE_HORIZONTAL
-                                                wxALIGN_LEFT
-                                                wxALIGN_TOP
-                                                wxALIGN_RIGHT
-                                                wxALIGN_BOTTOM
-                                                wxALIGN_CENTER_VERTICAL
-                                                wxALIGN_CENTRE_VERTICAL
-                                                wxALIGN_CENTER
-                                                wxALIGN_CENTRE
-                        Note that some combinations of these make no sense, for example wxALIGN_LEFT | wxALIGN_RIGHT.
-                        See the definition of wxAlignment for more information
-
-
-Other functions are:
-
-void    RecalcSizes()           Should not be called by the user, needed by the wxSizer class
-wxSize  CalcMin()               Should not be called by the user, needed by the wxSizer class
-bool    SetDefaultCellSize      Set the default cell size of an empty cell
-bool    SetColumnWidth          Set the width of a column, optionally specifying it as resizable
-bool    SetRowHeight            Set the height of a row, optionally specifying it as resizable
-
-Sometimes it can be very confusing to determine the relationship between rows, columns, and
-which ones are resizable or not.  Three functions are supplied to make this easier:
-
-bool    EnableGridLines(wxWindow *win); Call this to either enable or disable the grid lines.
-                                        Pass the window the sizer is on, or NULL to disable.
-                                        Currently the window is not used, but it may be in the
-                                        future.
-bool    SetGridPen(wxPen *pen);         Set the pen color, the default pen color is red
-void    OnPaint(wxDC& dc);              Call this from an OnPaint function associated with the
-                                        window the sizer is attached to.  See the example program
-                                        mtest.cpp for specific details on how to do this.
-
-
-Files                   Description
-=====                   ===========
-docs.txt                This file
-
-// wxMultiCellCanvas and wxMultiCellSizer
-makefile                Makefile for the MingW32 compiler
-multicell.cpp           Class source code file
-multicell.h             Class header file
-
-//Sample
-mtest.cpp               Example program, demonstrates both classes
-mtest.rc
-mtest.gif
-makefile
-
-Acknowledgments
-===============
-This was inspired by the gbsizer class written by Alex Andruschak, and the IMultiCellCanvas
-class in the IBM Class Libraries in the VisualeAge C++ compilers.
-
diff --git a/contrib/src/gizmos/multicell_todo.txt b/contrib/src/gizmos/multicell_todo.txt
deleted file mode 100644
index 8e07fdc016..0000000000
--- a/contrib/src/gizmos/multicell_todo.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-2.	Documentation
-
diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
deleted file mode 100644
index 0eaed896c2..0000000000
--- a/contrib/src/gizmos/splittree.cpp
+++ /dev/null
@@ -1,745 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        splittree.cpp
-// Purpose:     Classes to achieve a remotely-scrolled tree in a splitter
-//              window that can be scrolled by a scrolled window higher in the
-//              hierarchy
-// Author:      Julian Smart
-// Modified by:
-// Created:     8/7/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// 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
-
-#ifdef __WXMSW__
-#include <windows.h>
-#include "wx/msw/winundef.h"
-#endif
-
-#include "wx/gizmos/splittree.h"
-#include <math.h>
-
-/*
- * wxRemotelyScrolledTreeCtrl
- */
-
-#if USE_GENERIC_TREECTRL
-IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
-#else
-IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
-#endif
-
-#if USE_GENERIC_TREECTRL
-BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
-#else
-BEGIN_EVENT_TABLE(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
-#endif
-    EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize)
-    EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint)
-    EVT_TREE_ITEM_EXPANDED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
-    EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand)
-    EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll)
-END_EVENT_TABLE()
-
-wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(
-    wxWindow* parent, wxWindowID id, const wxPoint& pt,
-    const wxSize& sz, long style)
-    : wxTreeCtrl(parent, id, pt, sz, style & ~wxTR_ROW_LINES)
-{
-    m_companionWindow = NULL;
-
-    // We draw the row lines ourself so they match what's done
-    // by the companion window.  That is why the flag is turned
-    // off above, so wxGenericTreeCtrl doesn't draw them in a
-    // different colour.
-    m_drawRowLines = (style & wxTR_ROW_LINES) != 0;
-}
-
-wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()
-{
-}
-
-void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
-{
-#if defined(__WXMSW__)
-#if USE_GENERIC_TREECTRL
-    if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif
-    {
-        ::ShowScrollBar((HWND) GetHWND(), SB_VERT, false);
-    }
-#if USE_GENERIC_TREECTRL
-    else
-    {
-        // Implicit in overriding SetScrollbars
-    }
-#endif
-#endif
-}
-
-// Number of pixels per user unit (0 or -1 for no scrollbar)
-// Length of virtual canvas in user units
-// Length of page in user units
-void wxRemotelyScrolledTreeCtrl::SetScrollbars(
-                                                #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-                                                  int pixelsPerUnitX, int pixelsPerUnitY,
-                             int noUnitsX, int noUnitsY,
-                             int xPos, int yPos,
-                                                  bool noRefresh
-                                                #else
-                                                  int WXUNUSED(pixelsPerUnitX), int WXUNUSED(pixelsPerUnitY),
-                                                  int WXUNUSED(noUnitsX), int WXUNUSED(noUnitsY),
-                                                  int WXUNUSED(xPos), int WXUNUSED(yPos),
-                                                  bool WXUNUSED(noRefresh)
-                                                #endif
-                                              )
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ true);
-
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
-            scrolledWindow->SetScrollbars(0, pixelsPerUnitY, 0, noUnitsY, 0, yPos, noRefresh);
-        }
-    }
-#endif
-}
-
-// In case we're using the generic tree control.
-int wxRemotelyScrolledTreeCtrl::GetScrollPos(
-                                             #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-                                                 int orient
-                                             #else
-                                                 int WXUNUSED(orient)
-                                             #endif
-                                             ) const
-{
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    // this condition fixes extsitence of warning but
-    wxScrolledWindow* scrolledWindow =
-    // but GetScrolledWindow is still executed in case internally does something
-#endif
-                                       GetScrolledWindow();
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-
-        if (orient == wxHORIZONTAL)
-            return win->wxGenericTreeCtrl::GetScrollPos(orient);
-        else
-        {
-            return scrolledWindow->GetScrollPos(orient);
-        }
-    }
-#endif
-    return 0;
-}
-
-
-// In case we're using the generic tree control.
-// Get the view start
-void wxRemotelyScrolledTreeCtrl::GetViewStart(int *x, int *y) const
-{
-    wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-
-        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-        int x1, y1, x2, y2;
-        win->wxGenericTreeCtrl::GetViewStart(& x1, & y1);
-        * x = x1; * y = y1;
-        if (!scrolledWindow)
-            return;
-
-        scrolledWindow->GetViewStart(& x2, & y2);
-        * y = y2;
-    }
-    else
-#endif
-    {
-        // x is wrong since the horizontal scrollbar is controlled by the
-        // tree control, but we probably don't need it.
-        scrolledWindow->GetViewStart(x, y);
-    }
-}
-
-// In case we're using the generic tree control.
-void wxRemotelyScrolledTreeCtrl::PrepareDC(
-                                            #if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-                                                wxDC& dc
-                                            #else
-                                                wxDC& WXUNUSED(dc)
-                                            #endif
-                                           )
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-
-        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-
-        int startX, startY;
-        GetViewStart(& startX, & startY);
-
-        int xppu1, yppu1, xppu2, yppu2;
-        win->wxGenericTreeCtrl::GetScrollPixelsPerUnit(& xppu1, & yppu1);
-        scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
-
-        dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
-        // dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
-    }
-#endif
-}
-
-// Scroll to the given line (in scroll units where each unit is
-// the height of an item)
-void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVert)
-{
-#ifdef __WXMSW__
-#if USE_GENERIC_TREECTRL
-    if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-#endif // USE_GENERIC_TREECTRL
-    {
-        UINT sbCode = SB_THUMBPOSITION;
-        HWND vertScrollBar = 0;
-        MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar);
-    }
-#if USE_GENERIC_TREECTRL
-    else
-#endif // USE_GENERIC_TREECTRL
-#endif // __WXMSW__
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    {
-        wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-        win->Refresh();
-        /* Doesn't work yet because scrolling is ignored by Scroll
-        int xppu, yppu;
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
-            scrolledWindow->GetScrollPixelsPerUnit(& xppu, & yppu);
-            win->Scroll(-1, posVert*yppu);
-        }
-        */
-    }
-#endif // USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    wxUnusedVar(posVert);
-}
-
-void wxRemotelyScrolledTreeCtrl::OnSize(wxSizeEvent& event)
-{
-    HideVScrollbar();
-    AdjustRemoteScrollbars();
-    event.Skip();
-}
-
-void wxRemotelyScrolledTreeCtrl::OnExpand(wxTreeEvent& event)
-{
-    AdjustRemoteScrollbars();
-    event.Skip();
-
-    // If we don't have this, we get some bits of lines still remaining
-    if (event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_COLLAPSED)
-        Refresh();
-
-    // Pass on the event
-    if (m_companionWindow)
-        m_companionWindow->GetEventHandler()->ProcessEvent(event);
-}
-
-void wxRemotelyScrolledTreeCtrl::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-
-    wxTreeCtrl::OnPaint(event);
-
-    if (! m_drawRowLines)
-        return;
-
-    // Reset the device origin since it may have been set
-    dc.SetDeviceOrigin(0, 0);
-
-    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-    dc.SetPen(pen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    wxSize clientSize = GetClientSize();
-    wxRect itemRect;
-    wxTreeItemId h, lastH;
-    for (h=GetFirstVisibleItem();
-         h.IsOk();
-         h=GetNextVisible(h))
-    {
-        if (GetBoundingRect(h, itemRect))
-        {
-            int cy = itemRect.GetTop();
-            dc.DrawLine(0, cy, clientSize.x, cy);
-            lastH = h;
-        }
-        if (! IsVisible(h))
-            break;
-    }
-    if (lastH.IsOk() && GetBoundingRect(lastH, itemRect))
-    {
-        int cy = itemRect.GetBottom();
-        dc.DrawLine(0, cy, clientSize.x, cy);
-    }
-}
-
-
-// Adjust the containing wxScrolledWindow's scrollbars appropriately
-void wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars()
-{
-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
-    if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
-    {
-        // This is for the generic tree control.
-        // It calls SetScrollbars which has been overridden
-        // to adjust the parent scrolled window vertical
-        // scrollbar.
-        ((wxGenericTreeCtrl*) this)->AdjustMyScrollbars();
-        return;
-    }
-    else
-#endif
-    {
-        // This is for the wxMSW tree control
-        wxScrolledWindow* scrolledWindow = GetScrolledWindow();
-        if (scrolledWindow)
-        {
-            wxRect itemRect;
-            if (GetBoundingRect(GetFirstVisibleItem(), itemRect))
-            {
-                // Actually, the real height seems to be 1 less than reported
-                // (e.g. 16 instead of 16)
-                int itemHeight = itemRect.GetHeight() - 1;
-
-                int w, h;
-                GetClientSize(&w, &h);
-
-                wxRect rect(0, 0, 0, 0);
-                CalcTreeSize(rect);
-
-                double f = ((double) (rect.GetHeight()) / (double) itemHeight)  ;
-                int treeViewHeight = (int) ceil(f);
-
-                int scrollPixelsPerLine = itemHeight;
-                int scrollPos = - (itemRect.y / itemHeight);
-
-                scrolledWindow->SetScrollbars(0, scrollPixelsPerLine, 0, treeViewHeight, 0, scrollPos);
-
-                // Ensure that when a scrollbar becomes hidden or visible,
-                // the contained window sizes are right.
-                // Problem: this is called too early (?)
-                wxSizeEvent event(scrolledWindow->GetSize(), scrolledWindow->GetId());
-                scrolledWindow->GetEventHandler()->ProcessEvent(event);
-            }
-        }
-    }
-}
-
-
-// Calculate the area that contains both rectangles
-static wxRect CombineRectangles(const wxRect& rect1, const wxRect& rect2)
-{
-    wxRect rect;
-
-    int right1 = rect1.GetRight();
-    int bottom1 = rect1.GetBottom();
-    int right2 = rect2.GetRight();
-    int bottom2 = rect2.GetBottom();
-
-    wxPoint topLeft = wxPoint(wxMin(rect1.x, rect2.x), wxMin(rect1.y, rect2.y));
-    wxPoint bottomRight = wxPoint(wxMax(right1, right2), wxMax(bottom1, bottom2));
-
-    rect.x = topLeft.x; rect.y = topLeft.y;
-    rect.SetRight(bottomRight.x);
-    rect.SetBottom(bottomRight.y);
-
-    return rect;
-}
-
-
-// Calculate the tree overall size so we can set the scrollbar
-// correctly
-void wxRemotelyScrolledTreeCtrl::CalcTreeSize(wxRect& rect)
-{
-    CalcTreeSize(GetRootItem(), rect);
-}
-
-void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& rect)
-{
-    // More efficient implementation would be to find the last item (but how?)
-    // Q: is the bounding rect relative to the top of the virtual tree workspace
-    // or the top of the window? How would we convert?
-    wxRect itemSize;
-    if (GetBoundingRect(id, itemSize))
-    {
-        rect = CombineRectangles(rect, itemSize);
-    }
-
-    wxTreeItemIdValue cookie;
-    wxTreeItemId childId = GetFirstChild(id, cookie);
-    while (childId)
-    {
-        CalcTreeSize(childId, rect);
-        childId = GetNextChild(childId, cookie);
-    }
-}
-
-// Find the scrolled window that contains this control
-wxScrolledWindow* wxRemotelyScrolledTreeCtrl::GetScrolledWindow() const
-{
-    wxWindow* parent = wxWindow::GetParent();
-    while (parent)
-    {
-        if (parent->IsKindOf(CLASSINFO(wxScrolledWindow)))
-            return (wxScrolledWindow*) parent;
-        parent = parent->GetParent();
-    }
-    return NULL;
-}
-
-void wxRemotelyScrolledTreeCtrl::OnScroll(wxScrollWinEvent& event)
-{
-    int orient = event.GetOrientation();
-    if (orient == wxHORIZONTAL)
-    {
-        event.Skip();
-        return;
-    }
-    wxScrolledWindow* scrollWin = GetScrolledWindow();
-    if (!scrollWin)
-        return;
-
-    int x, y;
-    scrollWin->GetViewStart(& x, & y);
-
-    ScrollToLine(-1, y);
-}
-
-/*
- * wxTreeCompanionWindow
- *
- * A window displaying values associated with tree control items.
- */
-
-IMPLEMENT_CLASS(wxTreeCompanionWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
-    EVT_PAINT(wxTreeCompanionWindow::OnPaint)
-    EVT_SCROLLWIN(wxTreeCompanionWindow::OnScroll)
-    EVT_TREE_ITEM_EXPANDED(-1, wxTreeCompanionWindow::OnExpand)
-    EVT_TREE_ITEM_COLLAPSED(-1, wxTreeCompanionWindow::OnExpand)
-END_EVENT_TABLE()
-
-wxTreeCompanionWindow::wxTreeCompanionWindow(wxWindow* parent, wxWindowID id,
-      const wxPoint& pos,
-      const wxSize& sz,
-      long style):
-    wxWindow(parent, id, pos, sz, style)
-{
-    m_treeCtrl = NULL;
-}
-
-void wxTreeCompanionWindow::DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect)
-{
-    // TEST CODE
-#if 1
-    if (m_treeCtrl)
-    {
-        wxString text = m_treeCtrl->GetItemText(id);
-        dc.SetTextForeground(* wxBLACK);
-        dc.SetBackgroundMode(wxTRANSPARENT);
-
-        int textW, textH;
-        dc.GetTextExtent(text, & textW, & textH);
-
-        int x = 5;
-        int y = rect.GetY() + wxMax(0, (rect.GetHeight() - textH) / 2);
-
-        dc.DrawText(text, x, y);
-    }
-#endif
-}
-
-void wxTreeCompanionWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-
-    if (!m_treeCtrl)
-        return;
-
-        wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
-    dc.SetPen(pen);
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-    wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    dc.SetFont(font);
-
-    wxSize clientSize = GetClientSize();
-    wxRect itemRect;
-    wxTreeItemId h, lastH;
-    for (h=m_treeCtrl->GetFirstVisibleItem();
-         h.IsOk();
-         h=m_treeCtrl->GetNextVisible(h))
-    {
-        if (m_treeCtrl->GetBoundingRect(h, itemRect))
-        {
-            int cy = itemRect.GetTop();
-            wxRect drawItemRect(0, cy, clientSize.x, itemRect.GetHeight());
-
-            lastH = h;
-
-            // Draw the actual item
-            DrawItem(dc, h, drawItemRect);
-            dc.DrawLine(0, cy, clientSize.x, cy);
-        }
-        if (! m_treeCtrl->IsVisible(h))
-            break;
-    }
-    if (lastH.IsOk() && m_treeCtrl->GetBoundingRect(lastH, itemRect))
-    {
-        int cy = itemRect.GetBottom();
-        dc.DrawLine(0, cy, clientSize.x, cy);
-    }
-}
-
-void wxTreeCompanionWindow::OnScroll(wxScrollWinEvent& event)
-{
-    int orient = event.GetOrientation();
-    if (orient == wxHORIZONTAL)
-    {
-        event.Skip();
-        return;
-    }
-    if (!m_treeCtrl)
-        return;
-
-    // TODO: scroll the window physically instead of just refreshing.
-    Refresh(true);
-}
-
-void wxTreeCompanionWindow::OnExpand(wxTreeEvent& WXUNUSED(event))
-{
-    // TODO: something more optimized than simply refresh the whole
-    // window when the tree is expanded/collapsed. Tricky.
-    Refresh();
-}
-
-/*
- * wxThinSplitterWindow
- */
-
-IMPLEMENT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
-
-BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
-    EVT_SIZE(wxThinSplitterWindow::OnSize)
-END_EVENT_TABLE()
-
-wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
-      const wxPoint& pos,
-      const wxSize& sz,
-      long style):
-      wxSplitterWindow(parent, id, pos, sz, style)
-{
-    wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    m_facePen = new wxPen(faceColour, 1, wxSOLID);
-    m_faceBrush = new wxBrush(faceColour, wxSOLID);
-}
-
-wxThinSplitterWindow::~wxThinSplitterWindow()
-{
-    delete m_facePen;
-    delete m_faceBrush;
-}
-
-
-void wxThinSplitterWindow::SizeWindows()
-{
-    // The client size may have changed inbetween
-    // the sizing of the first window and the sizing of
-    // the second. So repeat SizeWindows.
-    wxSplitterWindow::SizeWindows();
-    wxSplitterWindow::SizeWindows();
-}
-
-// Tests for x, y over sash
-bool wxThinSplitterWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance))
-{
-    return wxSplitterWindow::SashHitTest(x, y, 4);
-}
-
-void wxThinSplitterWindow::DrawSash(wxDC& dc)
-{
-    if ( m_sashPosition == 0 || !m_windowTwo)
-        return;
-    if (GetWindowStyle() & wxSP_NOSASH)
-        return;
-
-    int w, h;
-    GetClientSize(&w, &h);
-
-    if ( m_splitMode == wxSPLIT_VERTICAL )
-    {
-        dc.SetPen(* m_facePen);
-        dc.SetBrush(* m_faceBrush);
-        int h1 = h-1;
-        int y1 = 0;
-        if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
-            h1 += 1; // Not sure why this is necessary...
-        if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
-        {
-            y1 = 2; h1 -= 3;
-        }
-        dc.DrawRectangle(m_sashPosition, y1, GetSashSize(), h1);
-    }
-    else
-    {
-        dc.SetPen(* m_facePen);
-        dc.SetBrush(* m_faceBrush);
-        int w1 = w-1;
-        int x1 = 0;
-        if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
-            w1 ++;
-        if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
-        {
-            x1 = 2; w1 -= 3;
-        }
-        dc.DrawRectangle(x1, m_sashPosition, w1, GetSashSize());
-    }
-
-    dc.SetPen(wxNullPen);
-    dc.SetBrush(wxNullBrush);
-}
-
-void wxThinSplitterWindow::OnSize(wxSizeEvent& event)
-{
-    wxSplitterWindow::OnSize(event);
-}
-
-/*
- * wxSplitterScrolledWindow
- */
-
-IMPLEMENT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)
-    EVT_SCROLLWIN(wxSplitterScrolledWindow::OnScroll)
-    EVT_SIZE(wxSplitterScrolledWindow::OnSize)
-END_EVENT_TABLE()
-
-wxSplitterScrolledWindow::wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id,
-      const wxPoint& pos,
-      const wxSize& sz,
-      long style):
-      wxScrolledWindow(parent, id, pos, sz, style)
-{
-}
-
-void wxSplitterScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    wxSize sz = GetClientSize();
-    if (GetChildren().GetFirst())
-    {
-        ((wxWindow*) GetChildren().GetFirst()->GetData())->SetSize(0, 0, sz.x, sz.y);
-    }
-}
-
-void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
-{
-    // Ensure that events being propagated back up the window hierarchy
-    // don't cause an infinite loop
-    static bool inOnScroll = false;
-    if (inOnScroll)
-    {
-        event.Skip();
-        return;
-    }
-    inOnScroll = true;
-
-    int orient = event.GetOrientation();
-
-    int nScrollInc = CalcScrollInc(event);
-    if (nScrollInc == 0)
-    {
-        inOnScroll = false;
-        return;
-    }
-
-    if (orient == wxHORIZONTAL)
-    {
-        inOnScroll = false;
-        event.Skip();
-        return;
-#if 0
-        int newPos = m_xScrollPosition + nScrollInc;
-        SetScrollPos(wxHORIZONTAL, newPos, true );
-#endif
-    }
-    else
-    {
-        int newPos = m_yScrollPosition + nScrollInc;
-        SetScrollPos(wxVERTICAL, newPos, true );
-    }
-
-    if (orient == wxHORIZONTAL)
-    {
-        m_xScrollPosition += nScrollInc;
-    }
-    else
-    {
-        m_yScrollPosition += nScrollInc;
-    }
-
-    // Find targets in splitter window and send the event to them
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* child = (wxWindow*) node->GetData();
-        if (child->IsKindOf(CLASSINFO(wxSplitterWindow)))
-        {
-            wxSplitterWindow* splitter = (wxSplitterWindow*) child;
-            if (splitter->GetWindow1())
-                splitter->GetWindow1()->ProcessEvent(event);
-            if (splitter->GetWindow2())
-                splitter->GetWindow2()->ProcessEvent(event);
-            break;
-        }
-        node = node->GetNext();
-    }
-
-    m_targetWindow->Update() ;
-
-    inOnScroll = false;
-}
diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
deleted file mode 100644
index b8c1cdf99d..0000000000
--- a/contrib/src/gizmos/statpict.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        statpict.cpp
-// Purpose:     wxStaticPicture
-// Author:      Wade Brainerd (wadeb@wadeb.com)
-// Modified by:
-// Created:     2003-05-01
-// RCS-ID:
-// Copyright:   (c) Wade Brainerd
-// Licence:       wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-#include "wx/defs.h"
-
-#include "wx/gizmos/statpict.h"
-#include "wx/dcclient.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxStaticPicture, wxControl)
-WXDLLIMPEXP_GIZMOS const wxChar * wxStaticPictureNameStr = wxT("staticPicture");
-    
-/*
- * wxStaticPicture
- */
-
-BEGIN_EVENT_TABLE(wxStaticPicture, wxControl)
-    EVT_PAINT(wxStaticPicture::OnPaint)
-END_EVENT_TABLE()
-
-bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& s,
-           long style,
-           const wxString& name)
-{
-    SetName(name);
-
-    wxSize size = s ;
-    if ( bitmap.Ok() )
-    {
-        if ( size.x == wxDefaultCoord )
-            size.x = bitmap.GetWidth() ;
-        if ( size.y == wxDefaultCoord )
-            size.y = bitmap.GetHeight() ;
-    }
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-
-    Bitmap = bitmap;
-    Align = 0;
-    Scale = 0;
-    ScaleX = ScaleY = 1;
-
-#ifndef __WXMSW__
-    LastScaleX = LastScaleY = -1;
-    if ( Bitmap.Ok() )
-        OriginalImage = Bitmap.ConvertToImage();
-#endif
-
-    if ( id == wxID_ANY )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style;
-
-    bool ret = wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name );
-
-    SetInitialSize( size ) ;
-
-    return ret;
-}
-
-void wxStaticPicture::SetBitmap( const wxBitmap& bmp )
-{
-    Bitmap = bmp;
-#ifndef __WXMSW__
-    if ( Bitmap.Ok() )
-        OriginalImage = Bitmap.ConvertToImage();
-    LastScaleX = LastScaleY = -1;
-#endif
-}
-
-void wxStaticPicture::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    if ( !Bitmap.Ok() )
-        return;
-
-    wxPaintDC dc( this );
-    PrepareDC( dc );
-
-    wxSize sz = GetSize();
-    wxSize bmpsz( Bitmap.GetWidth(), Bitmap.GetHeight() );
-    float sx = 1.0f, sy = 1.0f;
-
-    if ( Scale & wxSCALE_UNIFORM )
-    {
-        float _sx = (float)sz.GetWidth() / (float)bmpsz.GetWidth();
-        float _sy = (float)sz.GetHeight() / (float)bmpsz.GetHeight();
-        sx = sy = _sx < _sy ? _sx : _sy;
-    }
-    else
-    if ( Scale & wxSCALE_CUSTOM )
-    {
-        sx = ScaleX;
-        sy = ScaleY;
-    }
-    else
-    {
-        if ( Scale & wxSCALE_HORIZONTAL )
-            sx = (float)sz.x/(float)bmpsz.x;
-        if ( Scale & wxSCALE_VERTICAL )
-            sy = (float)sz.y/(float)bmpsz.y;
-    }
-
-    bmpsz = wxSize( (int)(bmpsz.x*sx), (int)(bmpsz.y*sy) );
-
-    wxPoint pos( 0, 0 );
-
-    if ( Align & wxALIGN_CENTER_HORIZONTAL ) pos.x = (sz.x-bmpsz.x)/2;
-    else if ( Align & wxALIGN_RIGHT ) pos.x = sz.x-bmpsz.x;
-
-    if ( Align & wxALIGN_CENTER_VERTICAL ) pos.y = (sz.y-bmpsz.y)/2;
-    else if ( Align & wxALIGN_BOTTOM ) pos.y = sz.y-bmpsz.y;
-
-    if ( Scale )
-    {
-#ifdef __WXMSW__
-        double ux, uy;
-        dc.GetUserScale( &ux, &uy );
-        dc.SetUserScale( ux*sx, uy*sy );
-        dc.DrawBitmap( Bitmap, (int)((float)pos.x/sx), (int)((float)pos.y/sy) );
-        dc.SetUserScale( ux, uy );
-#else
-        if ( LastScaleX != sx || LastScaleY != sy )
-        {
-            LastScaleX = sx;
-            LastScaleY = sy;
-            ScaledBitmap = wxBitmap( OriginalImage.Scale( bmpsz.x, bmpsz.y ) );
-        }
-        dc.DrawBitmap( ScaledBitmap, pos.x, pos.y );
-#endif
-    }
-    else
-        dc.DrawBitmap( Bitmap, pos.x, pos.y );
-}
-
diff --git a/contrib/src/gizmos/statpict.txt b/contrib/src/gizmos/statpict.txt
deleted file mode 100644
index 9a263285fb..0000000000
--- a/contrib/src/gizmos/statpict.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-wxStaticPicture class
-by Wade Brainerd (wadeb@wadeb.com)
-
-Description:
-
-This class is an improved version of wxStaticBitmap.  
-
-Rather than using a native bitmap control, it uses DC operations to draw the
-control.  This makes its appearance more consistent across platforms, and
-allows for additional features.
-
-Features include:
-
-  wxStaticBitmap compatible API - drop-in replacement.  Image alignment - top,
-  left, bottom, right, center vertical and/or horizontal.
-  Image scaling - scale horizontally and/or vertically, justified scaling
-  (maintains image aspect ratio).
-
-Platforms tested:  
-
-  wxMSW
-  wxGTK
-  wxMac
-  
-Implementation notes:
-
-Under MSW wxWindows uses the operating system to do an optimized (potentially
-hardware accelerated) blit in wxDC::DrawBitmap.  This is usually fast enough to
-do image scaling without affecting the program's interactivity.  
-
-On wxMac and wxGTK however, wxDC::DrawBitmap implicitly calls wxImage::Scale 
-which is a much slower operation.  Therefore, on these platforms wxStaticPicture 
-caches the scaled image to make updates that don't change the image (overlapping 
-windows, etc.) faster.
diff --git a/contrib/src/gizmos/xh_statpict.cpp b/contrib/src/gizmos/xh_statpict.cpp
deleted file mode 100644
index d537261fa7..0000000000
--- a/contrib/src/gizmos/xh_statpict.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_statpict.cpp
-// Purpose:     XRC resource handler for wxStaticPicture
-// Author:      David A. Norris
-// Created:     2005/03/13
-// RCS-ID:      $Id$
-// Copyright:   David A. Norris
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC
-
-#include "wx/gizmos/statpict.h"
-#include "wx/gizmos/xh_statpict.h"
-
-// Register with wxWindows' dynamic class subsystem.
-IMPLEMENT_DYNAMIC_CLASS(wxStaticPictureXmlHandler, wxXmlResourceHandler)
-
-// Constructor.
-wxStaticPictureXmlHandler::wxStaticPictureXmlHandler()
-{
-    AddWindowStyles();
-}
-
-// Creates the control and returns a pointer to it.
-wxObject *wxStaticPictureXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(control, wxStaticPicture)
-
-    control->Create(m_parentAsWindow, GetID(),
-        GetBitmap(wxT("bitmap"), wxART_OTHER, GetSize()),
-        GetPosition(), GetSize(), GetStyle(), GetName());
-
-    SetupWindow(control);
-
-    return control;
-}
-
-// Returns true if we know how to create a control for the given node.
-bool wxStaticPictureXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxStaticPicture"));
-}
-
-#endif // wxUSE_XRC
diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
deleted file mode 100644
index 43552a5aa9..0000000000
--- a/contrib/src/mmedia/Makefile.in
+++ /dev/null
@@ -1,481 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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@
-EXTRALIBS_ESD = @EXTRALIBS_ESD@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-MMEDIADLL_OBJECTS =  \
-	$(__mmediadll___win32rc) \
-	$(__MMEDIA_PLATFORM_SRC_OBJECTS) \
-	mmediadll_cdbase.o \
-	mmediadll_g711.o \
-	mmediadll_g721.o \
-	mmediadll_g723_24.o \
-	mmediadll_g723_40.o \
-	mmediadll_g72x.o \
-	mmediadll_sndaiff.o \
-	mmediadll_sndbase.o \
-	mmediadll_sndcodec.o \
-	mmediadll_sndcpcm.o \
-	mmediadll_sndfile.o \
-	mmediadll_sndg72x.o \
-	mmediadll_sndmsad.o \
-	mmediadll_sndpcm.o \
-	mmediadll_sndulaw.o \
-	mmediadll_sndwav.o \
-	mmediadll_vidbase.o
-MMEDIADLL_ODEP =  $(___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname)
-MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-MMEDIALIB_OBJECTS =  \
-	$(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \
-	mmedialib_cdbase.o \
-	mmedialib_g711.o \
-	mmedialib_g721.o \
-	mmedialib_g723_24.o \
-	mmedialib_g723_40.o \
-	mmedialib_g72x.o \
-	mmedialib_sndaiff.o \
-	mmedialib_sndbase.o \
-	mmedialib_sndcodec.o \
-	mmedialib_sndcpcm.o \
-	mmedialib_sndfile.o \
-	mmedialib_sndg72x.o \
-	mmedialib_sndmsad.o \
-	mmedialib_sndpcm.o \
-	mmedialib_sndulaw.o \
-	mmedialib_sndwav.o \
-	mmedialib_vidbase.o
-MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___mmediadll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___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_mmediadll___depname = install_mmediadll
-@COND_SHARED_1@__uninstall_mmediadll___depname = uninstall_mmediadll
-COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd)
-COND_PLATFORM_OS2_1___mmediadll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__mmediadll___importlib = $(COND_PLATFORM_OS2_1___mmediadll___importlib)
-COND_WINDOWS_IMPLIB_1___mmediadll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__mmediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mmediadll___importlib)
-@COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
-@COND_ICC_PCH_1@__mmediadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_mmediadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_mmediadll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___mmediadll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__mmediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mmediadll___soname_flags)
-COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__mmediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__mmediadll___win32rc = mmediadll_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_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS =  \
-	mmediadll_cdunix.o \
-	mmediadll_sndesd.o \
-	mmediadll_sndoss.o \
-	mmediadll_vidxanm.o
-@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS)
-@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_WIN32_1@	= mmediadll_cdwin.o mmediadll_sndwin.o \
-@COND_PLATFORM_WIN32_1@	mmediadll_vidwin.o
-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___mmedialib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
-@COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
-@COND_SHARED_0@__uninstall_mmedialib___depname = uninstall_mmedialib
-@COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
-@COND_ICC_PCH_1@__mmedialib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_mmedialib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_mmedialib/wx/wxprec.h.gch
-COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =  \
-	mmedialib_cdunix.o \
-	mmedialib_sndesd.o \
-	mmedialib_sndoss.o \
-	mmedialib_vidxanm.o
-@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1)
-@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@	= mmedialib_cdwin.o mmedialib_sndwin.o \
-@COND_PLATFORM_WIN32_1@	mmedialib_vidwin.o
-@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: $(__mmediadll___depname) $(__mmedialib___depname)
-
-install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.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_mmediadll___depname) $(__uninstall_mmedialib___depname)
-	for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD)  $(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@	$(__mmediadll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_mmediadll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_mmediadll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(MMEDIALIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_mmedialib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_mmedialib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
-
-mmediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
-	$(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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdunix.cpp
-
-mmediadll_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndesd.cpp
-
-mmediadll_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndoss.cpp
-
-mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidxanm.cpp
-
-mmediadll_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdwin.cpp
-
-mmediadll_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwin.cpp
-
-mmediadll_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidwin.cpp
-
-mmediadll_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdbase.cpp
-
-mmediadll_g711.o: $(srcdir)/g711.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g711.cpp
-
-mmediadll_g721.o: $(srcdir)/g721.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g721.cpp
-
-mmediadll_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_24.cpp
-
-mmediadll_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g723_40.cpp
-
-mmediadll_g72x.o: $(srcdir)/g72x.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/g72x.cpp
-
-mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndaiff.cpp
-
-mmediadll_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndbase.cpp
-
-mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcodec.cpp
-
-mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndcpcm.cpp
-
-mmediadll_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndfile.cpp
-
-mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndg72x.cpp
-
-mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndmsad.cpp
-
-mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndpcm.cpp
-
-mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndulaw.cpp
-
-mmediadll_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/sndwav.cpp
-
-mmediadll_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIADLL_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/vidbase.cpp
-
-mmedialib_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdunix.cpp
-
-mmedialib_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndesd.cpp
-
-mmedialib_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndoss.cpp
-
-mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidxanm.cpp
-
-mmedialib_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdwin.cpp
-
-mmedialib_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwin.cpp
-
-mmedialib_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidwin.cpp
-
-mmedialib_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/cdbase.cpp
-
-mmedialib_g711.o: $(srcdir)/g711.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g711.cpp
-
-mmedialib_g721.o: $(srcdir)/g721.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g721.cpp
-
-mmedialib_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_24.cpp
-
-mmedialib_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g723_40.cpp
-
-mmedialib_g72x.o: $(srcdir)/g72x.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/g72x.cpp
-
-mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndaiff.cpp
-
-mmedialib_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndbase.cpp
-
-mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcodec.cpp
-
-mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndcpcm.cpp
-
-mmedialib_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndfile.cpp
-
-mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndg72x.cpp
-
-mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndmsad.cpp
-
-mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndpcm.cpp
-
-mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndulaw.cpp
-
-mmedialib_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/sndwav.cpp
-
-mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP)
-	$(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(srcdir)/vidbase.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_mmediadll uninstall_mmediadll install_mmedialib uninstall_mmedialib
diff --git a/contrib/src/mmedia/cdbase.cpp b/contrib/src/mmedia/cdbase.cpp
deleted file mode 100644
index 8b10eab787..0000000000
--- a/contrib/src/mmedia/cdbase.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// ---------------------------------------------------------------------------
-// Name:       cdbase.cpp
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1999
-// Copyright:  (C) 1997, 1998, 1999 Guilhem Lavaux
-// License:    wxWindows license
-// ---------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#include "wx/mmedia/cdbase.h"
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxCDAudio, wxObject)
-
-wxCDtime wxCDAudio::CDtoc::GetTrackTime(wxUint8 track) const
-{
-  if (track > total_time.track) {
-    wxCDtime dummy_time = {0, 0, 0, 0};
-    return dummy_time;
-  }
-  return tracks_time[track];
-}
-
-wxCDtime wxCDAudio::CDtoc::GetTrackPos(wxUint8 track) const
-{
-  if (track > total_time.track) {
-    wxCDtime dummy_time = {0, 0, 0, 0};
-    return dummy_time;
-  }
-  return tracks_pos[track];
-}
-
-bool wxCDAudio::Play(const wxCDtime& beg_play)
-{
-  return Play(beg_play, GetToc().GetTotalTime());
-}
-
-bool wxCDAudio::Play(wxUint8 beg_track, wxUint8 end_track)
-{
-  wxCDtime beg_play = GetToc().GetTrackPos(beg_track);
-  wxCDtime end_play;
-
-  if (end_track)
-    end_play = GetToc().GetTrackPos(end_track);
-  else
-    end_play = GetToc().GetTotalTime();
-  return Play(beg_play, end_play);
-}
diff --git a/contrib/src/mmedia/cdunix.cpp b/contrib/src/mmedia/cdunix.cpp
deleted file mode 100644
index 17fab7bac5..0000000000
--- a/contrib/src/mmedia/cdunix.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name:       cdlinux.cpp
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS Id: $Id$
-// License:    wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if HAVE_KNOWN_CDROM_INTERFACE
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#include "wx/mmedia/cdbase.h"
-#include "wx/mmedia/cdunix.h"
-
-// ---------------------------------------------------------------------------
-// System headers
-// ---------------------------------------------------------------------------
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifdef __linux__
-#include <linux/cdrom.h>
-#else
-// For Solaris
-#include <sys/cdio.h>
-#endif
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCDAudioLinux, wxCDAudio)
-
-wxCDAudioLinux::wxCDAudioLinux()
-    : wxCDAudio(), m_fd(-1)
-{
-  OpenDevice(wxT("/dev/cdrom"));
-}
-
-wxCDAudioLinux::wxCDAudioLinux(const wxString& dev_name)
-    : wxCDAudio(), m_fd(-1)
-{
-  OpenDevice(dev_name);
-}
-
-wxCDAudioLinux::~wxCDAudioLinux()
-{
-  if (m_fd != -1) {
-    close(m_fd);
-    wxDELETE(m_trksize);
-    wxDELETE(m_trkpos);
-  }
-}
-
-void wxCDAudioLinux::OpenDevice(const wxString& dev_name)
-{
-  struct cdrom_tocentry entry, old_entry;
-  struct cdrom_tochdr diskinf;
-  struct cdrom_msf0 *msf = &entry.cdte_addr.msf,
-              *old_msf = &old_entry.cdte_addr.msf;
-  wxCDtime *the_track;
-  wxCDtime tot_tm;
-  wxUint8 nb_tracks, i;
-  int hour, minute, second;
-
-  if (m_fd != -1)
-    return;
-
-  m_fd = open(dev_name.mb_str(), O_RDONLY);
-  if (m_fd == -1) {
-    m_toc = NULL;
-    return;
-  }
-  m_status = STOPPED;  
-
-  ioctl(m_fd, CDROMREADTOCHDR, &diskinf);
-
-  nb_tracks = diskinf.cdth_trk1-diskinf.cdth_trk0+1;
-  m_trksize = new wxCDtime[nb_tracks+1];
-  m_trkpos  = new wxCDtime[nb_tracks+1];
-
-  old_msf->minute = 0;
-  old_msf->second = 0;
-  for (i=diskinf.cdth_trk0;i<=diskinf.cdth_trk1;i++) {
-    entry.cdte_track = i;
-    entry.cdte_format = CDROM_MSF;
-    ioctl(m_fd, CDROMREADTOCENTRY, &entry);
-
-    minute = msf->minute - old_msf->minute;
-    second = msf->second - old_msf->second;
-    if (second < 0) {
-      minute--;
-      second += 60;
-    }
-
-    hour = minute / 60;
-    minute %= 60;
-
-    the_track = &m_trksize[i-diskinf.cdth_trk0];
-    the_track->track = i-diskinf.cdth_trk0;
-    the_track->hour = hour;
-    the_track->min = minute;
-    the_track->sec = second;
-    
-    the_track = &m_trkpos[i-diskinf.cdth_trk0];
-    the_track->track = i-diskinf.cdth_trk0;
-    the_track->hour = old_msf->minute / 60;
-    the_track->min = old_msf->minute % 60;
-    the_track->sec = old_msf->second;
-    old_entry = entry;
-  }
-
-  entry.cdte_track = CDROM_LEADOUT;
-  entry.cdte_format = CDROM_MSF;
-  ioctl(m_fd, CDROMREADTOCENTRY, &entry);
-
-  tot_tm.track = nb_tracks;
-  tot_tm.hour = msf->minute / 60;
-  tot_tm.min = msf->minute % 60;
-  tot_tm.sec = msf->second % 60;
-
-  m_trksize[nb_tracks].track = nb_tracks;
-  minute = msf->minute - old_msf->minute;
-  second = msf->second - old_msf->second;
-  if (second < 0) {
-    minute--;
-    second += 60;
-  }
-  hour = minute / 60;
-  minute %= 60;
-
-  m_trksize[nb_tracks].hour = hour;
-  m_trksize[nb_tracks].min  = minute;
-  m_trksize[nb_tracks].sec  = second;
-  m_trkpos[nb_tracks].track = nb_tracks;
-  m_trkpos[nb_tracks].hour  = old_msf->minute / 60;
-  m_trkpos[nb_tracks].min   = old_msf->minute % 60;
-  m_trkpos[nb_tracks].sec   = old_msf->second;
-
-  m_toc = new CDtoc(tot_tm, m_trksize, m_trkpos);
-}
-
-bool wxCDAudioLinux::Play(const wxCDtime& beg_time, const wxCDtime& end_time)
-{
-  struct cdrom_msf track_msf;
-
-  track_msf.cdmsf_min0 = beg_time.hour * 60 + beg_time.min;
-  track_msf.cdmsf_sec0 = beg_time.sec;
-  track_msf.cdmsf_frame0 = 0;
-  track_msf.cdmsf_min1 = end_time.hour * 60 + end_time.min;
-  track_msf.cdmsf_sec1 = end_time.sec;
-  track_msf.cdmsf_frame1 = 0;
-  return (ioctl(m_fd, CDROMPLAYMSF, &track_msf) != -1);
-}
-
-bool wxCDAudioLinux::Pause()
-{
-  return (ioctl(m_fd, CDROMPAUSE, 0) != -1);
-}
-
-bool wxCDAudioLinux::Resume()
-{
-  return (ioctl(m_fd, CDROMRESUME, 0) != -1);
-}
-
-wxCDAudio::CDstatus wxCDAudioLinux::GetStatus()
-{
-  struct cdrom_subchnl subchnl;
-  ioctl(m_fd, CDROMSUBCHNL, &subchnl);
-  switch (subchnl.cdsc_audiostatus) {
-  case CDROM_AUDIO_PLAY: return PLAYING;
-  case CDROM_AUDIO_PAUSED: return PAUSED;
-  case CDROM_AUDIO_COMPLETED: return STOPPED;
-  }
-
-  return STOPPED;
-}
-
-wxCDtime wxCDAudioLinux::GetTime()
-{
-  wxCDtime cdtime;
-  struct cdrom_subchnl subchnl;
-
-  ioctl(m_fd, CDROMSUBCHNL, &subchnl);
-  cdtime.track = subchnl.cdsc_trk;
-  cdtime.min = subchnl.cdsc_reladdr.msf.minute;
-  cdtime.hour = cdtime.min / 60;
-  cdtime.min %= 60;
-  cdtime.sec = subchnl.cdsc_reladdr.msf.second;
-
-  return cdtime;
-}
-
-wxCDAudio::CDtoc& wxCDAudioLinux::GetToc()
-{
-  return *m_toc;
-}
-
-#endif
diff --git a/contrib/src/mmedia/cdwin.cpp b/contrib/src/mmedia/cdwin.cpp
deleted file mode 100644
index 8ccc325d11..0000000000
--- a/contrib/src/mmedia/cdwin.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name:       cdwin.cpp
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// License:    wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifdef __WINDOWS__
-
-// ---------------------------------------------------------------------------
-// System headers
-// ---------------------------------------------------------------------------
-
-#include <windows.h>
-#include <stdio.h>
-#include <mmsystem.h>
-
-// ---------------------------------------------------------------------------
-// MMedia headers
-// ---------------------------------------------------------------------------
-
-#define WXMMEDIA_INTERNAL
-#include "wx/mmedia/cdbase.h"
-#include "wx/mmedia/cdwin.h"
-
-// ---------------------------------------------------------------------------
-// Implementation
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCDAudioWin, wxCDAudio)
-    
-wxCDAudioWin::wxCDAudioWin(void)
-  : wxCDAudio(), m_trksize(NULL), m_trkpos(NULL), m_toc(NULL), m_ok(true)
-{
-  MCI_OPEN_PARMS open_struct;
-  MCI_SET_PARMS set_struct;
-
-  m_internal = new CDAW_Internal;
-  open_struct.lpstrDeviceType = _T("cdaudio");
-  DWORD ret = mciSendCommand((MCIDEVICEID)NULL, MCI_OPEN, MCI_OPEN_TYPE,
-                       (DWORD)&open_struct);
-  if (ret) {
-    m_ok = false;
-    return;
-  }
-  m_internal->dev_id = open_struct.wDeviceID;
-
-  set_struct.dwTimeFormat = MCI_FORMAT_MSF;
-  mciSendCommand(m_internal->dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
-                       (DWORD)(LPVOID)&set_struct);
-
-  PrepareToc();
-
-  set_struct.dwTimeFormat = MCI_FORMAT_TMSF;
-  mciSendCommand(m_internal->dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
-                       (DWORD)(LPVOID)&set_struct);
-}
-
-wxCDAudioWin::~wxCDAudioWin(void)
-{
-  if (m_ok) {
-    mciSendCommand(m_internal->dev_id, MCI_CLOSE, 0,(DWORD_PTR)NULL);
-    delete m_toc;
-    delete[] m_trksize;
-    delete[] m_trkpos;
-  }
-  delete m_internal;
-}
-
-void wxCDAudioWin::PrepareToc(void)
-{
-  MCI_STATUS_PARMS status_struct;
-  wxUint16 i, nb_m_trksize;
-  wxCDtime total_time, *trk;
-  DWORD tmem;
-
-  if (!m_ok)
-    return;
-
-  status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
-  mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
-                 (DWORD)&status_struct);
-  nb_m_trksize = status_struct.dwReturn;
-
-  m_trksize = new wxCDtime[nb_m_trksize+1];
-  m_trkpos = new wxCDtime[nb_m_trksize+1];
-
-  status_struct.dwItem = MCI_STATUS_LENGTH;
-  mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
-                 (DWORD)&status_struct);
-  total_time.track = nb_m_trksize;
-  tmem = status_struct.dwReturn;
-  total_time.min = MCI_MSF_MINUTE(tmem);
-  total_time.sec = MCI_MSF_SECOND(tmem);
-  total_time.hour = total_time.min / 60;
-  total_time.min %= 60;
-
-  for (i=1;i<=nb_m_trksize;i++) {
-    status_struct.dwItem = MCI_STATUS_POSITION;
-    status_struct.dwTrack = i;
-    mciSendCommand(m_internal->dev_id, MCI_STATUS,
-                   MCI_STATUS_ITEM | MCI_TRACK,
-                   (DWORD)(LPVOID)&status_struct);
-    tmem = status_struct.dwReturn;
-
-    trk        = &m_trkpos[i];
-    trk->track = i;
-    trk->min   = MCI_MSF_MINUTE(tmem);
-    trk->sec   = MCI_MSF_SECOND(tmem);
-    trk->hour  = trk->min / 60;
-    trk->min  %= 60;
-
-    status_struct.dwItem = MCI_STATUS_LENGTH;
-    status_struct.dwTrack = i;
-    mciSendCommand(m_internal->dev_id, MCI_STATUS,
-                   MCI_STATUS_ITEM | MCI_TRACK,
-                   (DWORD)(LPVOID)&status_struct);
-    tmem = status_struct.dwReturn;
-
-    trk        = &m_trksize[i];
-    trk->track = i;
-    trk->min   = MCI_MSF_MINUTE(tmem);
-    trk->sec   = MCI_MSF_SECOND(tmem);
-    trk->hour  = trk->min / 60;
-    trk->min  %= 60;
-  }
-
-  m_toc = new CDtoc(total_time, m_trksize, m_trkpos);
-}
-
-bool wxCDAudioWin::Play(const wxCDtime& beg_time, const wxCDtime& end_time)
-{
-  DWORD tmsf;
-  MCI_PLAY_PARMS play_struct;
-
-  if (!m_ok)
-    return false;
-
-  tmsf = MCI_MAKE_TMSF(beg_time.track, beg_time.min,
-                       beg_time.sec, 0);
-  play_struct.dwFrom = tmsf;
-  tmsf = MCI_MAKE_TMSF(end_time.track, end_time.min,
-                       end_time.sec, 0);
-  play_struct.dwTo = tmsf;
-
-  mciSendCommand(m_internal->dev_id, MCI_PLAY, 0, (DWORD)&play_struct);
-  return true;
-}
-
-bool wxCDAudioWin::Pause(void)
-{
-  if (!m_ok)
-    return false;
-
-  return (mciSendCommand(m_internal->dev_id, MCI_PAUSE, 0, 0) == 0);
-}
-
-bool wxCDAudioWin::Resume(void)
-{
-  if (!m_ok)
-    return false;
-
-  return (mciSendCommand(m_internal->dev_id, MCI_RESUME, 0, 0) == 0);
-}
-
-wxCDAudio::CDstatus wxCDAudioWin::GetStatus(void)
-{
-  MCI_STATUS_PARMS status_struct;
-
-  if (!m_ok)
-    return STOPPED;
-
-  status_struct.dwItem = MCI_STATUS_MODE;
-  mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
-                 (DWORD)&status_struct);
-  switch (status_struct.dwReturn) {
-  case MCI_MODE_PAUSE:
-    return PAUSED;
-  case MCI_MODE_PLAY:
-    return PLAYING;
-  }
-  return STOPPED;
-}
-
-wxCDtime wxCDAudioWin::GetTime(void)
-{
-  MCI_STATUS_PARMS status_struct;
-  wxCDtime cd_time = {0,0,0,0};
-
-  if (!m_ok)
-    return cd_time;
-
-  status_struct.dwItem = MCI_STATUS_TIME_FORMAT;
-  mciSendCommand(m_internal->dev_id, MCI_STATUS, MCI_STATUS_ITEM,
-                 (DWORD)&status_struct);
-  cd_time.track = MCI_TMSF_TRACK(status_struct.dwReturn);
-  cd_time.min = MCI_TMSF_MINUTE(status_struct.dwReturn);
-  cd_time.sec = MCI_TMSF_SECOND(status_struct.dwReturn);
-  cd_time.hour = cd_time.min / 60;
-  cd_time.min %= 60;
-  return cd_time;
-}
-
-const wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void)
-{
-  return *m_toc;
-}
-
-#endif
-   // __WINDOWS__
diff --git a/contrib/src/mmedia/g711.cpp b/contrib/src/mmedia/g711.cpp
deleted file mode 100644
index 60517b2eb0..0000000000
--- a/contrib/src/mmedia/g711.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#include "wx/wxprec.h"
-
-/*
- * g711.c
- *
- * u-law, A-law and linear PCM conversions.
- */
-#define    SIGN_BIT    (0x80)        /* Sign bit for a A-law byte. */
-#define    QUANT_MASK  (0xf)         /* Quantization field mask. */
-#define    NSEGS       (8)           /* Number of A-law segments. */
-#define    SEG_SHIFT   (4)           /* Left shift for segment number. */
-#define    SEG_MASK    (0x70)        /* Segment field mask. */
-
-static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
-                           0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
-
-/* copy from CCITT G.711 specifications */
-unsigned char _u2a[128] = {            /* u- to A-law conversions */
-     1,     1,     2,     2,     3,     3,     4,     4,
-     5,     5,     6,     6,     7,     7,     8,     8,
-     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,
-    25,    27,    29,    31,    33,    34,    35,    36,
-    37,    38,    39,    40,    41,    42,    43,    44,
-    46,    48,    49,    50,    51,    52,    53,    54,
-    55,    56,    57,    58,    59,    60,    61,    62,
-    64,    65,    66,    67,    68,    69,    70,    71,
-    72,    73,    74,    75,    76,    77,    78,    79,
-    81,    82,    83,    84,    85,    86,    87,    88,
-    89,    90,    91,    92,    93,    94,    95,    96,
-    97,    98,    99,   100,   101,   102,   103,   104,
-   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,   115,   116,   117,   118,   119,   120,
-   121,   122,   123,   124,   125,   126,   127,   128};
-
-unsigned char _a2u[128] = {            /* A- to u-law conversions */
-     1,     3,     5,     7,     9,    11,    13,    15,
-    16,    17,    18,    19,    20,    21,    22,    23,
-    24,    25,    26,    27,    28,    29,    30,    31,
-    32,    32,    33,    33,    34,    34,    35,    35,
-    36,    37,    38,    39,    40,    41,    42,    43,
-    44,    45,    46,    47,    48,    48,    49,    49,
-    50,    51,    52,    53,    54,    55,    56,    57,
-    58,    59,    60,    61,    62,    63,    64,    64,
-    65,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    76,    77,    78,    79,    79,
-    80,    81,    82,    83,    84,    85,    86,    87,
-    88,    89,    90,    91,    92,    93,    94,    95,
-    96,    97,    98,    99,   100,   101,   102,   103,
-   104,   105,   106,   107,   108,   109,   110,   111,
-   112,   113,   114,   115,   116,   117,   118,   119,
-   120,   121,   122,   123,   124,   125,   126,   127};
-
-static int
-search(
-    int        val,
-    short     *table,
-    int        size)
-{
-    int i;
-
-    for (i = 0; i < size; i++) {
-        if (val <= *table++)
-            return (i);
-    }
-    return (size);
-}
-
-/*
- * linear2alaw() - Convert a 16-bit linear PCM value to 8-bit A-law
- *
- * linear2alaw() accepts an 16-bit integer and encodes it as A-law data.
- *
- *        Linear Input Code       Compressed Code
- *    ------------------------    ---------------
- *    0000000wxyza                    000wxyz
- *    0000001wxyza                    001wxyz
- *    000001wxyzab                    010wxyz
- *    00001wxyzabc                    011wxyz
- *    0001wxyzabcd                    100wxyz
- *    001wxyzabcde                    101wxyz
- *    01wxyzabcdef                    110wxyz
- *    1wxyzabcdefg                    111wxyz
- *
- * For further information see John C. Bellamy's Digital Telephony, 1982,
- * John Wiley & Sons, pps 98-111 and 472-476.
- */
-unsigned char
-linear2alaw(
-    int        pcm_val)    /* 2's complement (16-bit range) */
-{
-    int              mask;
-    int              seg;
-    unsigned char    aval;
-
-    if (pcm_val >= 0) {
-        mask = 0xD5;        /* sign (7th) bit = 1 */
-    } else {
-        mask = 0x55;        /* sign bit = 0 */
-        pcm_val = -pcm_val - 8;
-    }
-
-    /* Convert the scaled magnitude to segment number. */
-    seg = search(pcm_val, seg_end, 8);
-
-    /* Combine the sign, segment, and quantization bits. */
-
-    if (seg >= 8)        /* out of range, return maximum value. */
-        return (0x7F ^ mask);
-    else {
-        aval = seg << SEG_SHIFT;
-        if (seg < 2)
-            aval |= (pcm_val >> 4) & QUANT_MASK;
-        else
-            aval |= (pcm_val >> (seg + 3)) & QUANT_MASK;
-        return (aval ^ mask);
-    }
-}
-
-/*
- * alaw2linear() - Convert an A-law value to 16-bit linear PCM
- *
- */
-int
-alaw2linear(
-    unsigned char    a_val)
-{
-    int        t;
-    int        seg;
-
-    a_val ^= 0x55;
-
-    t = (a_val & QUANT_MASK) << 4;
-    seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT;
-    switch (seg) {
-    case 0:
-        t += 8;
-        break;
-    case 1:
-        t += 0x108;
-        break;
-    default:
-        t += 0x108;
-        t <<= seg - 1;
-    }
-    return ((a_val & SIGN_BIT) ? t : -t);
-}
-
-#define    BIAS        (0x84)        /* Bias for linear code. */
-
-/*
- * linear2ulaw() - Convert a linear PCM value to u-law
- *
- * In order to simplify the encoding process, the original linear magnitude
- * is biased by adding 33 which shifts the encoding range from (0 - 8158) to
- * (33 - 8191). The result can be seen in the following encoding table:
- *
- *    Biased Linear Input Code    Compressed Code
- *    ------------------------    ---------------
- *    00000001wxyza                   000wxyz
- *    0000001wxyzab                   001wxyz
- *    000001wxyzabc                   010wxyz
- *    00001wxyzabcd                   011wxyz
- *    0001wxyzabcde                   100wxyz
- *    001wxyzabcdef                   101wxyz
- *    01wxyzabcdefg                   110wxyz
- *    1wxyzabcdefgh                   111wxyz
- *
- * Each biased linear code has a leading 1 which identifies the segment
- * number. The value of the segment number is equal to 7 minus the number
- * of leading 0's. The quantization interval is directly available as the
- * four bits wxyz.  * The trailing bits (a - h) are ignored.
- *
- * Ordinarily the complement of the resulting code word is used for
- * transmission, and so the code word is complemented before it is returned.
- *
- * For further information see John C. Bellamy's Digital Telephony, 1982,
- * John Wiley & Sons, pps 98-111 and 472-476.
- */
-unsigned char
-linear2ulaw(
-    int        pcm_val)    /* 2's complement (16-bit range) */
-{
-    int              mask;
-    int              seg;
-    unsigned char    uval;
-
-    /* Get the sign and the magnitude of the value. */
-    if (pcm_val < 0) {
-        pcm_val = BIAS - pcm_val;
-        mask = 0x7F;
-    } else {
-        pcm_val += BIAS;
-        mask = 0xFF;
-    }
-
-    /* Convert the scaled magnitude to segment number. */
-    seg = search(pcm_val, seg_end, 8);
-
-    /*
-     * Combine the sign, segment, quantization bits;
-     * and complement the code word.
-     */
-    if (seg >= 8)        /* out of range, return maximum value. */
-        return (0x7F ^ mask);
-    else {
-        uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0xF);
-        return (uval ^ mask);
-    }
-
-}
-
-/*
- * ulaw2linear() - Convert a u-law value to 16-bit linear PCM
- *
- * First, a biased linear code is derived from the code word. An unbiased
- * output can then be obtained by subtracting 33 from the biased code.
- *
- * Note that this function expects to be passed the complement of the
- * original code word. This is in keeping with ISDN conventions.
- */
-int
-ulaw2linear(
-    unsigned char    u_val)
-{
-    int t;
-
-    /* Complement to obtain normal u-law value. */
-    u_val = ~u_val;
-
-    /*
-     * Extract and bias the quantization bits. Then
-     * shift up by the segment number and subtract out the bias.
-     */
-    t = ((u_val & QUANT_MASK) << 3) + BIAS;
-    t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
-
-    return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
-}
-
-/* A-law to u-law conversion */
-unsigned char
-alaw2ulaw(
-    unsigned char    aval)
-{
-    aval &= 0xff;
-    return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
-        (0x7F ^ _a2u[aval ^ 0x55]));
-}
-
-/* u-law to A-law conversion */
-unsigned char
-ulaw2alaw(
-    unsigned char    uval)
-{
-    uval &= 0xff;
-    return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
-        (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
-}
diff --git a/contrib/src/mmedia/g721.cpp b/contrib/src/mmedia/g721.cpp
deleted file mode 100644
index 4068c5b85d..0000000000
--- a/contrib/src/mmedia/g721.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#include "wx/wxprec.h"
-
-/*
- * g721.c
- *
- * Description:
- *
- * g721_encoder(), g721_decoder()
- *
- * These routines comprise an implementation of the CCITT G.721 ADPCM
- * coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of work station attributes, such as hardware 2's
- * complement arithmetic and large memory.  Specifically, certain time
- * consuming operations such as multiplications are replaced
- * with lookup tables and software 2's complement operations are
- * replaced with hardware 2's complement.
- *
- * The deviation from the bit level specification (lookup tables)
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.721 Recommendation, the algorithm is broken
- * down into modules.  Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- */
-#include "wx/mmedia/internal/g72x.h"
-
-static short qtab_721[7] = {-124, 80, 178, 246, 300, 349, 400};
-/*
- * Maps G.721 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[16] = {-2048, 4, 135, 213, 273, 323, 373, 425,
-                425, 373, 323, 273, 213, 135, 4, -2048};
-
-/* Maps G.721 code word to log of scale factor multiplier. */
-static short _witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122,
-                1122, 355, 198, 112, 64, 41, 18, -12};
-/*
- * Maps G.721 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
-                0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
-
-/*
- * g721_encoder()
- *
- * Encodes the input vale of linear PCM, A-law or u-law data sl and returns
- * the resulting code. -1 is returned for unknown input coding value.
- */
-int
-g721_encoder(
-    int                sl,
-    int                in_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sezi, se, sez;        /* ACCUM */
-    short        d;                    /* SUBTA */
-    short        sr;                   /* ADDB */
-    short        y;                    /* MIX */
-    short        dqsez;                /* ADDC */
-    short        dq, i;
-
-    switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-    case AUDIO_ENCODING_ALAW:
-        sl = alaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_ULAW:
-        sl = ulaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_LINEAR:
-        sl = ((short)sl) >> 2;        /* 14-bit dynamic range */
-        break;
-    default:
-        return (-1);
-    }
-
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    se = (sezi + predictor_pole(state_ptr)) >> 1;    /* estimated signal */
-
-    d = sl - se;                /* estimation difference */
-
-    /* quantize the prediction difference */
-    y = step_size(state_ptr);        /* quantizer step size */
-    i = quantize(d, y, qtab_721, 7);    /* i = ADPCM code */
-
-    dq = reconstruct(i & 8, _dqlntab[i], y);    /* quantized est diff */
-
-    sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq;    /* reconst. signal */
-
-    dqsez = sr + sez - se;            /* pole prediction diff. */
-
-    update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
-    return (i);
-}
-
-/*
- * g721_decoder()
- *
- * Description:
- *
- * Decodes a 4-bit code of G.721 encoded data of i and
- * returns the resulting linear PCM, A-law or u-law value.
- * return -1 for unknown out_coding value.
- */
-int
-g721_decoder(
-    int                i,
-    int                out_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sezi, sei, sez, se;    /* ACCUM */
-    short        y;                     /* MIX */
-    short        sr;                    /* ADDB */
-    short        dq;
-    short        dqsez;
-
-    i &= 0x0f;            /* mask to get proper bits */
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    sei = sezi + predictor_pole(state_ptr);
-    se = sei >> 1;            /* se = estimated signal */
-
-    y = step_size(state_ptr);    /* dynamic quantizer step size */
-
-    dq = reconstruct(i & 0x08, _dqlntab[i], y); /* quantized diff. */
-
-    sr = (dq < 0) ? (se - (dq & 0x3FFF)) : se + dq;    /* reconst. signal */
-
-    dqsez = sr - se + sez;            /* pole prediction diff. */
-
-    update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
-    switch (out_coding) {
-    case AUDIO_ENCODING_ALAW:
-        return (tandem_adjust_alaw(sr, se, y, i, 8, qtab_721));
-    case AUDIO_ENCODING_ULAW:
-        return (tandem_adjust_ulaw(sr, se, y, i, 8, qtab_721));
-    case AUDIO_ENCODING_LINEAR:
-        return (sr << 2);    /* sr was 14-bit dynamic range */
-    default:
-        return (-1);
-    }
-}
diff --git a/contrib/src/mmedia/g723_24.cpp b/contrib/src/mmedia/g723_24.cpp
deleted file mode 100644
index 6e31578df1..0000000000
--- a/contrib/src/mmedia/g723_24.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g723_24.c
- *
- * Description:
- *
- * g723_24_encoder(), g723_24_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 24 Kbps
- * ADPCM coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which take advantage
- * of workstation attributes, such as hardware 2's complement arithmetic.
- *
- */
-#include "wx/wxprec.h"
-#include "wx/mmedia/internal/g72x.h"
-
-/*
- * Maps G.723_24 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[8] = {-2048, 135, 273, 373, 373, 273, 135, -2048};
-
-/* Maps G.723_24 code word to log of scale factor multiplier. */
-static short _witab[8] = {-128, 960, 4384, 18624, 18624, 4384, 960, -128};
-
-/*
- * Maps G.723_24 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[8] = {0, 0x200, 0x400, 0xE00, 0xE00, 0x400, 0x200, 0};
-
-static short qtab_723_24[3] = {8, 218, 331};
-
-/*
- * g723_24_encoder()
- *
- * Encodes a linear PCM, A-law or u-law input sample and returns its 3-bit code.
- * Returns -1 if invalid input coding value.
- */
-int
-g723_24_encoder(
-    int                sl,
-    int                in_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sei, sezi, se, sez;    /* ACCUM */
-    short        d;                     /* SUBTA */
-    short        y;                     /* MIX */
-    short        sr;                    /* ADDB */
-    short        dqsez;                 /* ADDC */
-    short        dq, i;
-
-    switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-    case AUDIO_ENCODING_ALAW:
-        sl = alaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_ULAW:
-        sl = ulaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_LINEAR:
-        sl = ((short)sl) >> 2;        /* sl of 14-bit dynamic range */
-        break;
-    default:
-        return (-1);
-    }
-
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    sei = sezi + predictor_pole(state_ptr);
-    se = sei >> 1;            /* se = estimated signal */
-
-    d = sl - se;            /* d = estimation diff. */
-
-    /* quantize prediction difference d */
-    y = step_size(state_ptr);    /* quantizer step size */
-    i = quantize(d, y, qtab_723_24, 3);    /* i = ADPCM code */
-    dq = reconstruct(i & 4, _dqlntab[i], y); /* quantized diff. */
-
-    sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */
-
-    dqsez = sr + sez - se;        /* pole prediction diff. */
-
-    update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-    return (i);
-}
-
-/*
- * g723_24_decoder()
- *
- * Decodes a 3-bit CCITT G.723_24 ADPCM code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g723_24_decoder(
-    int                i,
-    int                out_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sezi, sei, sez, se;    /* ACCUM */
-    short        y;                     /* MIX */
-    short        sr;                    /* ADDB */
-    short        dq;
-    short        dqsez;
-
-    i &= 0x07;            /* mask to get proper bits */
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    sei = sezi + predictor_pole(state_ptr);
-    se = sei >> 1;            /* se = estimated signal */
-
-    y = step_size(state_ptr);    /* adaptive quantizer step size */
-    dq = reconstruct(i & 0x04, _dqlntab[i], y); /* unquantize pred diff */
-
-    sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */
-
-    dqsez = sr - se + sez;            /* pole prediction diff. */
-
-    update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-    switch (out_coding) {
-    case AUDIO_ENCODING_ALAW:
-        return (tandem_adjust_alaw(sr, se, y, i, 4, qtab_723_24));
-    case AUDIO_ENCODING_ULAW:
-        return (tandem_adjust_ulaw(sr, se, y, i, 4, qtab_723_24));
-    case AUDIO_ENCODING_LINEAR:
-        return (sr << 2);    /* sr was of 14-bit dynamic range */
-    default:
-        return (-1);
-    }
-}
diff --git a/contrib/src/mmedia/g723_40.cpp b/contrib/src/mmedia/g723_40.cpp
deleted file mode 100644
index 30c5b431d6..0000000000
--- a/contrib/src/mmedia/g723_40.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g723_40.c
- *
- * Description:
- *
- * g723_40_encoder(), g723_40_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 40Kbps
- * ADPCM coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of workstation attributes, such as hardware 2's
- * complement arithmetic.
- *
- * The deviation from the bit level specification (lookup tables),
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.723 Recommendation, the algorithm is broken
- * down into modules.  Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- */
-#include "wx/wxprec.h"
-#include "wx/mmedia/internal/g72x.h"
-
-/*
- * Maps G.723_40 code word to ructeconstructed scale factor normalized log
- * magnitude values.
- */
-static short _dqlntab[32] = {-2048, -66, 28, 104, 169, 224, 274, 318,
-                358, 395, 429, 459, 488, 514, 539, 566,
-                566, 539, 514, 488, 459, 429, 395, 358,
-                318, 274, 224, 169, 104, 28, -66, -2048};
-
-/* Maps G.723_40 code word to log of scale factor multiplier. */
-static short _witab[32] = {448, 448, 768, 1248, 1280, 1312, 1856, 3200,
-            4512, 5728, 7008, 8960, 11456, 14080, 16928, 22272,
-            22272, 16928, 14080, 11456, 8960, 7008, 5728, 4512,
-            3200, 1856, 1312, 1280, 1248, 768, 448, 448};
-
-/*
- * Maps G.723_40 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short _fitab[32] = {0, 0, 0, 0, 0, 0x200, 0x200, 0x200,
-            0x200, 0x200, 0x400, 0x600, 0x800, 0xA00, 0xC00, 0xC00,
-            0xC00, 0xC00, 0xA00, 0x800, 0x600, 0x400, 0x200, 0x200,
-            0x200, 0x200, 0x200, 0, 0, 0, 0, 0};
-
-static short qtab_723_40[15] = {-122, -16, 68, 139, 198, 250, 298, 339,
-                378, 413, 445, 475, 502, 528, 553};
-
-/*
- * g723_40_encoder()
- *
- * Encodes a 16-bit linear PCM, A-law or u-law input sample and retuens
- * the resulting 5-bit CCITT G.723 40Kbps code.
- * Returns -1 if the input coding value is invalid.
- */
-int
-g723_40_encoder(
-    int                sl,
-    int                in_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sei, sezi, se, sez;    /* ACCUM */
-    short        d;                     /* SUBTA */
-    short        y;                     /* MIX */
-    short        sr;                    /* ADDB */
-    short        dqsez;                 /* ADDC */
-    short        dq, i;
-
-    switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-    case AUDIO_ENCODING_ALAW:
-        sl = alaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_ULAW:
-        sl = ulaw2linear(sl) >> 2;
-        break;
-    case AUDIO_ENCODING_LINEAR:
-        sl = ((short) sl) >> 2;        /* sl of 14-bit dynamic range */
-        break;
-    default:
-        return (-1);
-    }
-
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    sei = sezi + predictor_pole(state_ptr);
-    se = sei >> 1;            /* se = estimated signal */
-
-    d = sl - se;            /* d = estimation difference */
-
-    /* quantize prediction difference */
-    y = step_size(state_ptr);    /* adaptive quantizer step size */
-    i = quantize(d, y, qtab_723_40, 15);    /* i = ADPCM code */
-
-    dq = reconstruct(i & 0x10, _dqlntab[i], y);    /* quantized diff */
-
-    sr = (dq < 0) ? se - (dq & 0x7FFF) : se + dq; /* reconstructed signal */
-
-    dqsez = sr + sez - se;        /* dqsez = pole prediction diff. */
-
-    update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-    return (i);
-}
-
-/*
- * g723_40_decoder()
- *
- * Decodes a 5-bit CCITT G.723 40Kbps code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g723_40_decoder(
-    int                i,
-    int                out_coding,
-    struct g72x_state *state_ptr)
-{
-    short        sezi, sei, sez, se;    /* ACCUM */
-    short        y;                     /* MIX */
-    short        sr;                    /* ADDB */
-    short        dq;
-    short        dqsez;
-
-    i &= 0x1f;            /* mask to get proper bits */
-    sezi = predictor_zero(state_ptr);
-    sez = sezi >> 1;
-    sei = sezi + predictor_pole(state_ptr);
-    se = sei >> 1;            /* se = estimated signal */
-
-    y = step_size(state_ptr);    /* adaptive quantizer step size */
-    dq = reconstruct(i & 0x10, _dqlntab[i], y);    /* estimation diff. */
-
-    sr = (dq < 0) ? (se - (dq & 0x7FFF)) : (se + dq); /* reconst. signal */
-
-    dqsez = sr - se + sez;        /* pole prediction diff. */
-
-    update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-    switch (out_coding) {
-    case AUDIO_ENCODING_ALAW:
-        return (tandem_adjust_alaw(sr, se, y, i, 0x10, qtab_723_40));
-    case AUDIO_ENCODING_ULAW:
-        return (tandem_adjust_ulaw(sr, se, y, i, 0x10, qtab_723_40));
-    case AUDIO_ENCODING_LINEAR:
-        return (sr << 2);    /* sr was of 14-bit dynamic range */
-    default:
-        return (-1);
-    }
-}
diff --git a/contrib/src/mmedia/g72x.cpp b/contrib/src/mmedia/g72x.cpp
deleted file mode 100644
index 97d3322c23..0000000000
--- a/contrib/src/mmedia/g72x.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g72x.c
- *
- * Common routines for G.721 and G.723 conversions.
- */
-
-#include "wx/wxprec.h"
-#include <stdlib.h>
-#include "wx/mmedia/internal/g72x.h"
-
-static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
-            0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000};
-
-/*
- * quan()
- *
- * quantizes the input val against the table of size short integers.
- * It returns i if table[i - 1] <= val < table[i].
- *
- * Using linear search for simple coding.
- */
-static int
-quan(
-    int           val,
-    short        *table,
-    int           size)
-{
-    int i;
-
-    for (i = 0; i < size; i++)
-        if (val < *table++)
-            break;
-    return (i);
-}
-
-static char quan2_tab[65536];
-static short base2_tab[65536];
-static int init_tabs_done = 0;
-
-inline char quan2 (unsigned short val)
-{
-    return quan2_tab[val];
-}
-
-inline short base2 (unsigned short val)
-{
-    return base2_tab[val];
-}
-
-static void init_quan2_tab (void)
-{
-    long i;
-
-    for (i = 0; i < 65536; i++) {
-        quan2_tab[i] = quan (i, power2, 15);
-    };
-}
-
-static void init_base2_tab (void)
-{
-    long i;
-    short exp;
-
-    for (i = 0; i < 65536; i++) {
-        exp = quan2 (short (i));
-        base2_tab[i] = short ((exp << 6) + ((i << 6) >> exp));
-    };
-}
-
-static void init_tabs (void)
-{
-    if (init_tabs_done) return;
-
-    init_quan2_tab();
-    init_base2_tab();
-
-    init_tabs_done = 1;
-}
-
-/*
- * fmult()
- *
- * returns the integer product of the 14-bit integer "an" and
- * "floating point" representation (4-bit exponent, 6-bit mantessa) "srn".
- */
-static int
-fmult(
-    int        an,
-    int        srn)
-{
-    short        anmag, anexp, anmant;
-    short        wanexp, wanmant;
-    short        retval;
-
-    anmag = (an > 0) ? an : ((-an) & 0x1FFF);
-    anexp = quan2(anmag) - 6;
-    anmant = (anmag == 0) ? 32 :
-        (anexp >= 0) ? anmag >> anexp : anmag << -anexp;
-    wanexp = anexp + ((srn >> 6) & 0xF) - 13;
-
-    wanmant = (anmant * (srn & 077) + 0x30) >> 4;
-    retval = (wanexp >= 0) ? ((wanmant << wanexp) & 0x7FFF) :
-        (wanmant >> -wanexp);
-
-    return (((an ^ srn) < 0) ? -retval : retval);
-}
-
-/*
- * g72x_init_state()
- *
- * This routine initializes and/or resets the g72x_state structure
- * pointed to by 'state_ptr'.
- * All the initial state values are specified in the CCITT G.721 document.
- */
-void
-g72x_init_state(
-    struct g72x_state *state_ptr)
-{
-    int cnta;
-
-    init_tabs ();
-
-    state_ptr->yl = 34816;
-    state_ptr->yu = 544;
-    state_ptr->dms = 0;
-    state_ptr->dml = 0;
-    state_ptr->ap = 0;
-    for (cnta = 0; cnta < 2; cnta++) {
-        state_ptr->a[cnta] = 0;
-        state_ptr->pk[cnta] = 0;
-        state_ptr->sr[cnta] = 32;
-    }
-    for (cnta = 0; cnta < 6; cnta++) {
-        state_ptr->b[cnta] = 0;
-        state_ptr->dq[cnta] = 32;
-    }
-    state_ptr->td = 0;
-}
-
-/*
- * predictor_zero()
- *
- * computes the estimated signal from 6-zero predictor.
- *
- */
-int
-predictor_zero(
-    struct g72x_state *state_ptr)
-{
-    int        i;
-    int        sezi;
-
-    sezi = fmult(state_ptr->b[0] >> 2, state_ptr->dq[0]);
-    for (i = 1; i < 6; i++)            /* ACCUM */
-        sezi += fmult(state_ptr->b[i] >> 2, state_ptr->dq[i]);
-    return (sezi);
-}
-/*
- * predictor_pole()
- *
- * computes the estimated signal from 2-pole predictor.
- *
- */
-int
-predictor_pole(
-    struct g72x_state *state_ptr)
-{
-    return (fmult(state_ptr->a[1] >> 2, state_ptr->sr[1]) +
-        fmult(state_ptr->a[0] >> 2, state_ptr->sr[0]));
-}
-/*
- * step_size()
- *
- * computes the quantization step size of the adaptive quantizer.
- *
- */
-int
-step_size(
-    struct g72x_state *state_ptr)
-{
-    int        y;
-    int        dif;
-    int        al;
-
-    if (state_ptr->ap >= 256)
-        return (state_ptr->yu);
-    else {
-        y = state_ptr->yl >> 6;
-        dif = state_ptr->yu - y;
-        al = state_ptr->ap >> 2;
-        if (dif > 0)
-            y += (dif * al) >> 6;
-        else if (dif < 0)
-            y += (dif * al + 0x3F) >> 6;
-        return (y);
-    }
-}
-
-/*
- * quantize()
- *
- * Given a raw sample, 'd', of the difference signal and a
- * quantization step size scale factor, 'y', this routine returns the
- * ADPCM codeword to which that sample gets quantized.  The step
- * size scale factor division operation is done in the log base 2 domain
- * as a subtraction.
- */
-int
-quantize(
-    int        d,        /* Raw difference signal sample */
-    int        y,        /* Step size multiplier */
-    short     *table,    /* quantization table */
-    int        size)     /* table size of short integers */
-{
-    short        dqm;    /* Magnitude of 'd' */
-    short        exp;    /* Integer part of base 2 log of 'd' */
-    short        mant;   /* Fractional part of base 2 log */
-    short        dl;     /* Log of magnitude of 'd' */
-    short        dln;    /* Step size scale factor normalized log */
-    int          i;
-
-    /*
-     * LOG
-     *
-     * Compute base 2 log of 'd', and store in 'dl'.
-     */
-    dqm = abs(d);
-    exp = quan2(dqm >> 1);
-    mant = ((dqm << 7) >> exp) & 0x7F;    /* Fractional portion. */
-    dl = (exp << 7) + mant;
-
-    /*
-     * SUBTB
-     *
-     * "Divide" by step size multiplier.
-     */
-    dln = dl - (y >> 2);
-
-    /*
-     * QUAN
-     *
-     * Obtain codword i for 'd'.
-     */
-    i = quan(dln, table, size);
-    if (d < 0)            /* take 1's complement of i */
-        return ((size << 1) + 1 - i);
-    else if (i == 0)        /* take 1's complement of 0 */
-        return ((size << 1) + 1); /* new in 1988 */
-    else
-        return (i);
-}
-/*
- * reconstruct()
- *
- * Returns reconstructed difference signal 'dq' obtained from
- * codeword 'i' and quantization step size scale factor 'y'.
- * Multiplication is performed in log base 2 domain as addition.
- */
-int
-reconstruct(
-    int        sign,    /* 0 for non-negative value */
-    int        dqln,    /* G.72x codeword */
-    int        y)       /* Step size multiplier */
-{
-    short        dql;   /* Log of 'dq' magnitude */
-    short        dex;   /* Integer part of log */
-    short        dqt;
-    short        dq;    /* Reconstructed difference signal sample */
-
-    dql = dqln + (y >> 2);    /* ADDA */
-
-    if (dql < 0) {
-        return ((sign) ? -0x8000 : 0);
-    } else {        /* ANTILOG */
-        dex = (dql >> 7) & 15;
-        dqt = 128 + (dql & 127);
-        dq = (dqt << 7) >> (14 - dex);
-        return ((sign) ? (dq - 0x8000) : dq);
-    }
-}
-
-
-/*
- * update()
- *
- * updates the state variables for each output code
- */
-void
-update(
-    int        code_size,    /* distinguish 723_40 with others */
-    int        y,            /* quantizer step size */
-    int        wi,           /* scale factor multiplier */
-    int        fi,           /* for long/short term energies */
-    int        dq,           /* quantized prediction difference */
-    int        sr,           /* reconstructed signal */
-    int        dqsez,        /* difference from 2-pole predictor */
-    struct g72x_state *state_ptr)    /* coder state pointer */
-{
-    int          cnt;
-    short        mag;        /* Adaptive predictor, FLOAT A */
-    short        a2p;        /* LIMC */
-    short        a1ul;       /* UPA1 */
-    short        pks1;       /* UPA2 */
-    short        fa1;
-    char         tr;         /* tone/transition detector */
-    short        ylint, thr2, dqthr;
-    short        ylfrac, thr1;
-    short        pk0;
-
-    pk0 = (dqsez < 0) ? 1 : 0;    /* needed in updating predictor poles */
-
-    mag = dq & 0x7FFF;        /* prediction difference magnitude */
-    /* TRANS */
-    ylint = short (state_ptr->yl >> 15);    /* exponent part of yl */
-    ylfrac = (state_ptr->yl >> 10) & 0x1F;    /* fractional part of yl */
-    thr1 = (32 + ylfrac) << ylint;        /* threshold */
-    thr2 = (ylint > 9) ? 31 << 10 : thr1;    /* limit thr2 to 31 << 10 */
-    dqthr = (thr2 + (thr2 >> 1)) >> 1;    /* dqthr = 0.75 * thr2 */
-    if (state_ptr->td == 0)        /* signal supposed voice */
-        tr = 0;
-    else if (mag <= dqthr)        /* supposed data, but small mag */
-        tr = 0;            /* treated as voice */
-    else                /* signal is data (modem) */
-        tr = 1;
-
-    /*
-     * Quantizer scale factor adaptation.
-     */
-
-    /* FUNCTW & FILTD & DELAY */
-    /* update non-steady state step size multiplier */
-    state_ptr->yu = y + ((wi - y) >> 5);
-
-    /* LIMB */
-    if (state_ptr->yu < 544)    /* 544 <= yu <= 5120 */
-        state_ptr->yu = 544;
-    else if (state_ptr->yu > 5120)
-        state_ptr->yu = 5120;
-
-    /* FILTE & DELAY */
-    /* update steady state step size multiplier */
-    state_ptr->yl += state_ptr->yu + ((-state_ptr->yl) >> 6);
-
-    /*
-     * Adaptive predictor coefficients.
-     */
-    if (tr == 1) {            /* reset a's and b's for modem signal */
-        state_ptr->a[0] = 0;
-        state_ptr->a[1] = 0;
-        state_ptr->b[0] = 0;
-        state_ptr->b[1] = 0;
-        state_ptr->b[2] = 0;
-        state_ptr->b[3] = 0;
-        state_ptr->b[4] = 0;
-        state_ptr->b[5] = 0;
-
-        a2p = 0;        /* eliminate Compiler Warnings */
-    } else {            /* update a's and b's */
-        pks1 = pk0 ^ state_ptr->pk[0];        /* UPA2 */
-
-        /* update predictor pole a[1] */
-        a2p = state_ptr->a[1] - (state_ptr->a[1] >> 7);
-        if (dqsez != 0) {
-            fa1 = (pks1) ? state_ptr->a[0] : -state_ptr->a[0];
-            if (fa1 < -8191)    /* a2p = function of fa1 */
-                a2p -= 0x100;
-            else if (fa1 > 8191)
-                a2p += 0xFF;
-            else
-                a2p += fa1 >> 5;
-
-            if (pk0 ^ state_ptr->pk[1])
-                /* LIMC */
-                if (a2p <= -12160)
-                    a2p = -12288;
-                else if (a2p >= 12416)
-                    a2p = 12288;
-                else
-                    a2p -= 0x80;
-            else if (a2p <= -12416)
-                a2p = -12288;
-            else if (a2p >= 12160)
-                a2p = 12288;
-            else
-                a2p += 0x80;
-        }
-
-        /* TRIGB & DELAY */
-        state_ptr->a[1] = a2p;
-
-        /* UPA1 */
-        /* update predictor pole a[0] */
-        state_ptr->a[0] -= state_ptr->a[0] >> 8;
-        if (dqsez != 0)
-            if (pks1 == 0)
-                state_ptr->a[0] += 192;
-            else
-                state_ptr->a[0] -= 192;
-
-        /* LIMD */
-        a1ul = 15360 - a2p;
-        if (state_ptr->a[0] < -a1ul)
-            state_ptr->a[0] = -a1ul;
-        else if (state_ptr->a[0] > a1ul)
-            state_ptr->a[0] = a1ul;
-
-        /* UPB : update predictor zeros b[6] */
-        for (cnt = 0; cnt < 6; cnt++) {
-            if (code_size == 5)        /* for 40Kbps G.723 */
-                state_ptr->b[cnt] -= state_ptr->b[cnt] >> 9;
-            else            /* for G.721 and 24Kbps G.723 */
-                state_ptr->b[cnt] -= state_ptr->b[cnt] >> 8;
-            if (dq & 0x7FFF) {            /* XOR */
-                if ((dq ^ state_ptr->dq[cnt]) >= 0)
-                    state_ptr->b[cnt] += 128;
-                else
-                    state_ptr->b[cnt] -= 128;
-            }
-        }
-    }
-
-    for (cnt = 5; cnt > 0; cnt--)
-        state_ptr->dq[cnt] = state_ptr->dq[cnt-1];
-    /* FLOAT A : convert dq[0] to 4-bit exp, 6-bit mantissa f.p. */
-    if (mag == 0) {
-        state_ptr->dq[0] = (dq >= 0) ? 0x20 : 0xFC20;
-    } else {
-        state_ptr->dq[0] = (dq >= 0) ?
-             base2 (mag) : base2 (mag) - 0x400;
-    }
-
-    state_ptr->sr[1] = state_ptr->sr[0];
-    /* FLOAT B : convert sr to 4-bit exp., 6-bit mantissa f.p. */
-    if (sr == 0) {
-        state_ptr->sr[0] = 0x20;
-    } else if (sr > 0) {
-        state_ptr->sr[0] = base2(sr);
-    } else if (sr > -32768) {
-        mag = -sr;
-        state_ptr->sr[0] = base2(mag) - 0x400;
-    } else {
-        const unsigned short c = 0xFC20;
-        state_ptr->sr[0] = short(c);
-    }
-
-    /* DELAY A */
-    state_ptr->pk[1] = state_ptr->pk[0];
-    state_ptr->pk[0] = pk0;
-
-    /* TONE */
-    if (tr == 1)        /* this sample has been treated as data */
-        state_ptr->td = 0;    /* next one will be treated as voice */
-    else if (a2p < -11776)    /* small sample-to-sample correlation */
-        state_ptr->td = 1;    /* signal may be data */
-    else                      /* signal is voice */
-        state_ptr->td = 0;
-
-    /*
-     * Adaptation speed control.
-     */
-    state_ptr->dms += (fi - state_ptr->dms) >> 5;        /* FILTA */
-    state_ptr->dml += (((fi << 2) - state_ptr->dml) >> 7);    /* FILTB */
-
-    if (tr == 1)
-        state_ptr->ap = 256;
-    else if (y < 1536)                    /* SUBTC */
-        state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-    else if (state_ptr->td == 1)
-        state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-    else if (abs((state_ptr->dms << 2) - state_ptr->dml) >=
-        (state_ptr->dml >> 3))
-        state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-    else
-        state_ptr->ap += (-state_ptr->ap) >> 4;
-}
-
-/*
- * tandem_adjust(sr, se, y, i, sign)
- *
- * At the end of ADPCM decoding, it simulates an encoder which may be receiving
- * the output of this decoder as a tandem process. If the output of the
- * simulated encoder differs from the input to this decoder, the decoder output
- * is adjusted by one level of A-law or u-law codes.
- *
- * Input:
- *    sr    decoder output linear PCM sample,
- *    se    predictor estimate sample,
- *    y     quantizer step size,
- *    i     decoder input code,
- *    sign  sign bit of code i
- *
- * Return:
- *    adjusted A-law or u-law compressed sample.
- */
-int
-tandem_adjust_alaw(
-    int        sr,    /* decoder output linear PCM sample */
-    int        se,    /* predictor estimate sample */
-    int        y,     /* quantizer step size */
-    int        i,     /* decoder input code */
-    int        sign,
-    short     *qtab)
-{
-    unsigned char    sp;    /* A-law compressed 8-bit code */
-    short            dx;    /* prediction error */
-    char             id;    /* quantized prediction error */
-    int              sd;    /* adjusted A-law decoded sample value */
-    int              im;    /* biased magnitude of i */
-    int              imx;   /* biased magnitude of id */
-
-    if (sr <= -32768)
-        sr = -1;
-    sp = linear2alaw((sr >> 1) << 3);    /* short to A-law compression */
-    dx = (alaw2linear(sp) >> 2) - se;    /* 16-bit prediction error */
-    id = quantize(dx, y, qtab, sign - 1);
-
-    if (id == i) {            /* no adjustment on sp */
-        return (sp);
-    } else {            /* sp adjustment needed */
-        /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
-        im = i ^ sign;        /* 2's complement to biased unsigned */
-        imx = id ^ sign;
-
-        if (imx > im) {        /* sp adjusted to next lower value */
-            if (sp & 0x80) {
-                sd = (sp == 0xD5) ? 0x55 :
-                    ((sp ^ 0x55) - 1) ^ 0x55;
-            } else {
-                sd = (sp == 0x2A) ? 0x2A :
-                    ((sp ^ 0x55) + 1) ^ 0x55;
-            }
-        } else {        /* sp adjusted to next higher value */
-            if (sp & 0x80)
-                sd = (sp == 0xAA) ? 0xAA :
-                    ((sp ^ 0x55) + 1) ^ 0x55;
-            else
-                sd = (sp == 0x55) ? 0xD5 :
-                    ((sp ^ 0x55) - 1) ^ 0x55;
-        }
-        return (sd);
-    }
-}
-
-int
-tandem_adjust_ulaw(
-    int        sr,    /* decoder output linear PCM sample */
-    int        se,    /* predictor estimate sample */
-    int        y,    /* quantizer step size */
-    int        i,    /* decoder input code */
-    int        sign,
-    short     *qtab)
-{
-    unsigned char    sp;    /* u-law compressed 8-bit code */
-    short            dx;    /* prediction error */
-    char             id;    /* quantized prediction error */
-    int              sd;    /* adjusted u-law decoded sample value */
-    int              im;    /* biased magnitude of i */
-    int              imx;   /* biased magnitude of id */
-
-    if (sr <= -32768)
-        sr = 0;
-    sp = linear2ulaw(sr << 2);    /* short to u-law compression */
-    dx = (ulaw2linear(sp) >> 2) - se;    /* 16-bit prediction error */
-    id = quantize(dx, y, qtab, sign - 1);
-    if (id == i) {
-        return (sp);
-    } else {
-        /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
-        im = i ^ sign;        /* 2's complement to biased unsigned */
-        imx = id ^ sign;
-        if (imx > im) {        /* sp adjusted to next lower value */
-            if (sp & 0x80)
-                sd = (sp == 0xFF) ? 0x7E : sp + 1;
-            else
-                sd = (sp == 0) ? 0 : sp - 1;
-
-        } else {        /* sp adjusted to next higher value */
-            if (sp & 0x80)
-                sd = (sp == 0x80) ? 0x80 : sp - 1;
-            else
-                sd = (sp == 0x7F) ? 0xFE : sp + 1;
-        }
-        return (sd);
-    }
-}
diff --git a/contrib/src/mmedia/makedocs.vc b/contrib/src/mmedia/makedocs.vc
deleted file mode 100644
index cc416a5f20..0000000000
--- a/contrib/src/mmedia/makedocs.vc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# File:         makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=mmedia
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\$(NAME).tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: $(DOCDIR)\htmlhelp\$(NAME).chm
-htb:	$(DOCDIR)\htb\$(NAME).htb
-hlp: $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
-	touch $(DOCSOURCEDIR)\$(NAME).tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp:         $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
-        cd $(DOCSOURCEDIR)
-        -erase $(NAME).ph
-        hcw /c /e $(NAME)
-        move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
-        move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
-        cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
-	echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm:         $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -mkdir $(DOCDIR)\html\$(NAME)
-        copy *.gif $(DOCDIR)\html\$(NAME)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\html\$(NAME)\$(NAME).htm -twice -html
-        -erase $(DOCDIR)\html\$(NAME)\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\$(NAME)\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
-	cd $(DOCDIR)\html\$(NAME)
-	-hhc $(NAME).hhp
-    -erase $(DOCDIR)\htmlhelp\$(NAME).chm
-    move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-	cd $(DOCDIR)\html\$(NAME)
-    -erase $(NAME).zip $(NAME).htb
-    zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
-    cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi:	$(DOCSOURCES)
-	cd $(DOCSOURCEDIR)
-        -latex $(NAME)
-        -latex $(NAME)
-        -makeindx $(NAME)
-        -bibtex $(NAME)
-        -latex $(NAME)
-        -latex $(NAME)
-        cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps:	$(DOCSOURCEDIR)\$(NAME).dvi
-	cd $(DOCSOURCEDIR)
-        -dvips32 -o $(NAME).ps $(NAME)
-        move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
-        cd $(THISDIR)
-
diff --git a/contrib/src/mmedia/sndaiff.cpp b/contrib/src/mmedia/sndaiff.cpp
deleted file mode 100644
index 1ec1769119..0000000000
--- a/contrib/src/mmedia/sndaiff.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndaiff.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/datstrm.h"
-#include "wx/filefn.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndaiff.h"
-
-#define BUILD_SIGNATURE(a,b,c,d) (((wxUint32)a) | (((wxUint32)b) << 8) | (((wxUint32)c) << 16)  | (((wxUint32)d) << 24))
-
-#define FORM_SIGNATURE BUILD_SIGNATURE('F','O','R','M')
-#define AIFF_SIGNATURE BUILD_SIGNATURE('A','I','F','F')
-#define AIFC_SIGNATURE BUILD_SIGNATURE('A','I','F','C')
-#define COMM_SIGNATURE BUILD_SIGNATURE('C','O','M','M')
-#define SSND_SIGNATURE BUILD_SIGNATURE('S','S','N','D')
-
-wxSoundAiff::wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound)
-  : wxSoundFileStream(stream, io_sound)
-{
-    m_base_offset = wxInvalidOffset;
-}
-
-wxSoundAiff::wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound)
-  : wxSoundFileStream(stream, io_sound)
-{
-    m_base_offset = wxInvalidOffset;
-}
-
-wxSoundAiff::~wxSoundAiff()
-{
-}
-
-wxString wxSoundAiff::GetCodecName() const
-{
-    return wxT("wxSoundAiff codec");
-}
-
-bool wxSoundAiff::CanRead()
-{
-    wxUint32 signature1, signature2, len;
-    
-    if (m_input->Read(&signature1, 4).LastRead() != 4)
-        return false;
-    
-    if (wxUINT32_SWAP_ON_BE(signature1) != FORM_SIGNATURE) {
-        m_input->Ungetch(&signature1, 4);
-        return false;
-    }
-    
-    m_input->Read(&len, 4);
-    if (m_input->LastRead() != 4) {
-        m_input->Ungetch(&len, m_input->LastRead());
-        m_input->Ungetch(&signature1, 4);
-        return false;
-    }
-    
-    if (m_input->Read(&signature2, 4).LastRead() != 4) {
-        m_input->Ungetch(&signature2, m_input->LastRead());
-        m_input->Ungetch(&len, 4);
-        m_input->Ungetch(&signature1, 4);
-        return false;
-    }
-    
-    m_input->Ungetch(&signature2, 4);
-    m_input->Ungetch(&len, 4);
-    m_input->Ungetch(&signature1, 4);
-    
-    if (
-        wxUINT32_SWAP_ON_BE(signature2) != AIFF_SIGNATURE &&
-        wxUINT32_SWAP_ON_BE(signature2) != AIFC_SIGNATURE)
-        return false;
-    
-    return true;
-}
-
-#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return false; }
-
-bool wxSoundAiff::PrepareToPlay()
-{
-    wxDataInputStream data(*m_input);
-    wxUint32 signature, len, ssnd;
-    bool end_headers;
-    
-    if (!m_input) {
-        m_snderror = wxSOUND_INVSTRM;
-        return false;
-    }
-    m_snderror = wxSOUND_NOERROR;
-    
-    data.BigEndianOrdered(true);
-    
-    FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != FORM_SIGNATURE, wxSOUND_INVSTRM);
-    // "FORM"
-    
-    len = data.Read32(); 
-    wxUnusedVar(len);
-    FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-    // dummy len
-    
-    FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    FAIL_WITH(
-        wxUINT32_SWAP_ON_BE(signature) != AIFF_SIGNATURE &&
-        wxUINT32_SWAP_ON_BE(signature) != AIFC_SIGNATURE, wxSOUND_INVSTRM);
-    // "AIFF" / "AIFC"
-    
-    end_headers = false;
-    while (!end_headers) {
-        FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-        
-        len = data.Read32();
-        FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-        
-        switch (wxUINT32_SWAP_ON_BE(signature)) {
-            case COMM_SIGNATURE: { // "COMM"
-                wxUint16 channels, bps;
-                wxUint32 num_samples;
-                double srate;
-                wxSoundFormatPcm sndformat;
-
-                // Get sound data informations
-                data >> channels >> num_samples >> bps >> srate; 
-
-                // Convert them in a wxSoundFormat object
-                sndformat.SetSampleRate((wxUint32) srate);
-                sndformat.SetBPS(bps);
-                sndformat.SetChannels(channels);
-                sndformat.Signed(false);
-                sndformat.SetOrder(wxBIG_ENDIAN);
-                
-                if (!SetSoundFormat(sndformat))
-                    return false;
-                // We pass all data left
-                m_input->SeekI(len-18, wxFromCurrent);
-                break;
-            }
-            case SSND_SIGNATURE: {  // "SSND"
-                data >> ssnd;
-                // m_input->SeekI(4, wxFromCurrent);  // Pass an INT32
-                // m_input->SeekI(len-4, wxFromCurrent); // Pass the rest
-                m_input->SeekI(ssnd + 4, wxFromCurrent);
-                m_base_offset = m_input->TellI();
-                // len-8 bytes of samples
-                FinishPreparation(len - 8);
-                end_headers = true;
-                break;
-            }
-            default:
-                m_input->SeekI(len, wxFromCurrent);
-                break;
-        }
-    }
-    return true;
-}
-
-bool wxSoundAiff::PrepareToRecord(wxUint32 WXUNUSED(time))
-{
-    // TODO
-    return false;
-}
-
-bool wxSoundAiff::FinishRecording()
-{
-    // TODO
-    return false;
-}
-
-bool wxSoundAiff::RepositionStream(wxUint32 WXUNUSED(position))
-{
-    // If the stream is not seekable "TellI() returns wxInvalidOffset" we cannot reposition stream
-    if (m_base_offset == wxInvalidOffset)
-        return false;
-    m_input->SeekI(m_base_offset, wxFromStart);
-    return true;
-}
-
-wxUint32 wxSoundAiff::GetData(void *buffer, wxUint32 len)
-{
-    return m_input->Read(buffer, len).LastRead();
-}
-
-wxUint32 wxSoundAiff::PutData(const void *buffer, wxUint32 len)
-{
-    return m_output->Write(buffer, len).LastWrite();
-}
diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp
deleted file mode 100644
index e0f2114d4e..0000000000
--- a/contrib/src/mmedia/sndbase.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndbase.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/log.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-
-
-// ---------------------------------------------------------------------------
-// wxSoundFormatBase
-// ---------------------------------------------------------------------------
-
-wxSoundFormatBase::wxSoundFormatBase()
-{
-}
-
-wxSoundFormatBase::~wxSoundFormatBase()
-{
-}
-
-wxSoundFormatBase *wxSoundFormatBase::Clone() const
-{
-    wxLogFatalError(wxT("In wxSoundFormatBase::Clone() but I should")
-                    wxT(" not be there"));
-    return NULL;
-}
-
-bool wxSoundFormatBase::operator!=(const wxSoundFormatBase& frmt2) const
-{
-    return (GetType() != frmt2.GetType());
-}
-
-// ---------------------------------------------------------------------------
-// wxSoundStream
-// ---------------------------------------------------------------------------
-
-wxSoundStream::wxSoundStream()
-{
-    int i;
-    
-    // Reset all variables to their neutral value.
-    m_sndformat = NULL;
-    m_handler = NULL;
-    m_snderror = wxSOUND_NOERROR;
-    m_lastcount = 0;
-    for (i=0;i<2;i++)
-        m_callback[i] = NULL;
-}
-
-wxSoundStream::~wxSoundStream()
-{
-  if (m_sndformat)
-      delete m_sndformat;
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(const wxSoundFormatBase& format) is one of the most
-// important function of the wxSoundStream class. It prepares the stream to
-// receive or send the data in a strict format. Normally, the sound stream
-// should be ready to accept any format it is asked to manage but in certain
-// cases, it really cannot: in that case it returns false. To have more
-// details in the functionnalities of SetSoundFormat see
-// wxSoundRouterStream::SetSoundFormat()
-// --------------------------------------------------------------------------
-bool wxSoundStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    // delete the previous prepared format
-    if (m_sndformat)
-      delete m_sndformat;
-    
-    // create a new one by cloning the format passed in parameter
-    m_sndformat = format.Clone();
-    return true;
-}
-
-
-// --------------------------------------------------------------------------
-// Register(int evt, ...) registers the callback for a specified async event.
-// Warning ! Only one callback by event is supported. It means that if you
-// call twice this function the previous registered callback is absolutely
-// ignored.
-// --------------------------------------------------------------------------
-void wxSoundStream::SetCallback(int evt, wxSoundCallback cbk, void *cdata)
-{
-  int c;
-
-  switch (evt) {
-  case wxSOUND_INPUT:
-    c = 0;
-    break;
-  case wxSOUND_OUTPUT:
-    c = 1;
-    break;
-  default:
-    return;
-  }
-  m_callback[c] = cbk;
-  m_cdata[c] = cdata;
-}
-
-// --------------------------------------------------------------------------
-// OnSoundEvent(int evt) is called either when the driver is ready to receive
-// a new block to play or when the driver has a new recorded buffer. You
-// must be careful here and try not to spend a lot of time: this is a
-// real-time call. In the case, an "event handler" was specified previously, 
-// it called him before everything.
-// --------------------------------------------------------------------------
-void wxSoundStream::OnSoundEvent(int evt)
-{
-  int c;
-
-  if (m_handler) {
-    m_handler->OnSoundEvent(evt);
-    return;
-  }
-
-  switch (evt) {
-  case wxSOUND_INPUT:
-    c = 0;
-    break;
-  case wxSOUND_OUTPUT:
-    c = 1;
-    break;
-  default:
-    return;
-  }
-  if (m_callback[c])
-    m_callback[c](this, evt, m_cdata[c]);
-}
diff --git a/contrib/src/mmedia/sndcodec.cpp b/contrib/src/mmedia/sndcodec.cpp
deleted file mode 100644
index 3d84427016..0000000000
--- a/contrib/src/mmedia/sndcodec.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcodec.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-
-wxSoundStreamCodec::wxSoundStreamCodec(wxSoundStream& snd_io)
- : m_sndio(&snd_io)
-{
-}
-
-wxSoundStreamCodec::~wxSoundStreamCodec()
-{
-}
-
-bool wxSoundStreamCodec::StartProduction(int evt)
-{
-  return m_sndio->StartProduction(evt);
-}
-
-bool wxSoundStreamCodec::StopProduction()
-{
-  return m_sndio->StopProduction();
-}
-
-wxUint32 wxSoundStreamCodec::GetBestSize() const
-{
-  return m_sndio->GetBestSize();
-}
diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp
deleted file mode 100644
index 8627e45617..0000000000
--- a/contrib/src/mmedia/sndcpcm.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndcpcm.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/debug.h"
-    #include "wx/log.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndcpcm.h"
-
-wxSoundStreamPcm::wxSoundStreamPcm(wxSoundStream& sndio)
-        : wxSoundStreamCodec(sndio)
-{
-    m_function_in = NULL;
-    m_function_out = NULL;
-    m_prebuffer = NULL;
-    m_prebuffer_size = 0;
-    m_best_size = 0;
-}
-
-wxSoundStreamPcm::~wxSoundStreamPcm()
-{
-    if (m_prebuffer)
-        delete[] m_prebuffer;
-}
-
-wxUint32 wxSoundStreamPcm::GetBestSize() const
-{
-    return m_best_size;
-}
-
-// -----------------------------------------------------------------------
-// "Converters" definitions/implementations
-// -----------------------------------------------------------------------
-
-#define DEFINE_CONV(name, input_type, output_type, convert) \
-static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len) \
-{\
-  register input_type src; \
-  register const input_type *t_buf_in = (input_type *)buf_in; \
-  register output_type *t_buf_out = (output_type *)buf_out; \
-\
-  while (len > 0) { \
-    src = *t_buf_in++; \
-    *t_buf_out++ = convert; \
-    len -= sizeof(input_type); \
-  } \
-}
-
-// TODO: define converters for all other formats (32, 24)
-
-DEFINE_CONV(8_8_sign, wxUint8, wxUint8, (src ^ 0x80))
-
-DEFINE_CONV(8_16, wxUint8, wxUint16, (((wxUint16)src) << 8))
-DEFINE_CONV(8_16_swap, wxUint8, wxUint16, (src))
-DEFINE_CONV(8_16_sign, wxUint8, wxUint16, (((wxUint16)(src ^ 0x80)) << 8))
-DEFINE_CONV(8_16_sign_swap, wxUint8, wxUint16, (src ^ 0x80))
-
-DEFINE_CONV(16_8, wxUint16, wxUint8, (wxUint8)(src >> 8))
-DEFINE_CONV(16_8_sign, wxUint16, wxUint8, (wxUint8)((src >> 8) ^ 0x80))
-DEFINE_CONV(16_swap_8, wxUint16, wxUint8, (wxUint8)(src & 0xff))
-DEFINE_CONV(16_swap_8_sign, wxUint16, wxUint8, (wxUint8)((src & 0xff) ^ 0x80))
-
-//DEFINE_CONV(24_8, wxUint32, wxUint8, (wxUint8)(src >> 16))
-//DEFINE_CONV(24_8_sig, wxUint32, wxUint8, (wxUint8)((src >> 16) ^ 0x80))
-
-//DEFINE_CONV(32_8, wxUint32, wxUint8, (wxUint8)(src >> 24))
-
-DEFINE_CONV(16_sign, wxUint16, wxUint16, (src ^ 0x8000))
-DEFINE_CONV(16_swap, wxUint16, wxUint16, (((src & 0xff) << 8) | ((src >> 8) & 0xff)))
-// Problem.
-DEFINE_CONV(16_swap_16_sign, wxUint16, wxUint16, ((((src & 0xff) << 8) | ((src >> 8) & 0xff)) ^ 0x80))
-// DEFINE_CONV(16_sign_16_swap, wxUint16, wxUint16, ((((src & 0xff) << 8) | ((src >> 8) & 0xff)) ^ 0x8000))
-DEFINE_CONV(16_swap_16_sign_swap, wxUint16, wxUint16, (src ^ 0x80))
-
-// -----------------------------------------------------------------------
-// Main PCM stream converter table
-// -----------------------------------------------------------------------
-// Definition
-//   XX -> YY
-//   XX -> YY sign
-//
-//   XX swapped -> YY
-//   XX swapped -> YY sign
-//
-//   XX swapped -> YY swapped
-//   XX swapped -> YY swapped sign
-//
-//   XX stereo -> YY mono
-//   XX stereo -> YY mono sign
-//
-//   XX swapped stereo -> YY swapped mono
-//   XX swapped stereo -> YY swapped mono sign
-//
-//   XX swapped stereo -> YY swapped mono
-//   XX swapped stereo -> YY swapped mono sign
-
-static wxSoundStreamPcm::ConverterType s_converters[4][3][2] = { 
-    {
-        {
-            NULL,
-            Convert_8_8_sign                    /* 8 -> 8 sign */
-        },
-        {
-            NULL,
-            NULL
-        },
-        {
-            NULL,
-            NULL
-        }
-    },
-    {
-        {
-            Convert_8_16,                       /* 8 -> 16 */
-            Convert_8_16_sign                   /* 8 -> 16 sign */
-        },
-        {
-            Convert_8_16_swap,                  /* 8 -> 16 swapped */
-            Convert_8_16_sign_swap              /* 8 -> 16 sign swapped */
-        },
-        {
-            NULL,
-            NULL
-        }
-    },
-    {
-        {
-            Convert_16_8,                       /* 16 -> 8 */
-            Convert_16_8_sign                   /* 16 -> 8 sign */
-        },
-        {
-            Convert_16_swap_8,                  /* 16 swapped -> 8 */
-            Convert_16_swap_8_sign              /* 16 swapped -> 8 sign */
-        },
-        {
-            NULL,
-            NULL 
-        },
-    },
-    
-    {
-        {
-            NULL,                               /* 16 -> 16 */
-            Convert_16_sign                     /* 16 -> 16 sign */
-        },
-        {
-            Convert_16_swap,                    /* 16 swapped -> 16 */
-            Convert_16_swap_16_sign             /* 16 swapped -> 16 sign */
-        },
-        {
-            NULL,
-            Convert_16_swap_16_sign_swap        /* 16 swapped -> 16 sign swapped */
-        }
-    }
-};
-
-// This is the buffer size multiplier. It gives the needed size of the output size.
-static float s_converters_multip[] = {1, 2, 0.5, 1};
-
-//
-// TODO: Read() and Write() aren't really safe. If you give it a buffer which
-// is not aligned on 2, you may crash (See converter.def).
-//
-
-wxSoundStream& wxSoundStreamPcm::Read(void *buffer, wxUint32 len)
-{
-    wxUint32 in_bufsize;
-
-    // We must have a multiple of 2
-    len &= 0x01;
-    
-    if (!m_function_in) {
-        m_sndio->Read(buffer, len);
-        m_lastcount = m_sndio->GetLastAccess();
-        m_snderror = m_sndio->GetError();
-        return *this;
-    }
-
-    in_bufsize = GetReadSize(len);
-    
-    if (len <= m_best_size) {
-        m_sndio->Read(m_prebuffer, in_bufsize);
-        m_snderror  = m_sndio->GetError();
-        if (m_snderror != wxSOUND_NOERROR) {
-            m_lastcount = 0;
-            return *this;
-        }
-        
-        m_function_in(m_prebuffer, buffer, m_sndio->GetLastAccess());
-    } else {
-        char *temp_buffer;
-        
-        temp_buffer = new char[in_bufsize];
-        m_sndio->Read(temp_buffer, in_bufsize);
-
-        m_snderror =  m_sndio->GetError();
-        if (m_snderror != wxSOUND_NOERROR) {
-            m_lastcount = 0;
-            return *this;
-        }
-        
-        m_function_in(temp_buffer, buffer, m_sndio->GetLastAccess());
-        
-        delete[] temp_buffer;
-    }
-    
-    m_lastcount = (wxUint32)(m_sndio->GetLastAccess() * m_multiplier_in);
-    
-    return *this;
-}
-
-wxSoundStream& wxSoundStreamPcm::Write(const void *buffer, wxUint32 len)
-{
-    wxUint32 out_bufsize;
-    
-    if (!m_function_out) {
-        m_sndio->Write(buffer, len);
-        m_lastcount = m_sndio->GetLastAccess();
-        m_snderror  = m_sndio->GetError();
-        return *this;
-    }
-
-    out_bufsize = GetWriteSize(len);
-
-    if (len <= m_best_size) {
-        out_bufsize = GetWriteSize(len);
-
-        m_function_out(buffer, m_prebuffer, len);
-        m_sndio->Write(m_prebuffer, out_bufsize);
-        m_snderror  = m_sndio->GetError();
-        if (m_snderror != wxSOUND_NOERROR) {
-            m_lastcount = 0;
-            return *this;
-        }
-    } else {
-        char *temp_buffer;
-        
-        temp_buffer = new char[out_bufsize];
-        m_function_out(buffer, temp_buffer, len);
-        
-        m_sndio->Write(temp_buffer, out_bufsize);
-        m_snderror =  m_sndio->GetError();
-        if (m_snderror != wxSOUND_NOERROR) {
-            m_lastcount = 0;
-            return *this;
-        }
-        
-        delete[] temp_buffer;
-    }
-
-    m_lastcount = (wxUint32)(m_sndio->GetLastAccess() / m_multiplier_out);
-
-    return *this;
-}
-
-bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    wxSoundFormatBase *new_format;
-    wxSoundFormatPcm *pcm_format, *pcm_format2;
-    
-    if (m_sndio->SetSoundFormat(format)) {
-        m_function_out = NULL;
-        m_function_in = NULL;
-        return true;
-    }
-    if (format.GetType() != wxSOUND_PCM) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-    if (m_sndformat)
-        delete m_sndformat;
-    
-    new_format = m_sndio->GetSoundFormat().Clone();
-    pcm_format = (wxSoundFormatPcm *)&format;
-    pcm_format2 = (wxSoundFormatPcm *)new_format;
-
-#if 0
-    // ----------------------------------------------------
-    // Test whether we need to resample
-    if (pcm_format->GetSampleRate() != pcm_format2->GetSampleRate()) {
-        wxUint32 src_rate, dst_rate;
-
-        src_rate = pcm_format->GetSampleRate();
-        dst_rate = pcm_format2->GetSampleRate();
-        m_needResampling = true;
-        if (src_rate < dst_rate)
-            m_expandSamples = true;
-        else
-            m_expandSamples = false;
-        m_pitch = (src_rate << FLOATBITS) / dst_rate;
-    }
-#endif
-    // ----------------------------------------------------
-    // Select table to use:
-    //     * 8 bits -> 8 bits
-    //     * 16 bits -> 8 bits
-    //     * 8 bits -> 16 bits
-    //     * 16 bits -> 16 bits
-
-    int table_no, table_no2;
-    int i_sign, i_swap;
-    
-    switch (pcm_format->GetBPS()) {
-        case 8:
-            table_no = 0;
-            break;
-        case 16:
-            table_no = 1;
-            break;
-        default:
-            // TODO: Add something here: error, log, ...
-            return false;
-    }
-    switch (pcm_format2->GetBPS()) {
-        case 8:
-            table_no2 = 0;
-            break;
-        case 16:
-            table_no2 = 1;
-            break;
-        default:
-            // TODO: Add something here: error, log, ...
-            return false;
-    }
-    
-    if (pcm_format2->Signed() != pcm_format->Signed())
-        i_sign = 1;
-    else
-        i_sign = 0;
-
-#define MY_ORDER wxBYTE_ORDER
-#if wxBYTE_ORDER == wxLITTLE_ENDIAN
-#define OTHER_ORDER wxBIG_ENDIAN
-#else
-#define OTHER_ORDER wxLITTLE_ENDIAN
-#endif
-
-    // --------------------------------------------------------
-    // Find the good converter !
-
-    if (pcm_format->GetOrder() == OTHER_ORDER) {
-        if (pcm_format->GetOrder() == pcm_format2->GetOrder())
-            i_swap = 2;
-        else
-            i_swap = 1;
-    } else {
-        if (pcm_format->GetOrder() == pcm_format2->GetOrder())
-            i_swap = 0;
-        else
-            i_swap = 1;
-    }
-
-    m_function_out = s_converters[table_no*2+table_no2][i_swap][i_sign];
-    m_function_in  = s_converters[table_no2*2+table_no][i_swap][i_sign];
-    m_multiplier_out = s_converters_multip[table_no*2+table_no2];
-    m_multiplier_in  = s_converters_multip[table_no2*2+table_no2];
-
-    if (m_prebuffer)
-        delete[] m_prebuffer;
-
-    // We try to minimize the need for dynamic memory allocation by preallocating a buffer. But
-    // to be sure it will be efficient we minimize the best size.
-    if (m_multiplier_in < m_multiplier_out) {
-        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
-                                      m_multiplier_out);
-        m_best_size = (wxUint32)(m_sndio->GetBestSize() *
-                                 m_multiplier_in);
-    } else {
-        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
-                                      m_multiplier_in);
-        m_best_size = (wxUint32)(m_sndio->GetBestSize() *
-                                 m_multiplier_out);
-    }
-    
-    m_prebuffer = new char[m_prebuffer_size];
-    
-    bool SetSoundFormatReturn;
-
-    SetSoundFormatReturn = m_sndio->SetSoundFormat(*new_format);
-    wxASSERT( SetSoundFormatReturn );
-    wxUnusedVar( SetSoundFormatReturn );
-    
-    m_sndformat = new_format;
-    return true;
-}
-
-wxUint32 wxSoundStreamPcm::GetWriteSize(wxUint32 len) const
-{
-    // For the moment, it is simple but next time it will become more complicated
-    // (Resampling)
-    return (wxUint32)(len * m_multiplier_out);
-}
-
-wxUint32 wxSoundStreamPcm::GetReadSize(wxUint32 len) const
-{
-    return (wxUint32)(len / m_multiplier_in);
-}
-
-// Resampling engine. NOT FINISHED and NOT INCLUDED but this is a first DRAFT.
-
-#if 0
-
-#define FLOATBITS 16
-#define INTBITS 16
-#define FLOATMASK 0xffff
-#define INTMASK 0xffff0000
-
-void ResamplingShrink_##DEPTH##(const void *source, void *destination, wxUint32 len)
-{
-    wxUint##DEPTH## *source_data, *dest_data;
-    wxUint32 pos;
-
-    source_data = (wxUint##DEPTH## *)source;
-    dest_data   = (wxUint##DEPTH## *)destination;
-    
-    pos = m_saved_pos;
-    while (len > 0) {
-        // Increment the position in the input buffer
-        pos += m_pitch;
-        if (pos & INTMASK) {
-            pos &= FLOATMASK;
-            
-            *dest_data ++ = *source_data;
-        }
-        len--;
-        source_data++;
-    }
-    m_saved_pos = pos;
-}
-#endif
diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp
deleted file mode 100644
index 8c38f4dea2..0000000000
--- a/contrib/src/mmedia/sndesd.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndesd.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/string.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// --------------------------------------------------------------------------
-// MMedia headers
-// --------------------------------------------------------------------------
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndesd.h"
-#include "wx/mmedia/sndpcm.h"
-
-// --------------------------------------------------------------------------
-// System headers
-// --------------------------------------------------------------------------
-
-#ifdef HAVE_ESD_H
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <esd.h>
-#ifdef __WXGTK__
-#include <gdk/gdk.h>
-#endif
-#endif
-
-// --------------------------------------------------------------------------
-
-#define MY_ESD_NAME "wxWidgets/wxSoundStreamESD"
-
-// --------------------------------------------------------------------------
-// wxSoundStreamESD: ESD sound driver
-
-// --------------------------------------------------------------------------
-// Constructors/Destructors
-// --------------------------------------------------------------------------
-
-wxSoundStreamESD::wxSoundStreamESD(const wxString& hostname)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return;
-#else
-    wxSoundFormatPcm pcm_default;
-
-    // First, we make some basic test: is there ESD on this computer ?
-    m_esd_ok = false;
-
-    if (hostname.IsNull())
-        m_fd_output = esd_play_stream(ESD_PLAY | ESD_STREAM, 22050,
-                                      hostname.mb_str(), MY_ESD_NAME);
-    else
-        m_fd_output = esd_play_stream(ESD_PLAY | ESD_STREAM, 22050,
-                                      NULL, MY_ESD_NAME);
-    if (m_fd_output == -1) {
-        // Answer: no. We return with an error.
-        m_snderror = wxSOUND_INVDEV;
-        return;
-    }
-
-    // Close this unuseful stream.
-    esd_close(m_fd_output);
-
-    m_hostname = hostname;
-
-    // Set the default audio format
-    SetSoundFormat(pcm_default);
-
-    // Initialize some variable
-    m_snderror = wxSOUND_NOERROR;
-    m_esd_stop = true;
-    m_q_filled = true;
-    m_esd_ok   = true;
-    m_fd_output= -1;
-    m_fd_input = -1;
-#endif // defined HAVE_ESD_H
-}
-
-wxSoundStreamESD::~wxSoundStreamESD()
-{
-#ifdef HAVE_ESD_H
-    if (!m_esd_stop)
-        StopProduction();
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// Read several samples
-// --------------------------------------------------------------------------
-
-wxSoundStream& wxSoundStreamESD::Read(void *buffer, wxUint32 len)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return *this;
-#else
-    int ret;
-
-    if (m_esd_stop) {
-        m_snderror = wxSOUND_NOTSTARTED;
-        return *this;
-    }
-
-    ret = read(m_fd_input, buffer, len);
-    m_lastcount = (wxUint32)ret;
-
-    if (ret < 0)
-        m_snderror = wxSOUND_IOERROR;
-    else
-        m_snderror = wxSOUND_NOERROR;
-
-    return *this;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// Write several samples
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamESD::Write(const void *buffer, wxUint32 len)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return *this;
-#else
-    int ret;
-
-    if (m_esd_stop) {
-        m_lastcount = 0;
-        m_snderror = wxSOUND_NOTSTARTED;
-        return *this;
-    }
-
-    ret = write(m_fd_output, buffer, len);
-    m_lastcount = (wxUint32)ret;
-
-    if (ret < 0)
-        m_snderror = wxSOUND_IOERROR;
-  else
-      m_snderror = wxSOUND_NOERROR;
-
-    m_q_filled = true;
-
-    return *this;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(): this function specifies which format we want and which
-// format is available
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::SetSoundFormat(const wxSoundFormatBase& format)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return false;
-#else
-    wxSoundFormatPcm *pcm_format;
-
-    if (format.GetType() != wxSOUND_PCM) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-
-    if (!m_esd_ok) {
-        m_snderror = wxSOUND_INVDEV;
-        return false;
-    }
-
-    if (m_sndformat)
-        delete m_sndformat;
-
-    m_sndformat = format.Clone();
-    if (!m_sndformat) {
-        m_snderror = wxSOUND_MEMERROR;
-        return false;
-    }
-    pcm_format = (wxSoundFormatPcm *)m_sndformat;
-
-    // Detect the best format
-    DetectBest(pcm_format);
-
-    m_snderror = wxSOUND_NOERROR;
-    if (*pcm_format != format) {
-        m_snderror = wxSOUND_NOEXACT;
-        return false;
-    }
-    return true;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// _wxSound_OSS_CBack (internal): it is called when the driver (ESD) is
-// ready for a next buffer.
-// --------------------------------------------------------------------------
-#if defined(__WXGTK__) && defined(HAVE_ESD_H)
-static void _wxSound_OSS_CBack(gpointer data, int source,
-                               GdkInputCondition condition)
-{
-    wxSoundStreamESD *esd = (wxSoundStreamESD *)data;
-
-    switch (condition) {
-        case GDK_INPUT_READ:
-            esd->WakeUpEvt(wxSOUND_INPUT);
-            break;
-        case GDK_INPUT_WRITE:
-            esd->WakeUpEvt(wxSOUND_OUTPUT);
-            break;
-        default:
-            break;
-    }
-}
-#endif
-
-
-// --------------------------------------------------------------------------
-// WakeUpEvt() (internal): it is called by _wxSound_OSS_CBack to bypass the
-// C++ protection
-// --------------------------------------------------------------------------
-void wxSoundStreamESD::WakeUpEvt(int evt)
-{
-    m_q_filled = false;
-    OnSoundEvent(evt);
-}
-
-// --------------------------------------------------------------------------
-// StartProduction(): see wxSoundStream
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::StartProduction(int evt)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return false;
-#else
-    wxSoundFormatPcm *pcm;
-    int flag = 0;
-
-    if (!m_esd_ok) {
-        m_snderror = wxSOUND_INVDEV;
-        return false;
-    }
-
-    if (!m_esd_stop)
-        StopProduction();
-
-    pcm = (wxSoundFormatPcm *)m_sndformat;
-
-    flag |= (pcm->GetBPS() == 16) ? ESD_BITS16 : ESD_BITS8;
-    flag |= (pcm->GetChannels() == 2) ? ESD_STEREO : ESD_MONO;
-
-    if ((evt & wxSOUND_OUTPUT) != 0) {
-        flag |= ESD_PLAY | ESD_STREAM;
-        m_fd_output = esd_play_stream(flag, pcm->GetSampleRate(), NULL,
-                                      MY_ESD_NAME);
-    }
-
-    if ((evt & wxSOUND_INPUT) != 0) {
-        flag |= ESD_RECORD | ESD_STREAM;
-        m_fd_input = esd_record_stream(flag, pcm->GetSampleRate(), NULL,
-                                       MY_ESD_NAME);
-    }
-
-#ifdef __WXGTK__
-    if ((evt & wxSOUND_OUTPUT) != 0) {
-        m_tag_output = gdk_input_add(m_fd_output, GDK_INPUT_WRITE,
-                                     _wxSound_OSS_CBack, (gpointer)this);
-    }
-    if ((evt & wxSOUND_INPUT) != 0) {
-        m_tag_input = gdk_input_add(m_fd_input, GDK_INPUT_READ,
-                                    _wxSound_OSS_CBack, (gpointer)this);
-    }
-#endif
-
-    m_esd_stop = false;
-    m_q_filled = false;
-
-    return true;
-#endif // defined HAVE_ESD_H
-}
-
-// --------------------------------------------------------------------------
-// StopProduction(): see wxSoundStream
-// --------------------------------------------------------------------------
-bool wxSoundStreamESD::StopProduction()
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return false;
-#else
-    if (m_esd_stop)
-        return false;
-
-    if (m_fd_input != -1) {
-        esd_close(m_fd_input);
-#ifdef __WXGTK__
-        gdk_input_remove(m_tag_input);
-#endif
-    }
-    if (m_fd_output != -1) {
-        esd_close(m_fd_output);
-#ifdef __WXGTK__
-        gdk_input_remove(m_tag_output);
-#endif
-    }
-
-    m_fd_input = -1;
-    m_fd_output= -1;
-    m_esd_stop = true;
-    m_q_filled = true;
-    return true;
-#endif // defined HAVE_ESD_H
-}
-
-//
-// Detect the closest format (The best).
-//
-void wxSoundStreamESD::DetectBest(wxSoundFormatPcm *pcm)
-{
-#ifndef HAVE_ESD_H
-    m_snderror = wxSOUND_INVDEV;
-    return;
-#else
-    wxSoundFormatPcm best_pcm;
-
-    // We change neither the number of channels nor the sample rate
-    // because ESD is clever.
-
-    best_pcm.SetSampleRate(pcm->GetSampleRate());
-    best_pcm.SetChannels(pcm->GetChannels());
-
-    // It supports 16 bits
-    if (pcm->GetBPS() >= 16)
-        best_pcm.SetBPS(16);
-    else
-        best_pcm.SetBPS(8);
-
-    best_pcm.SetOrder(wxLITTLE_ENDIAN);
-    best_pcm.Signed(true);
-
-    // Finally recopy the new format
-    *pcm = best_pcm;
-#endif // defined HAVE_ESD_H
-}
-
diff --git a/contrib/src/mmedia/sndfile.cpp b/contrib/src/mmedia/sndfile.cpp
deleted file mode 100644
index 657fec23c9..0000000000
--- a/contrib/src/mmedia/sndfile.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndfile.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/stream.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndcpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/sndmsad.h"
-
-// --------------------------------------------------------------------------
-// Sound codec router
-// A very important class: it ensures that everybody is satisfied.
-// It is supposed to create as many codec as it is necessary to transform
-// a signal in a specific format in an another.
-// --------------------------------------------------------------------------
-wxSoundRouterStream::wxSoundRouterStream(wxSoundStream& sndio)
-  : wxSoundStreamCodec(sndio)
-{
-    m_router = NULL;
-}
-
-wxSoundRouterStream::~wxSoundRouterStream()
-{
-    if (m_router)
-        delete m_router;
-}
-
-// --------------------------------------------------------------------------
-// Read(void *buffer, wxUint32 len): It reads data synchronously. See sndbase.h
-// for possible errors and behaviours ...
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundRouterStream::Read(void *buffer, wxUint32 len)
-{
-    if (m_router) {
-        m_router->Read(buffer, len);
-        m_snderror  = m_router->GetError();
-        m_lastcount = m_router->GetLastAccess();
-    } else {
-        m_sndio->Read(buffer, len);
-        m_snderror  = m_sndio->GetError();
-        m_lastcount = m_sndio->GetLastAccess();
-    }
-    return *this;
-}
-
-// --------------------------------------------------------------------------
-// Write(const void *buffer, wxUint32 len): It writes data synchronously
-// --------------------------------------------------------------------------
-wxSoundStream& wxSoundRouterStream::Write(const void *buffer, wxUint32 len)
-{
-    if (m_router) {
-        m_router->Write(buffer, len);
-        m_snderror  = m_router->GetError();
-        m_lastcount = m_router->GetLastAccess();
-    } else {
-        m_sndio->Write(buffer, len);
-        m_snderror  = m_sndio->GetError();
-        m_lastcount = m_sndio->GetLastAccess();
-  }
-  return *this;
-}
-
-// --------------------------------------------------------------------------
-// SetSoundFormat(const wxSoundFormatBase& format) first tries to setup the
-// sound driver using the specified format. If this fails, it uses personnal
-// codec converters: for the moment there is a PCM converter (PCM to PCM:
-// with optional resampling, ...), an ULAW converter (ULAW to PCM), a G72X
-// converter (G72X to PCM). If nothing works, it returns false.
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    if (m_router)
-        delete m_router;
-    
-    // First, we try to setup the sound device
-    if (m_sndio->SetSoundFormat(format)) {
-        // We are lucky, it is working.
-        wxSoundStream::SetSoundFormat(m_sndio->GetSoundFormat());
-        return true;
-    }
-    
-    switch(format.GetType()) {
-        case wxSOUND_NOFORMAT:
-            return false;
-        case wxSOUND_PCM:
-            m_router = new wxSoundStreamPcm(*m_sndio);
-            m_router->SetSoundFormat(format);
-            break;
-        case wxSOUND_ULAW:
-            m_router = new wxSoundStreamUlaw(*m_sndio);
-            m_router->SetSoundFormat(format);
-            break;
-        case wxSOUND_G72X:
-            m_router = new wxSoundStreamG72X(*m_sndio);
-            m_router->SetSoundFormat(format);
-            break;
-        case wxSOUND_MSADPCM:
-            m_router = new  wxSoundStreamMSAdpcm(*m_sndio);
-            m_router->SetSoundFormat(format);
-            break;
-        default:
-            return false;
-        
-    }
-    wxSoundStream::SetSoundFormat(m_router->GetSoundFormat());
-    return true;
-}
-
-// --------------------------------------------------------------------------
-// GetBestSize() returns the specific best buffer size a sound driver
-// can manage. It means that it will be easier for it to manage the buffer
-// and so it will be faster and in some case more accurate for real-time event.
-// --------------------------------------------------------------------------
-wxUint32 wxSoundRouterStream::GetBestSize() const
-{
-  if (m_router)
-    return m_router->GetBestSize();
-  else
-    return m_sndio->GetBestSize();
-}
-
-// --------------------------------------------------------------------------
-// StartProduction(int evt). See sndbase.h 
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::StartProduction(int evt)
-{
-    if (!m_router) {
-        if (m_sndio->StartProduction(evt))
-            return true;
-        
-        m_snderror = m_sndio->GetError();
-        m_lastcount = m_sndio->GetLastAccess();
-        return false;
-    }
-    
-    if (m_router->StartProduction(evt))
-        return true;
-    
-    m_snderror = m_router->GetError();
-    m_lastcount = m_router->GetLastAccess();
-    return false;
-} 
-
-// --------------------------------------------------------------------------
-// StopProduction(). See sndbase.h
-// --------------------------------------------------------------------------
-bool wxSoundRouterStream::StopProduction()
-{
-    if (!m_router) {
-        if (m_sndio->StopProduction())
-            return true;
-        
-        m_snderror = m_sndio->GetError();
-        m_lastcount = m_sndio->GetLastAccess();
-        return false;
-    }
-    
-    if (m_router->StopProduction())
-        return true;
-    
-    m_snderror = m_router->GetError();
-    m_lastcount = m_router->GetLastAccess();
-    return false;
-}
-
-// --------------------------------------------------------------------------
-// wxSoundFileStream: generic reader
-// --------------------------------------------------------------------------
-
-wxSoundFileStream::wxSoundFileStream(wxInputStream& stream,
-                                     wxSoundStream& io_sound)
-        : m_codec(io_sound), m_sndio(&io_sound),
-          m_input(&stream), m_output(NULL), m_state(wxSOUND_FILE_STOPPED)
-{
-    m_length = 0;
-    m_bytes_left = 0;
-    m_prepared = false;
-}
-
-wxSoundFileStream::wxSoundFileStream(wxOutputStream& stream,
-                                     wxSoundStream& io_sound)
-  : m_codec(io_sound), m_sndio(&io_sound),
-    m_input(NULL), m_output(&stream), m_state(wxSOUND_FILE_STOPPED)
-{
-  m_length = 0;
-  m_bytes_left = 0;
-  m_prepared = false;
-}
-
-wxSoundFileStream::~wxSoundFileStream()
-{
-  if (m_state != wxSOUND_FILE_STOPPED)
-    Stop();
-}
-
-bool wxSoundFileStream::Play()
-{
-  if (m_state != wxSOUND_FILE_STOPPED)
-    return false;
-
-  if (!m_prepared)
-    if (!PrepareToPlay())
-      return false;
-
-  m_state = wxSOUND_FILE_PLAYING;
-
-  if (!StartProduction(wxSOUND_OUTPUT))
-    return false;
-
-  return true;
-}
-
-bool wxSoundFileStream::Record(wxUint32 time)
-{
-  if (m_state != wxSOUND_FILE_STOPPED)
-    return false;
-
-  if (!PrepareToRecord(time))
-    return false;
-
-  FinishPreparation(m_sndformat->GetBytesFromTime(time));
-
-  m_state = wxSOUND_FILE_RECORDING;
-  if (!StartProduction(wxSOUND_INPUT))
-    return false;
-
-  return true;
-}
-
-bool wxSoundFileStream::Stop()
-{
-  if (m_state == wxSOUND_FILE_STOPPED)
-    return false;
-
-  if (!StopProduction())
-    return false;
-
-  m_prepared = false;
-
-  if (m_state == wxSOUND_FILE_RECORDING)
-    if (!FinishRecording()) {
-      m_state = wxSOUND_FILE_STOPPED;
-      return false;
-    }
-
-  if (m_input)
-    m_input->SeekI(0, wxFromStart);
-
-  if (m_output)
-    m_output->SeekO(0, wxFromStart);
- 
-  m_state = wxSOUND_FILE_STOPPED;
-  return true;
-}
-
-bool wxSoundFileStream::Pause()
-{
-  if (m_state == wxSOUND_FILE_PAUSED || m_state == wxSOUND_FILE_STOPPED)
-    return false;
-
-  if (!StopProduction())
-    return false;
-
-  m_oldstate = m_state;
-  m_state = wxSOUND_FILE_PAUSED;
-  return true;
-}
-
-bool wxSoundFileStream::Resume()
-{
-  if (m_state == wxSOUND_FILE_PLAYING || m_state == wxSOUND_FILE_RECORDING ||
-      m_state == wxSOUND_FILE_STOPPED)
-    return false;
-
-  if (!StartProduction( (m_oldstate == wxSOUND_FILE_PLAYING) ?
-                             wxSOUND_OUTPUT : wxSOUND_INPUT))
-    return false;
-
-  m_state = m_oldstate;
-
-  return true;
-}
-
-wxSoundStream& wxSoundFileStream::Read(void *buffer, wxUint32 len)
-{
-  if (!m_prepared || m_state != wxSOUND_FILE_PLAYING) {
-      m_snderror = wxSOUND_NOTSTARTED;
-      m_lastcount = 0;
-      return *this;
-  }
-  m_lastcount = GetData(buffer, len);
-  return *this;
-}
-
-wxSoundStream& wxSoundFileStream::Write(const void *buffer, wxUint32 len)
-{
-  if (!m_prepared || m_state != wxSOUND_FILE_RECORDING) {
-      m_snderror = wxSOUND_NOTSTARTED;
-      m_lastcount = 0;
-      return *this;
-  }
-  m_lastcount = PutData(buffer, len);
-  return *this;
-}
-
-bool wxSoundFileStream::StartProduction(int evt)
-{
-  m_sndio->SetEventHandler(this);
-
-  if (!m_codec.StartProduction(evt))
-    return false;
-
-  return true;
-}
-
-bool wxSoundFileStream::StopProduction()
-{
-  return m_codec.StopProduction();
-}
-
-void wxSoundFileStream::FinishPreparation(wxUint32 len)
-{
-  m_bytes_left = m_length = len;
-  m_prepared = true;
-}
-
-wxString wxSoundFileStream::GetCodecName() const
-{
-    return wxString(wxT("wxSoundFileStream base codec"));
-}
-
-wxUint32 wxSoundFileStream::GetLength()
-{
-  if (m_input && !m_prepared && GetError() == wxSOUND_NOERROR)
-    return (PrepareToPlay()) ? m_length : 0;
-
-  return m_length;
-}
-
-wxUint32 wxSoundFileStream::GetPosition()
-{
-  if (!m_prepared && m_input != NULL && GetError() == wxSOUND_NOERROR)
-    PrepareToPlay();
-
-  return m_length-m_bytes_left;
-}
-
-wxUint32 wxSoundFileStream::SetPosition(wxUint32 new_position)
-{
-  if (!m_prepared && m_input != NULL && GetError() == wxSOUND_NOERROR)
-    PrepareToPlay();
-
-  if (!m_prepared)
-    return 0;
-
-  if (!RepositionStream(new_position))
-      return m_length-m_bytes_left;
-  
-  if (new_position >= m_length) {
-    m_bytes_left = 0;
-    return m_length;
-  }
-
-  m_bytes_left = m_length-new_position;
-  return new_position;
-}
-
-void wxSoundFileStream::OnSoundEvent(int evt)
-{
-  wxUint32 len = m_codec.GetBestSize();
-  char *buffer;
-
-  buffer = new char[len];
-  wxSoundStream::OnSoundEvent(evt);
-
-  while (!m_sndio->QueueFilled()) {
-    switch(evt) {
-    case wxSOUND_INPUT:
-      if (len > m_bytes_left)
-        len = m_bytes_left;
-
-      len = m_codec.Read(buffer, len).GetLastAccess();
-      PutData(buffer, len);
-      m_bytes_left -= len;
-      if (m_bytes_left == 0) {
-        Stop();
-        delete[] buffer;
-        return;
-      }
-      break;
-    case wxSOUND_OUTPUT:
-      if (len > m_bytes_left)
-        len = m_bytes_left;
-
-      len = GetData(buffer, len);
-      m_bytes_left -= len;
-      if (m_bytes_left == 0) {
-        Stop();
-        delete[] buffer;
-        return;
-      }
-      m_codec.Write(buffer, len);
-      break;
-    }
-  }
-  delete[] buffer;
-}
-
-bool wxSoundFileStream::SetSoundFormat(const wxSoundFormatBase& format)
-{
-  wxSoundStream::SetSoundFormat(format);
-  return m_codec.SetSoundFormat(format);
-}
diff --git a/contrib/src/mmedia/sndg72x.cpp b/contrib/src/mmedia/sndg72x.cpp
deleted file mode 100644
index a51e2d19a9..0000000000
--- a/contrib/src/mmedia/sndg72x.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndg72x.cpp
-// Purpose:
-// Date: 08/26/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/internal/g72x.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatG72X
-// --------------------------------------------------------------------------
-
-wxSoundFormatG72X::wxSoundFormatG72X()
-        : m_srate(22050)
-{
-}
-
-wxSoundFormatG72X::~wxSoundFormatG72X()
-{
-}
-
-void wxSoundFormatG72X::SetSampleRate(wxUint32 srate)
-{
-    m_srate = srate;
-}
-
-wxUint32 wxSoundFormatG72X::GetSampleRate() const
-{
-    return m_srate;
-}
-
-void wxSoundFormatG72X::SetG72XType(wxSoundG72XType type)
-{
-    m_g72x_type = type;
-}
-
-wxSoundFormatBase *wxSoundFormatG72X::Clone() const
-{
-    wxSoundFormatG72X *g72x = new wxSoundFormatG72X();
-
-    g72x->m_srate = m_srate;
-    g72x->m_g72x_type = m_g72x_type;
-    return g72x;
-}
-
-wxUint32 wxSoundFormatG72X::GetTimeFromBytes(wxUint32 bytes) const
-{
-    int n_bits;
-
-    switch (m_g72x_type) {
-        case wxSOUND_G721:
-            n_bits = 4;
-            break;
-        case wxSOUND_G723_24:
-            n_bits = 3;
-            break;
-        case wxSOUND_G723_40:
-            n_bits = 5;
-            break;
-        default:
-            n_bits = 0;
-            break;
-    }
-    return (wxUint32)((bytes / m_srate) * n_bits) / 8;
-}
-
-wxUint32 wxSoundFormatG72X::GetBytesFromTime(wxUint32 time) const
-{
-    int n_bits;
-    
-    switch (m_g72x_type) {
-        case wxSOUND_G721:
-            n_bits = 4;
-            break;
-        case wxSOUND_G723_24:
-            n_bits = 3;
-            break;
-        case wxSOUND_G723_40:
-            n_bits = 5;
-            break;
-        default:
-            n_bits = 0;
-    }
-    return (wxUint32)((time * m_srate * n_bits) / 8);
-}
-
-bool wxSoundFormatG72X::operator !=(const wxSoundFormatBase& frmt2) const
-{
-    wxSoundFormatG72X *g72x = (wxSoundFormatG72X *)&frmt2;
-    
-    if (frmt2.GetType() != wxSOUND_G72X)
-        return true;
-    
-    return (g72x->m_srate != m_srate || g72x->m_g72x_type != m_g72x_type);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamG72X
-// --------------------------------------------------------------------------
-
-wxSoundStreamG72X::wxSoundStreamG72X(wxSoundStream& sndio)
-        : wxSoundStreamCodec(sndio)
-{
-    // PCM converter
-    m_router = new wxSoundRouterStream(sndio);
-    m_state  = new g72state;
-    g72x_init_state(m_state);
-}
-
-wxSoundStreamG72X::~wxSoundStreamG72X()
-{
-    delete m_router;
-}
-
-wxSoundStream& wxSoundStreamG72X::Read(void *buffer, wxUint32 len)
-{
-    wxUint16 *old_linear;
-    register wxUint16 *linear_buffer;
-    register wxUint32 real_len;
-    register wxUint32 countdown = len;
-    
-    real_len = (len * 8 / m_n_bits);
-    
-    old_linear = linear_buffer = new wxUint16[real_len];
-    
-    m_router->Read(linear_buffer, real_len);
-    
-    real_len = (wxUint32)(m_router->GetLastAccess() * ((float)m_n_bits / 8));
-    if (!real_len)
-        return *m_router;
-    
-    m_io_buffer = (wxUint8 *)buffer; 
-    m_current_b_pos = 0;
-    
-    while (countdown != 0) {
-        PutBits(m_coder(*linear_buffer++, AUDIO_ENCODING_LINEAR, m_state));
-        countdown--;
-    }
-    m_lastcount = real_len;
-    m_snderror = m_router->GetError();
-    
-    delete[] old_linear;
-    
-    return *this;
-}
-
-wxSoundStream& wxSoundStreamG72X::Write(const void *buffer, wxUint32 len)
-{
-    wxUint16 *old_linear;
-    register wxUint16 *linear_buffer;
-    register wxUint32 countdown = len;
-    register wxUint32 real_len;
-    
-    // Compute the real length (PCM format) to sendt to the sound card
-    real_len = (len * m_n_bits / 8);
-    
-    // Allocate a temporary buffer
-    old_linear = linear_buffer = new wxUint16[real_len];
-    
-    // Bad, we override the const
-    m_io_buffer = (wxUint8 *)buffer;
-    m_current_b_pos = 0;
-    
-    // Decode the datas
-    while (countdown != 0) {
-        *linear_buffer++ = m_decoder(GetBits(), AUDIO_ENCODING_LINEAR, m_state);
-        countdown--;
-    }
-    m_lastcount = len;
-    
-    // Send them to the sound card
-    m_router->Write(old_linear, real_len);
-    
-    // Destroy the temporary buffer
-    delete[] old_linear;
-    
-    return *m_router;
-}
-
-bool wxSoundStreamG72X::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    if (format.GetType() != wxSOUND_G72X) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-    
-    wxSoundFormatPcm pcm;
-    wxSoundFormatG72X *g72x;
-    
-    wxSoundStreamCodec::SetSoundFormat(format);
-    
-    g72x = (wxSoundFormatG72X *)m_sndformat;
-    
-    // Set PCM as the output format of the codec
-    pcm.SetSampleRate(g72x->GetSampleRate());
-    pcm.SetBPS(16);
-    pcm.SetChannels(1); // Only mono supported
-    pcm.Signed(true);
-    pcm.SetOrder(wxBYTE_ORDER);
-
-    // Look for the correct codec to use and set its bit width
-    switch (g72x->GetG72XType()) {
-        case wxSOUND_G721:
-            m_n_bits  = 4;
-            m_coder   = g721_encoder;
-            m_decoder = g721_decoder;
-            break;
-        case wxSOUND_G723_24:
-            m_n_bits  = 3;
-            m_coder   = g723_24_encoder;
-            m_decoder = g723_24_decoder;
-            break;
-        case wxSOUND_G723_40:
-            m_n_bits  = 5;
-            m_coder   = g723_40_encoder;
-            m_decoder = g723_40_decoder;
-            break;
-    }
-
-    // Let the router finish the work
-    m_router->SetSoundFormat(pcm);
-    
-    return true;
-}
-
-#define BYTE_SIZE 8
-
-wxUint8 wxSoundStreamG72X::GetBits()
-{
-    register wxUint8 bits;
-
-    // We have two bytes to compute
-    if (m_current_b_pos < m_n_bits) {
-        register wxUint8 b_left;
-        
-        // TRANSLATE the mask
-        m_current_mask >>= m_current_b_pos;
-        
-        // GET the last bits: 0001..1
-        bits = (m_current_byte & m_current_mask) << (m_n_bits - m_current_b_pos);
-        
-        // GEN: 1. n times .1000
-        b_left = BYTE_SIZE-m_n_bits;
-        m_current_mask = ((1 << m_n_bits) - 1) << b_left;
-        
-        // GET the next byte
-        m_current_byte = *m_io_buffer++;
-        
-        register wxUint8 tmp_mask;
-        
-        // COMPUTE a new temporary mask to get the last bits
-        b_left = m_n_bits - b_left;
-        tmp_mask = (1 << b_left) - 1;
-        // TRANSLATE the old mask to get ready for the next time
-        m_current_mask >>= b_left;
-        
-        // COMPUTE the new bit position
-        b_left = BYTE_SIZE - b_left; 
-        m_current_b_pos = b_left;
-        tmp_mask <<= b_left;
-        
-        // GET the last bits
-        bits |= (m_current_byte & tmp_mask) >> b_left;
-    } else {
-        m_current_mask >>= m_n_bits;
-        m_current_b_pos -= m_n_bits;
-        bits = (m_current_byte & m_current_mask) >> m_current_b_pos;
-    }
-    return bits;
-}
-
-void wxSoundStreamG72X::PutBits(wxUint8 bits)
-{
-    if (m_current_b_pos < m_n_bits) {
-        register wxUint8 tmp_mask;
-        register wxUint8 diff;
-        
-        diff = m_n_bits - m_current_b_pos;
-        // Pack bits and put the byte in the buffer
-        m_current_byte |= bits >> diff;
-        *m_io_buffer++ = m_current_byte;
-        
-        // Gen a mask
-        tmp_mask = ~((1 << diff) - 1);
-        
-        m_current_b_pos = BYTE_SIZE - (m_n_bits - m_current_b_pos);
-        
-        m_current_byte = (bits & (tmp_mask)) << m_current_b_pos;
-    } else {
-        m_current_b_pos -= m_n_bits;
-        bits           <<= m_current_b_pos;
-        m_current_byte |= bits;
-    }
-}
diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
deleted file mode 100644
index 3078d98d26..0000000000
--- a/contrib/src/mmedia/sndmsad.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndulaw.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-  #include "wx/memory.h"
-  #include "wx/log.h"
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndmsad.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatMSAdpcm
-// --------------------------------------------------------------------------
-
-wxSoundFormatMSAdpcm::wxSoundFormatMSAdpcm()
-        : m_srate(22050)
-{
-    m_ncoefs    = 0;
-    m_coefs_len = 0;
-    m_coefs     = NULL;
-}
-
-wxSoundFormatMSAdpcm::~wxSoundFormatMSAdpcm()
-{
-    if (m_ncoefs) {
-        wxUint16 i;
-
-        for (i=0;i<m_ncoefs;i++)
-            delete[] m_coefs[i];
-        delete[] m_coefs;
-    }
-    
-}
-
-void wxSoundFormatMSAdpcm::SetSampleRate(wxUint32 srate)
-{
-    m_srate = srate;
-}
-
-wxUint32 wxSoundFormatMSAdpcm::GetSampleRate() const
-{
-    return m_srate;
-}
-
-void wxSoundFormatMSAdpcm::SetChannels(wxUint16 nchannels)
-{
-    m_nchannels = nchannels;
-}
-
-wxUint16 wxSoundFormatMSAdpcm::GetChannels() const
-{
-    return m_nchannels; 
-}
-
-void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **WXUNUSED(coefs), wxUint16 ncoefs,
-                                    wxUint16 coefs_len)
-{
-    wxUint16 i;
-
-    if (m_ncoefs) {
-        for (i=0;i<m_ncoefs;i++)
-           delete[] (m_coefs[i]);
-        delete[] m_coefs;
-    }
-    // TODO: Add some memory checking here
-    m_coefs = new wxInt16 *[ncoefs];
-
-    for (i=0;i<ncoefs;i++)
-       m_coefs[i] = new wxInt16[coefs_len];
-
-    m_ncoefs = ncoefs;
-    m_coefs_len = coefs_len;
-}
-
-void wxSoundFormatMSAdpcm::GetCoefs(wxInt16 **& coefs, wxUint16& ncoefs,
-                                    wxUint16& coefs_len) const
-{
-    coefs     = m_coefs;
-    ncoefs    = m_ncoefs;
-    coefs_len = m_coefs_len;
-}
-
-void wxSoundFormatMSAdpcm::SetBlockSize(wxUint16 block_size)
-{
-    m_block_size = block_size;
-}
-
-wxUint16 wxSoundFormatMSAdpcm::GetBlockSize() const
-{
-    return m_block_size;
-}
-
-wxSoundFormatBase *wxSoundFormatMSAdpcm::Clone() const
-{
-    wxSoundFormatMSAdpcm *adpcm = new wxSoundFormatMSAdpcm();
-    
-    adpcm->m_srate       = m_srate;
-    adpcm->SetCoefs(m_coefs, m_ncoefs, m_coefs_len);
-    adpcm->m_nchannels   = m_nchannels;
-    adpcm->m_block_size  = m_block_size;
-    return adpcm;
-}
-
-wxUint32 wxSoundFormatMSAdpcm::GetTimeFromBytes(wxUint32 bytes) const
-{
-    return 2 * bytes / (m_nchannels * m_srate);
-}
-
-wxUint32 wxSoundFormatMSAdpcm::GetBytesFromTime(wxUint32 time) const
-{
-    return time * m_nchannels * m_srate / 2;
-}
-
-bool wxSoundFormatMSAdpcm::operator !=(const wxSoundFormatBase& frmt2) const
-{
-    const wxSoundFormatMSAdpcm *adpcm = (const wxSoundFormatMSAdpcm *)&frmt2;
-    
-    if (frmt2.GetType() != wxSOUND_MSADPCM)
-        return true;
-    
-    return (adpcm->m_srate != m_srate) && (adpcm->m_nchannels != m_nchannels);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamMSAdpcm
-// --------------------------------------------------------------------------
-wxSoundStreamMSAdpcm::wxSoundStreamMSAdpcm(wxSoundStream& sndio)
-        : wxSoundStreamCodec(sndio)
-{
-    // PCM converter
-    m_router     = new wxSoundRouterStream(sndio);
-    m_got_header = false;
-    m_stereo = false;
-}
-
-wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
-{
-    delete m_router;
-}
-
-wxSoundStream& wxSoundStreamMSAdpcm::Read(void *WXUNUSED(buffer), wxUint32 WXUNUSED(len))
-{
-    m_snderror = wxSOUND_NOCODEC;
-    m_lastcount = 0;
-    return *this;
-}
-
-static wxInt16 gl_ADPCMcoeff_delta[] = {
-    230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307,
-    230, 230, 230
-};
-
-wxUint32 wxSoundStreamMSAdpcm::DecodeMonoADPCM(const void *in_buffer,
-                                               void *out_buffer,
-                                               wxUint32 in_len)
-{
-    wxUint8  *ADPCMdata;
-    wxInt16  *PCMdata;
-    AdpcmState *state;
-    wxUint32 out_len;
-    
-    ADPCMdata = (wxUint8 *)in_buffer;
-    PCMdata   = (wxInt16 *)out_buffer;
-    state     = &m_state[0];
-    
-#define GET_DATA_16(i) i = *ADPCMdata++, i |= ((wxUint32)(*ADPCMdata++) << 8)
-#define GET_DATA_8(i) i = (*ADPCMdata++)
-
-    out_len = 0;
-    while (in_len != 0) {
-        if (m_next_block == 0) {
-            GET_DATA_8(state->predictor);
-            GET_DATA_16(state->iDelta);
-            
-            GET_DATA_16(state->samp1);
-            GET_DATA_16(state->samp2);
-            
-            state->coeff[0] = state->coeff[1] = m_coefs[0][ state->predictor ];
-            
-            *PCMdata++ = state->samp2;
-            *PCMdata++ = state->samp1;
-            in_len     -= 7;
-            out_len    += 4;
-            m_next_block = m_block_size;
-            continue;
-        }
-    
-        while (in_len != 0 && m_next_block != 0) {
-            wxUint8 nib[2];
-            
-            GET_DATA_8(nib[0]);
-            nib[1] = (nib[0] >> 4) & 0x0f;
-            nib[0] &= 0x0f;
-        
-            Nibble(nib[0], state, &PCMdata);
-            Nibble(nib[1], state, &PCMdata);
-        
-            in_len       -= 4;
-            out_len      += 4;
-            m_next_block -= 4;
-        }
-    }
-
-    return out_len;
-
-#undef GET_DATA_16
-#undef GET_DATA_8
-}
-
-wxUint32 wxSoundStreamMSAdpcm::DecodeStereoADPCM(const void *in_buffer,
-                                                 void *out_buffer,
-                                                 wxUint32 in_len)
-{            
-    wxUint8  *ADPCMdata;
-    wxInt16  *PCMdata;
-    AdpcmState *state0, *state1;
-    wxUint32 out_len;
-    
-    ADPCMdata = (wxUint8 *)in_buffer;
-    PCMdata   = (wxInt16 *)out_buffer;
-    
-    state0 = &m_state[0];
-    state1 = &m_state[1];
-    
-#define GET_DATA_16(i) i = *ADPCMdata++, i |= ((wxUint32)(*ADPCMdata++) << 8)
-#define GET_DATA_8(i) i = (*ADPCMdata++)
-
-    out_len = 0;
-    while (in_len != 0) {
-        if (!m_next_block) {
-            GET_DATA_8(state0->predictor);
-            GET_DATA_8(state1->predictor);
-            
-            GET_DATA_16(state0->iDelta);
-            GET_DATA_16(state1->iDelta);
-        
-            GET_DATA_16(state0->samp1);
-            GET_DATA_16(state1->samp1);
-            GET_DATA_16(state0->samp2);
-            GET_DATA_16(state1->samp2);
-        
-            *PCMdata++ = state0->samp2;
-            *PCMdata++ = state1->samp2;
-            *PCMdata++ = state0->samp1;
-            *PCMdata++ = state1->samp1;
-
-            in_len     -= 14;
-            out_len    += 8;
-            m_next_block = m_block_size;
-            continue;
-        }
-    
-        while (in_len != 0 && m_next_block > 0) {
-            wxUint8 nib[2];
-            
-            GET_DATA_8(nib[0]);
-            nib[1] = (nib[0] >> 4) & 0x0f;
-            nib[0] &= 0x0f;
-            
-            Nibble(nib[0], state0, &PCMdata);
-            Nibble(nib[1], state1, &PCMdata);
-            
-            in_len       -= 4;
-            out_len      += 4;
-            m_next_block -= 4;
-        }
-    }
-
-    return out_len;
-
-#undef GET_DATA_16
-#undef GET_DATA_8
-}
-
-void wxSoundStreamMSAdpcm::Nibble(wxInt8 nyb,
-                                  AdpcmState *state,
-                                  wxInt16 **out_buffer)
-{
-    wxUint32 new_delta;
-    wxInt32  new_sample;
-
-    // First: compute the next delta value
-    new_delta  = (state->iDelta * gl_ADPCMcoeff_delta[nyb]) >> 8;
-    // If null, minor it by 16
-    if (!new_delta)
-        new_delta = 16;
-
-    // Barycentre
-    new_sample = (state->samp1 * state->coeff[0] +
-                  state->samp2 * state->coeff[1]) / 256;
-
-    // Regenerate the sign
-    if (nyb & 0x08)
-        nyb -= 0x10;
-    
-    new_sample += state->iDelta * nyb;
-
-    // Samples must be in [-32767, 32768]
-    if (new_sample < -32768)
-        new_sample = -32768;
-    else if (new_sample > 32767)
-        new_sample = 32767;
-    
-    state->iDelta = new_delta;
-    state->samp2  = state->samp1;
-    state->samp1  = new_sample;
-
-    *(*out_buffer)++ = new_sample;
-}
-
-wxSoundStream& wxSoundStreamMSAdpcm::Write(const void *buffer, wxUint32 len)
-{
-    wxUint8 *out_buf;
-    wxUint32 new_len;
-    
-    // TODO: prealloc the output buffer
-    out_buf = new wxUint8[len*2];
-
-    if (!m_stereo)
-        new_len = DecodeMonoADPCM(buffer, out_buf, len);
-    else
-        new_len = DecodeStereoADPCM(buffer, out_buf, len);
-    
-    m_router->Write(out_buf, new_len);
-
-    m_lastcount = len;
-    m_snderror  = wxSOUND_NOERROR;
-    
-    delete[] out_buf;
-    
-    return *this;
-}
-
-wxUint32 wxSoundStreamMSAdpcm::GetBestSize() const
-{
-    return m_sndio->GetBestSize() / 2;
-}
-
-bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    if (format.GetType() != wxSOUND_MSADPCM) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-    
-    wxSoundFormatPcm pcm;
-    wxSoundFormatMSAdpcm *adpcm;
-    wxUint16 ncoefs, coefs_len;
-    
-    wxSoundStreamCodec::SetSoundFormat(format);
-    
-    adpcm = (wxSoundFormatMSAdpcm *)m_sndformat;
-
-    adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
-
-    if (!ncoefs) {
-        wxLogError(wxT("Number of ADPCM coefficients must be non null"));
-        return false;
-    }
-    
-    pcm.SetSampleRate(adpcm->GetSampleRate());
-    pcm.SetBPS(16);
-    pcm.SetChannels(adpcm->GetChannels());
-    pcm.Signed(true);
-    pcm.SetOrder(wxBYTE_ORDER);
-
-    m_stereo = (adpcm->GetChannels() == 2);
-    m_block_size = adpcm->GetBlockSize();
-    m_next_block = 0;
-    
-    m_router->SetSoundFormat(pcm);
-    
-    return true;
-}
-
diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp
deleted file mode 100644
index aa36a1e18f..0000000000
--- a/contrib/src/mmedia/sndoss.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndoss.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-// --------------------------------------------------------------------------
-// System dependent headers
-// --------------------------------------------------------------------------
-
-#include <sys/soundcard.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#ifdef __WXGTK__
-#include <gdk/gdk.h>
-#endif
-
-// --------------------------------------------------------------------------
-// wxWidgets headers
-// --------------------------------------------------------------------------
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndoss.h"
-#include "wx/mmedia/sndpcm.h"
-
-wxSoundStreamOSS::wxSoundStreamOSS(const wxString& dev_name)
-{
-    wxSoundFormatPcm pcm_default;
-
-    // Open the OSS device
-    m_fd = open(dev_name.mb_str(), O_WRONLY);
-    if (m_fd == -1) {
-        // OSS not found
-        m_oss_ok   = false;
-        m_snderror = wxSOUND_INVDEV;
-        return;
-    }
-
-    // Remember the device name
-    m_devname = dev_name;
-
-    // Initialize the default format
-    wxSoundStreamOSS::SetSoundFormat(pcm_default);
-
-    // Get the default best size for OSS
-    ioctl(m_fd, SNDCTL_DSP_GETBLKSIZE, &m_bufsize);
-
-    m_snderror = wxSOUND_NOERROR;
-
-    // Close OSS
-    close(m_fd);
-
-    m_oss_ok   = true;
-    m_oss_stop = true;
-    m_q_filled = true;
-}
-
-wxSoundStreamOSS::~wxSoundStreamOSS()
-{
-    if (m_fd > 0)
-        close(m_fd);
-}
-
-wxUint32 wxSoundStreamOSS::GetBestSize() const
-{
-    return m_bufsize;
-}
-
-wxSoundStream& wxSoundStreamOSS::Read(void *buffer, wxUint32 len)
-{
-    int ret;
-
-    if (m_oss_stop) {
-        m_snderror = wxSOUND_NOTSTARTED;
-        m_lastcount = 0;
-        return *this;
-    }
-
-    ret = read(m_fd, buffer, len);
-    m_lastcount = (wxUint32)ret;
-    m_q_filled  = true;
-
-    if (ret < 0)
-        m_snderror = wxSOUND_IOERROR;
-    else
-        m_snderror = wxSOUND_NOERROR;
-
-    return *this;
-}
-
-wxSoundStream& wxSoundStreamOSS::Write(const void *buffer, wxUint32 len)
-{
-    int ret;
-
-    if (m_oss_stop) {
-        m_snderror = wxSOUND_NOTSTARTED;
-        m_lastcount= 0;
-        return *this;
-    }
-
-    ret = write(m_fd, buffer, len);
-    m_q_filled = true;
-
-    if (ret < 0) {
-        m_lastcount = 0;
-        m_snderror  = wxSOUND_IOERROR;
-    } else {
-        m_snderror = wxSOUND_NOERROR;
-        m_lastcount = (wxUint32)ret;
-    }
-
-    return *this;
-}
-
-bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    int tmp;
-    wxSoundFormatPcm *pcm_format;
-
-    if (format.GetType() != wxSOUND_PCM) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-
-    if (!m_oss_ok) {
-        m_snderror = wxSOUND_INVDEV;
-        return false;
-    }
-
-    if (m_sndformat)
-        delete m_sndformat;
-
-    m_sndformat = format.Clone();
-    if (!m_sndformat) {
-        m_snderror = wxSOUND_MEMERROR;
-        return false;
-    }
-    pcm_format = (wxSoundFormatPcm *)m_sndformat;
-
-    // We temporary open the OSS device
-    if (m_oss_stop) {
-        m_fd = open(m_devname.mb_str(), O_WRONLY);
-        if (m_fd == -1) {
-            m_snderror = wxSOUND_INVDEV;
-            return false;
-        }
-    }
-
-    // Set the sample rate field.
-    tmp = pcm_format->GetSampleRate();
-    ioctl(m_fd, SNDCTL_DSP_SPEED, &tmp);
-
-    pcm_format->SetSampleRate(tmp);
-
-    // Detect the best format
-    DetectBest(pcm_format);
-    // Try to apply it
-    SetupFormat(pcm_format);
-
-    tmp = pcm_format->GetChannels();
-    ioctl(m_fd, SNDCTL_DSP_CHANNELS, &tmp);
-    pcm_format->SetChannels(tmp);
-
-    // Close the OSS device
-    if (m_oss_stop)
-        close(m_fd);
-
-    m_snderror = wxSOUND_NOERROR;
-    if (*pcm_format != format) {
-        m_snderror = wxSOUND_NOEXACT;
-        return false;
-    }
-
-    return true;
-}
-
-bool wxSoundStreamOSS::SetupFormat(wxSoundFormatPcm *pcm_format)
-{
-    int tmp;
-
-    switch(pcm_format->GetBPS()) {
-        case 8:
-            if (pcm_format->Signed())
-                tmp = AFMT_S8;
-            else
-                tmp = AFMT_U8;
-            break;
-        case 16:
-            switch (pcm_format->GetOrder()) {
-                case wxBIG_ENDIAN:
-                    if (pcm_format->Signed())
-                        tmp = AFMT_S16_BE;
-                    else
-                        tmp = AFMT_U16_BE;
-                    break;
-                case wxLITTLE_ENDIAN:
-                    if (pcm_format->Signed())
-                        tmp = AFMT_S16_LE;
-                    else
-                        tmp = AFMT_U16_LE;
-                    break;
-            }
-            break;
-    }
-
-    ioctl(m_fd, SNDCTL_DSP_SETFMT, &tmp);
-
-    // Demangling.
-    switch (tmp) {
-        case AFMT_U8:
-            pcm_format->SetBPS(8);
-            pcm_format->Signed(false);
-            break;
-        case AFMT_S8:
-            pcm_format->SetBPS(8);
-            pcm_format->Signed(true);
-            break;
-        case AFMT_U16_LE:
-            pcm_format->SetBPS(16);
-            pcm_format->Signed(false);
-            pcm_format->SetOrder(wxLITTLE_ENDIAN);
-            break;
-        case AFMT_U16_BE:
-            pcm_format->SetBPS(16);
-            pcm_format->Signed(false);
-            pcm_format->SetOrder(wxBIG_ENDIAN);
-            break;
-        case AFMT_S16_LE:
-            pcm_format->SetBPS(16);
-            pcm_format->Signed(true);
-            pcm_format->SetOrder(wxLITTLE_ENDIAN);
-            break;
-        case AFMT_S16_BE:
-            pcm_format->SetBPS(16);
-            pcm_format->Signed(true);
-            pcm_format->SetOrder(wxBIG_ENDIAN);
-            break;
-    }
-    return true;
-}
-
-#ifdef __WXGTK__
-static void _wxSound_OSS_CBack(gpointer data, int source,
-                               GdkInputCondition condition)
-{
-    wxSoundStreamOSS *oss = (wxSoundStreamOSS *)data;
-
-    switch (condition) {
-        case GDK_INPUT_READ:
-            oss->WakeUpEvt(wxSOUND_INPUT);
-            break;
-        case GDK_INPUT_WRITE:
-            oss->WakeUpEvt(wxSOUND_OUTPUT);
-            break;
-        default:
-            break;
-    }
-}
-#endif
-
-void wxSoundStreamOSS::WakeUpEvt(int evt)
-{
-    m_q_filled = false;
-    OnSoundEvent(evt);
-}
-
-bool wxSoundStreamOSS::StartProduction(int evt)
-{
-    wxSoundFormatBase *old_frmt;
-
-    if (!m_oss_stop)
-        StopProduction();
-
-    old_frmt = m_sndformat->Clone();
-    if (!old_frmt) {
-        m_snderror = wxSOUND_MEMERROR;
-        return false;
-    }
-
-    if (evt == wxSOUND_OUTPUT)
-        m_fd = open(m_devname.mb_str(), O_WRONLY);
-    else if (evt == wxSOUND_INPUT)
-        m_fd = open(m_devname.mb_str(), O_RDONLY);
-
-    if (m_fd == -1) {
-        m_snderror = wxSOUND_INVDEV;
-        return false;
-    }
-
-    SetSoundFormat(*old_frmt);
-    delete old_frmt;
-
-    int trig;
-
-    if (evt == wxSOUND_OUTPUT) {
-#ifdef __WXGTK__
-        m_tag = gdk_input_add(m_fd, GDK_INPUT_WRITE, _wxSound_OSS_CBack, (gpointer)this);
-#endif
-        trig = PCM_ENABLE_OUTPUT;
-    } else {
-#ifdef __WXGTK__
-        m_tag = gdk_input_add(m_fd, GDK_INPUT_READ, _wxSound_OSS_CBack, (gpointer)this);
-#endif
-        trig = PCM_ENABLE_INPUT;
-    }
-
-  ioctl(m_fd, SNDCTL_DSP_SETTRIGGER, &trig);
-
-  m_oss_stop = false;
-  m_q_filled = false;
-
-  return true;
-}
-
-bool wxSoundStreamOSS::StopProduction()
-{
-  if (m_oss_stop)
-    return false;
-
-#ifdef __WXGTK__
-  gdk_input_remove(m_tag);
-#endif
-
-  close(m_fd);
-  m_oss_stop = true;
-  m_q_filled = true;
-  return true;
-}
-
-bool wxSoundStreamOSS::QueueFilled() const
-{
-  return m_q_filled;
-}
-
-//
-// Detect the closest format (The best).
-//
-void wxSoundStreamOSS::DetectBest(wxSoundFormatPcm *pcm)
-{
-#define MASK_16BITS (AFMT_S16_LE | AFMT_S16_BE | AFMT_U16_LE | AFMT_U16_BE)
-
-  int fmt_mask;
-  wxSoundFormatPcm best_pcm;
-
-  // We change neither the number of channels nor the sample rate
-
-  best_pcm.SetSampleRate(pcm->GetSampleRate());
-  best_pcm.SetChannels(pcm->GetChannels());
-
-  // Get the supported format by the sound card
-  ioctl(m_fd, SNDCTL_DSP_GETFMTS, &fmt_mask);
-
-  // It supports 16 bits
-  if (pcm->GetBPS() == 16 && ((fmt_mask & MASK_16BITS) != 0))
-    best_pcm.SetBPS(16);
-
-  // It supports big endianness
-  if (pcm->GetOrder() == wxBIG_ENDIAN &&
-      ((fmt_mask & (AFMT_S16_BE | AFMT_U16_BE)) != 0))
-    best_pcm.SetOrder(wxBIG_ENDIAN);
-
-  // It supports little endianness
-  if (pcm->GetOrder() == wxLITTLE_ENDIAN &&
-      ((fmt_mask & (AFMT_S16_LE | AFMT_U16_LE)) != 0))
-    best_pcm.SetOrder(wxLITTLE_ENDIAN);
-
-  // It supports signed samples
-  if (pcm->Signed() &&
-      ((fmt_mask & (AFMT_S16_LE | AFMT_S16_BE | AFMT_S8)) != 0))
-    best_pcm.Signed(true);
-
-  // It supports unsigned samples
-  if (!pcm->Signed() &&
-      ((fmt_mask & (AFMT_U16_LE | AFMT_U16_BE | AFMT_U8)) != 0))
-    best_pcm.Signed(false);
-
-  // Finally recopy the new format
-  *pcm = best_pcm;
-}
diff --git a/contrib/src/mmedia/sndpcm.cpp b/contrib/src/mmedia/sndpcm.cpp
deleted file mode 100644
index b9eb7cdea1..0000000000
--- a/contrib/src/mmedia/sndpcm.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndpcm.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndpcm.h"
-
-wxSoundFormatPcm::wxSoundFormatPcm(wxUint32 srate, wxUint8 bps, 
-                                   wxUint16 nchannels, bool sign,
-                                   int order) 
- : m_srate(srate), m_bps(bps), m_nchan(nchannels), m_order(order),
-   m_signed(sign)
-{
-}
-
-wxSoundFormatPcm::~wxSoundFormatPcm()
-{
-}
-
-void wxSoundFormatPcm::SetSampleRate(wxUint32 srate)
-{
-  m_srate = srate;
-}
-
-void wxSoundFormatPcm::SetBPS(wxUint8 bps)
-{
-  m_bps = bps;
-}
-
-void wxSoundFormatPcm::SetChannels(wxUint16 nchannels)
-{
-  m_nchan = nchannels;
-}
-
-void wxSoundFormatPcm::SetOrder(int order)
-{
-  m_order = order;
-}
-
-void wxSoundFormatPcm::Signed(bool sign)
-{
-  m_signed = sign;
-}
-
-wxSoundFormatBase *wxSoundFormatPcm::Clone() const
-{
-  wxSoundFormatPcm *new_pcm;
-
-  new_pcm = new wxSoundFormatPcm();
-  new_pcm->m_srate = m_srate;
-  new_pcm->m_bps   = m_bps;
-  new_pcm->m_nchan = m_nchan;
-  new_pcm->m_order = m_order;
-  new_pcm->m_signed= m_signed;
-
-  return new_pcm;
-}
-
-wxUint32 wxSoundFormatPcm::GetTimeFromBytes(wxUint32 bytes) const
-{
-  return (bytes / (m_srate * (m_bps / 8) * m_nchan));
-}
-
-wxUint32 wxSoundFormatPcm::GetBytesFromTime(wxUint32 time) const
-{
-  return (time * (m_srate * (m_bps / 8) * m_nchan));
-}
-
-bool wxSoundFormatPcm::operator!=(const wxSoundFormatBase& format) const
-{
-  wxSoundFormatPcm *format2 = (wxSoundFormatPcm *)&format;
-
-  if (format.GetType() != wxSOUND_PCM)
-    return true;
-
-  return ( (m_srate != format2->m_srate) ||
-           (m_bps != format2->m_bps) ||
-           (m_nchan != format2->m_nchan) ||
-           (m_order != format2->m_order) ||
-           (m_signed != format2->m_signed) );
-}
diff --git a/contrib/src/mmedia/sndulaw.cpp b/contrib/src/mmedia/sndulaw.cpp
deleted file mode 100644
index fd8e731513..0000000000
--- a/contrib/src/mmedia/sndulaw.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndulaw.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndulaw.h"
-#include "wx/mmedia/internal/g72x.h"
-
-// --------------------------------------------------------------------------
-// wxSoundFormatUlaw
-// --------------------------------------------------------------------------
-
-wxSoundFormatUlaw::wxSoundFormatUlaw()
-        : m_srate(22050), m_channels(1)
-{
-}
-
-wxSoundFormatUlaw::~wxSoundFormatUlaw()
-{
-}
-
-void wxSoundFormatUlaw::SetSampleRate(wxUint32 srate)
-{
-    m_srate = srate;
-}
-
-wxUint32 wxSoundFormatUlaw::GetSampleRate() const
-{
-    return m_srate;
-}
-
-wxUint8 wxSoundFormatUlaw::GetChannels() const
-{
-    return m_channels;
-}
-
-void wxSoundFormatUlaw::SetChannels(wxUint8 nchannels)
-{
-    m_channels = nchannels;
-}
-
-wxSoundFormatBase *wxSoundFormatUlaw::Clone() const
-{
-    wxSoundFormatUlaw *ulaw = new wxSoundFormatUlaw();
-    
-    ulaw->m_srate = m_srate;
-    ulaw->m_channels = m_channels;
-    return ulaw;
-}
-
-wxUint32 wxSoundFormatUlaw::GetTimeFromBytes(wxUint32 bytes) const
-{
-    return (bytes / m_srate);
-}
-
-wxUint32 wxSoundFormatUlaw::GetBytesFromTime(wxUint32 time) const
-{
-    return time * m_srate;
-}
-
-bool wxSoundFormatUlaw::operator !=(const wxSoundFormatBase& frmt2) const
-{
-    wxSoundFormatUlaw *ulaw = (wxSoundFormatUlaw *)&frmt2;
-    
-    if (frmt2.GetType() != wxSOUND_ULAW)
-        return true;
-    
-    return (ulaw->m_srate != m_srate);
-}
-
-// --------------------------------------------------------------------------
-// wxSoundStreamUlaw
-// --------------------------------------------------------------------------
-wxSoundStreamUlaw::wxSoundStreamUlaw(wxSoundStream& sndio)
- : wxSoundStreamCodec(sndio)
-{
-  // PCM converter
-  m_router = new wxSoundRouterStream(sndio);
-}
-
-wxSoundStreamUlaw::~wxSoundStreamUlaw()
-{
-  delete m_router;
-}
-
-wxSoundStream& wxSoundStreamUlaw::Read(void *buffer, wxUint32 len)
-{
-    wxUint16 *old_linear;
-    register wxUint16 *linear_buffer;
-    register const wxUint8 *ulaw_buffer;
-    register wxUint32 countdown;
-
-    old_linear = linear_buffer = new wxUint16[len*2];
-    ulaw_buffer = (const wxUint8 *)buffer;
-    
-    m_router->Read(linear_buffer, len * 2);
-    
-    m_lastcount = countdown = m_router->GetLastAccess() / 2;
-    m_snderror  = m_router->GetError();
-    if (m_snderror != wxSOUND_NOERROR)
-        return *this;
-    
-    while (countdown > 0) {
-        *linear_buffer++ = ulaw2linear(*ulaw_buffer++);
-        countdown--;
-    }
-    
-    delete[] old_linear;
-    
-    return *m_router;    
-}
-
-wxSoundStream& wxSoundStreamUlaw::Write(const void *buffer, wxUint32 len)
-{
-    wxUint16 *old_linear;
-    register wxUint16 *linear_buffer;
-    register const wxUint8 *ulaw_buffer;
-    register wxUint32 countdown = len;
-    
-    old_linear = linear_buffer = new wxUint16[len*2];
-    ulaw_buffer = (const wxUint8 *)buffer;
-    
-    while (countdown > 0) {
-        *linear_buffer++ = ulaw2linear(*ulaw_buffer++);
-        countdown--;
-    }
-    
-    m_router->Write(old_linear, len * 2);
-    
-    delete[] old_linear;
-    
-    return *m_router;
-}
-
-wxUint32 wxSoundStreamUlaw::GetBestSize() const
-{
-    return m_sndio->GetBestSize() / 2;
-}
-
-bool wxSoundStreamUlaw::SetSoundFormat(const wxSoundFormatBase& format)
-{
-    if (format.GetType() != wxSOUND_ULAW) {
-        m_snderror = wxSOUND_INVFRMT;
-        return false;
-    }
-    
-    // As the codec only support 16 bits, Mono we must use a wxSoundRouter
-    // to filter the data and to translate them to a format supported
-    // by the sound card.
-    
-    wxSoundFormatPcm pcm;
-    wxSoundFormatUlaw *ulaw;
-    
-    wxSoundStreamCodec::SetSoundFormat(format);
-    
-    ulaw = (wxSoundFormatUlaw *)m_sndformat;
-    
-    pcm.SetSampleRate(ulaw->GetSampleRate());
-    pcm.SetBPS(16);
-    pcm.SetChannels(ulaw->GetChannels());
-    pcm.Signed(true);
-    pcm.SetOrder(wxBYTE_ORDER);
-    
-    m_router->SetSoundFormat(pcm);
-    
-    return true;
-}
diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp
deleted file mode 100644
index 5bf9e7fd4e..0000000000
--- a/contrib/src/mmedia/sndwav.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwav.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/datstrm.h"
-#include "wx/filefn.h"
-#include "wx/mstream.h"
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndcodec.h"
-#include "wx/mmedia/sndfile.h"
-#include "wx/mmedia/sndpcm.h"
-#include "wx/mmedia/sndg72x.h"
-#include "wx/mmedia/sndmsad.h"
-#include "wx/mmedia/sndwav.h"
-
-#define BUILD_SIGNATURE(a,b,c,d) (((wxUint32)a) | (((wxUint32)b) << 8) | (((wxUint32)c) << 16)  | (((wxUint32)d) << 24)) 
-
-#define RIFF_SIGNATURE BUILD_SIGNATURE('R','I','F','F')
-#define WAVE_SIGNATURE BUILD_SIGNATURE('W','A','V','E')
-#define FMT_SIGNATURE BUILD_SIGNATURE('f','m','t',' ')
-#define DATA_SIGNATURE BUILD_SIGNATURE('d','a','t','a')
-
-#define HEADER_SIZE 4+4 + 4+4+16 + 4+4
-// 4+4 => NAME + LEN
-// 16 => fmt size
-
-wxSoundWave::wxSoundWave(wxInputStream& stream, wxSoundStream& io_sound)
-        : wxSoundFileStream(stream, io_sound)
-{
-    m_base_offset = wxInvalidOffset;
-}
-
-wxSoundWave::wxSoundWave(wxOutputStream& stream, wxSoundStream& io_sound)
-        : wxSoundFileStream(stream, io_sound)
-{
-    m_base_offset = wxInvalidOffset;
-}
-
-wxSoundWave::~wxSoundWave()
-{
-}
-
-wxString wxSoundWave::GetCodecName() const
-{
-    return wxString(wxT("wxSoundWave codec"));
-}
-
-#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return false; }
-
-bool wxSoundWave::CanRead()
-{
-    wxUint32 len, signature1, signature2;
-    m_snderror = wxSOUND_NOERROR;
-
-    // Test the main signatures:
-    //   "RIFF"
-    FAIL_WITH(m_input->Read(&signature1, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    
-    if (wxUINT32_SWAP_ON_BE(signature1) != RIFF_SIGNATURE) {
-        m_input->Ungetch(&signature1, 4);
-        return false;
-    }
-
-    // Pass the global length
-    m_input->Read(&len, 4);
-    FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-
-    // Get the second signature
-    FAIL_WITH(m_input->Read(&signature2, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    // Ungetch all
-    m_input->Ungetch(&signature2, 4);
-    m_input->Ungetch(&len, 4);
-    m_input->Ungetch(&signature1, 4);
-
-    // Test the second signature
-    if (wxUINT32_SWAP_ON_BE(signature2) != WAVE_SIGNATURE)
-        return false;
-    
-    return true;
-}
-
-bool wxSoundWave::HandleOutputPCM(wxDataInputStream& WXUNUSED(data), wxUint32 len,
-                                  wxUint16 channels, 
-                                  wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
-                                  wxUint16 WXUNUSED(byte_p_spl), wxUint16 bits_p_spl)
-{
-    wxSoundFormatPcm sndformat;
-    
-    sndformat.SetSampleRate(sample_fq);
-    sndformat.SetBPS(bits_p_spl);
-    sndformat.SetChannels(channels);
-    sndformat.Signed(true);
-    sndformat.SetOrder(wxLITTLE_ENDIAN);
-    
-    if (!SetSoundFormat(sndformat))
-        return false;
-    
-    m_input->SeekI(len, wxFromCurrent);
-
-    return true;
-}
-
-bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
-                                      wxUint16 channels, 
-                                      wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
-                                      wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
-{
-    wxSoundFormatMSAdpcm sndformat;
-    wxInt16 *coefs[2];
-    wxUint16 coefs_len, i;
-    wxUint16 block_size;
-    
-    sndformat.SetSampleRate(sample_fq);
-    sndformat.SetChannels(channels);
-    
-    block_size = data.Read16();
-    coefs_len = data.Read16();
-
-    coefs[0] = new wxInt16[coefs_len];
-    coefs[1] = new wxInt16[coefs_len];
-    
-    for (i=0;i<coefs_len;i++) {
-        coefs[0][i] = data.Read16();
-        coefs[1][i] = data.Read16();
-    }
-
-    sndformat.SetCoefs(coefs, 2, coefs_len);
-    sndformat.SetBlockSize(block_size);
-
-    delete[] coefs[0];
-    delete[] coefs[1];
-    
-    if (!SetSoundFormat(sndformat))
-        return false;
-
-    len -= coefs_len*4 + 4;
-    
-    m_input->SeekI(len, wxFromCurrent);
-    
-    return true;
-}
-
-bool wxSoundWave::HandleOutputG721(wxDataInputStream& WXUNUSED(data), wxUint32 len,
-                                   wxUint16 WXUNUSED(channels),
-                                   wxUint32 sample_fq, wxUint32 WXUNUSED(byte_p_sec),
-                                   wxUint16 WXUNUSED(byte_p_spl), wxUint16 WXUNUSED(bits_p_spl))
-{
-    wxSoundFormatG72X sndformat;
-    
-    sndformat.SetSampleRate(sample_fq);
-    sndformat.SetG72XType(wxSOUND_G721);
-    
-    if (!SetSoundFormat(sndformat))
-        return false;
-    
-    m_input->SeekI(len, wxFromCurrent);
-
-    return true;
-}
-
-bool wxSoundWave::PrepareToPlay()
-{
-    wxUint32 signature, len;
-    bool end_headers;
-    
-    if (!m_input) {
-        m_snderror = wxSOUND_INVSTRM;
-        return false;
-    }
-    
-    wxDataInputStream data(*m_input);
-    data.BigEndianOrdered(false);
-
-    // Get the first signature
-    FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != RIFF_SIGNATURE, wxSOUND_INVSTRM);
-    // "RIFF"
-    
-    len = data.Read32();
-    wxUnusedVar(len);
-    FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-    // dummy len
-
-    // Get the second signature
-    FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-    FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != WAVE_SIGNATURE, wxSOUND_INVSTRM);
-    // "WAVE"
-    
-    end_headers = false;
-    // Chunk loop
-    while (!end_headers) {
-        FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
-        
-        len = data.Read32();
-        FAIL_WITH(m_input->LastRead() != 4, wxSOUND_INVSTRM);
-        
-        switch (wxUINT32_SWAP_ON_BE(signature)) {
-            case FMT_SIGNATURE: {  // "fmt "
-                wxUint16 format, channels, byte_p_spl, bits_p_spl;
-                wxUint32 sample_fq, byte_p_sec;
-
-                // Get the common parameters
-                data >> format >> channels >> sample_fq 
-                     >> byte_p_sec >> byte_p_spl >> bits_p_spl;
-                len -= 16;
-                
-                switch (format) {
-                    case 0x01: // PCM
-                        if (!HandleOutputPCM(data, len, channels, sample_fq,
-                                             byte_p_sec, byte_p_spl,
-                                             bits_p_spl))
-                            return false;
-                        break;
-                    case 0x02: // MS ADPCM
-                        if (!HandleOutputMSADPCM(data, len,
-                                                 channels, sample_fq,
-                                                 byte_p_sec, byte_p_spl,
-                                                 bits_p_spl))
-                            return false;
-                        break;
-                    case 0x40: // G721
-                        if (!HandleOutputG721(data, len,
-                                              channels, sample_fq,
-                                              byte_p_sec, byte_p_spl,
-                                              bits_p_spl))
-                            return false;
-                        break;
-                    default: 
-                        m_snderror = wxSOUND_NOCODEC;
-                        return false;
-                }
-                break;
-            }
-            case DATA_SIGNATURE: // "data"
-                m_base_offset = m_input->TellI();
-                end_headers = true;
-                FinishPreparation(len);
-                break;
-            default:
-                // We pass the chunk
-                m_input->SeekI(len, wxFromCurrent);
-                break;
-        }
-    }
-    return true;
-}
-
-wxSoundFormatBase *wxSoundWave::HandleInputPCM(wxDataOutputStream& data)
-{
-    wxUint16 format, channels, byte_p_spl, bits_p_spl;
-    wxUint32 sample_fq, byte_p_sec;
-    wxSoundFormatPcm *pcm;
-    
-    pcm = (wxSoundFormatPcm *)(m_sndformat->Clone());
-    
-    // Write block length
-    data.Write32(16);
-    
-    sample_fq  = pcm->GetSampleRate();
-    bits_p_spl = pcm->GetBPS();
-    channels   = pcm->GetChannels();
-    byte_p_spl = pcm->GetBPS() / 8;
-    byte_p_sec = pcm->GetBytesFromTime(1);
-    format     = 0x01;
-    
-    pcm->Signed(true);
-    pcm->SetOrder(wxLITTLE_ENDIAN);
-    
-    data << format << channels << sample_fq
-         << byte_p_sec << byte_p_spl << bits_p_spl;
-    
-    return pcm;
-}
-
-wxSoundFormatBase *wxSoundWave::HandleInputG72X(wxDataOutputStream& data)
-{
-    wxUint16 format, channels, byte_p_spl, bits_p_spl;
-    wxUint32 sample_fq, byte_p_sec;
-    wxSoundFormatG72X *g72x;
-    
-    // Write block length
-    data.Write32(16);
-    
-    g72x = (wxSoundFormatG72X *)(m_sndformat->Clone());
-    if (g72x->GetG72XType() != wxSOUND_G721) {
-        delete g72x;
-        return NULL;
-    } 
-    
-    sample_fq  = g72x->GetSampleRate();
-    bits_p_spl = 4;
-    channels   = 1;
-    byte_p_spl = 0;
-    byte_p_sec = g72x->GetBytesFromTime(1);
-    format     = 0x40;
-    data << format << channels << sample_fq
-         << byte_p_sec << byte_p_spl << bits_p_spl;
-    
-    return g72x;
-}
-
-bool wxSoundWave::PrepareToRecord(wxUint32 time)
-{
-#define WRITE_SIGNATURE(s,sig) \
-signature = sig; \
-signature = wxUINT32_SWAP_ON_BE(signature); \
-FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
-    
-    wxUint32 signature;
-    wxMemoryOutputStream fmt_data;
-    
-    if (!m_output) {
-        m_snderror = wxSOUND_INVSTRM;
-        return false;
-    }
-    
-    wxDataOutputStream data(*m_output);
-    wxDataOutputStream fmt_d_data(fmt_data);
-    
-    data.BigEndianOrdered(false);
-    fmt_d_data.BigEndianOrdered(false);
-    
-    WRITE_SIGNATURE(m_output, RIFF_SIGNATURE);
-    
-    FAIL_WITH(m_output->LastWrite() != 4, wxSOUND_INVSTRM);
-    
-    WRITE_SIGNATURE((&fmt_data), WAVE_SIGNATURE);
-    
-    {
-        wxSoundFormatBase *frmt;
-        
-        WRITE_SIGNATURE((&fmt_data), FMT_SIGNATURE);
-        
-        switch (m_sndformat->GetType()) {
-            case wxSOUND_PCM:
-                frmt = HandleInputPCM(fmt_d_data);
-                break;
-            case wxSOUND_G72X:
-                frmt = HandleInputG72X(fmt_d_data);
-                break;
-            default:
-                m_snderror = wxSOUND_NOCODEC;
-                return false;
-        }
-        
-        FAIL_WITH(!frmt, wxSOUND_NOCODEC);
-        
-        if (!SetSoundFormat(*frmt)) {
-            delete frmt;
-            return false;
-        }
-        
-        delete frmt;
-    }
-    
-    data << (wxUint32)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
-
-    // We, finally, copy the header block to the output stream 
-    {
-        char *out_buf;
-        out_buf = new char[fmt_data.GetSize()];
-        
-        fmt_data.CopyTo(out_buf, fmt_data.GetSize());
-        m_output->Write(out_buf, fmt_data.GetSize());
-        
-        delete[] out_buf;
-    }
-    
-    WRITE_SIGNATURE(m_output, DATA_SIGNATURE);
-    data.Write32(m_sndformat->GetBytesFromTime(time));
-    return true;
-}
-
-bool wxSoundWave::FinishRecording()
-{
-    if (m_output->SeekO(0, wxFromStart) == wxInvalidOffset)
-        // We can't but there is no error.
-        return true;
-    
-    if (m_bytes_left == 0)
-        return true;
-    
-    // TODO: Update headers when we stop before the specified time (if possible)
-    return true;
-}
-
-bool wxSoundWave::RepositionStream(wxUint32 WXUNUSED(position))
-{
-    if (m_base_offset == wxInvalidOffset)
-        return false;
-    m_input->SeekI(m_base_offset, wxFromStart);
-    return true;
-}
-
-wxUint32 wxSoundWave::GetData(void *buffer, wxUint32 len)
-{
-    return m_input->Read(buffer, len).LastRead();
-}
-
-wxUint32 wxSoundWave::PutData(const void *buffer, wxUint32 len)
-{
-    return m_output->Write(buffer, len).LastWrite();
-}
diff --git a/contrib/src/mmedia/sndwin.cpp b/contrib/src/mmedia/sndwin.cpp
deleted file mode 100644
index 1085231a41..0000000000
--- a/contrib/src/mmedia/sndwin.cpp
+++ /dev/null
@@ -1,780 +0,0 @@
-// --------------------------------------------------------------------------
-// Name: sndwin.cpp
-// Purpose:
-// Date: 08/11/1999
-// Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
-// CVSID: $Id$
-// wxWindows licence
-// --------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __WINDOWS__
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/app.h"
-    #include "wx/string.h"
-#endif
-
-#include "wx/module.h"
-#include "wx/msw/private.h"
-
-// -------------------------------------------------------------------------
-// MMedia headers
-// -------------------------------------------------------------------------
-
-#include "wx/mmedia/sndbase.h"
-#include "wx/mmedia/sndwin.h"
-#include "wx/mmedia/sndpcm.h"
-
-// -------------------------------------------------------------------------
-// System headers
-// -------------------------------------------------------------------------
-
-#include <windows.h>
-#include <mmsystem.h>
-
-// -------------------------------------------------------------------------
-// External definitions, forward, ...
-// -------------------------------------------------------------------------
-
-typedef struct _wxSoundInternal wxSoundInternal;
-typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
-
-extern const wxChar *wxCanvasClassName;
-
-wxList *wxSoundHandleList = NULL;
-
-static inline wxSoundStreamWin *wxFindSoundFromHandle(WXHWND hWnd)
-{
-  wxObjectList::compatibility_iterator node = wxSoundHandleList->Find((long)hWnd);
-  if (!node)
-    return NULL;
-  return (wxSoundStreamWin *)node->GetData();
-}
-
-struct _wxSoundInternal {
-  HWND m_sndWin;
-  HWAVEIN m_devin;
-  HWAVEOUT m_devout;
-  bool m_output_enabled, m_input_enabled;
-};
-
-struct _wxSoundInfoHeader {
-  HGLOBAL m_h_header, m_h_data;
-  char *m_data;
-  WAVEHDR *m_header;
-  int m_mode;
-  bool m_playing, m_recording;
-  wxUint32 m_position, m_size;
-
-  wxSoundStreamWin *m_driver;
-};
-
-#define WXSOUND_MAX_QUEUE 10
-
-wxSoundStreamWin::wxSoundStreamWin()
-{
-  wxSoundFormatPcm pcm;
-
-  m_production_started = false;
-  m_internal = new wxSoundInternal;
-  if (!m_internal) {
-    m_snderror = wxSOUND_MEMERROR;
-    m_internal = NULL;
-    return;
-  }
-  m_snderror = wxSOUND_NOERROR;
-
-  // Setup defaults
-  CreateSndWindow();
-  SetSoundFormat(pcm);
-
-  m_internal->m_input_enabled = false;
-  m_internal->m_output_enabled = false;
-
-  m_waiting_for = false;
-
-  if (!OpenDevice(wxSOUND_OUTPUT)) {
-    m_snderror = wxSOUND_NOERROR; //next call to OpenDevice won't do this
-    if (!OpenDevice(wxSOUND_INPUT))
-      return;
-  }
-
-  CloseDevice();
-}
-
-wxSoundStreamWin::~wxSoundStreamWin()
-{
-  if (m_internal) {
-    if (m_production_started)
-      StopProduction();
-    DestroySndWindow();
-
-    delete m_internal;
-  }
-}
-
-// -----------------------------------------------------------------------
-// _wxSoundHandlerWndProc: Window callback to handle buffer completion
-// -----------------------------------------------------------------------
-LRESULT APIENTRY _EXPORT 
-
- _wxSoundHandlerWndProc(HWND hWnd, UINT message,
-                 WPARAM wParam, LPARAM WXUNUSED(lParam))
-{
-  wxSoundStreamWin *sndwin;
-
-  sndwin = wxFindSoundFromHandle((WXHWND)hWnd);
-  if (!sndwin)
-    return (LRESULT)0;
-
-  switch (message) {
-  case MM_WOM_DONE:
-    sndwin->NotifyDoneBuffer(wParam, wxSOUND_OUTPUT);
-    break;
-  case MM_WIM_DATA:
-    sndwin->NotifyDoneBuffer(wParam, wxSOUND_INPUT);
-    break;
-  default:
-    break;
-  }
-  return (LRESULT)0;
-}
-
-// -----------------------------------------------------------------------
-// CreateSndWindow() creates an hidden window which will receive the sound
-// events
-// -----------------------------------------------------------------------
-
-void wxSoundStreamWin::CreateSndWindow()
-{
-  FARPROC proc = MakeProcInstance((FARPROC)_wxSoundHandlerWndProc,
-                                  wxGetInstance());
-  // NB: class name must be kept in sync with wxCanvasClassName in 
-  // src/msw/app.cpp!
-  m_internal->m_sndWin = ::CreateWindow(wxT("wxWindowClass"), NULL, 0,
-                    0, 0, 0, 0, NULL, (HMENU) NULL,
-                                        wxGetInstance(), NULL);
-
-  GetLastError();
-
-  ::SetWindowLong(m_internal->m_sndWin, GWL_WNDPROC, (LONG)proc);
-
-  // Add this window to the sound handle list so we'll be able to redecode
-  // the "magic" number.
-  wxSoundHandleList->Append((long)m_internal->m_sndWin, (wxObject *)this);
-}
-
-// -----------------------------------------------------------------------
-// DestroySndWindow() destroys the hidden window
-// -----------------------------------------------------------------------
-
-void wxSoundStreamWin::DestroySndWindow()
-{
-  if (m_internal->m_sndWin) {
-    ::DestroyWindow(m_internal->m_sndWin);
-    wxSoundHandleList->DeleteObject((wxObject *)this);
-  }
-}
-
-// -------------------------------------------------------------------------
-// OpenDevice(int mode) initializes the windows driver for a "mode"
-// operation. mode is a bit mask: if the bit "wxSOUND_OUTPUT" is set,
-// the driver is opened for output operation, and if the bit "wxSOUND_INPUT"
-// is set, then the driver is opened for input operation. The two modes
-// aren't exclusive.
-// The initialization parameters (sample rate, ...) are taken from the
-// m_sndformat object.
-// At the end, OpenDevice() calls AllocHeaders() to initialize the Sound IO
-// queue.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::OpenDevice(int mode)
-{
-  wxSoundFormatPcm *pcm;
-  WAVEFORMATEX wformat;
-
-  if (!m_sndformat) {
-    m_snderror = wxSOUND_INVFRMT;
-    return false;
-  }
-    
-  pcm = (wxSoundFormatPcm *)m_sndformat;
-
-  wformat.wFormatTag      = WAVE_FORMAT_PCM;
-  wformat.nChannels       = pcm->GetChannels();
-  wformat.nBlockAlign     = wformat.nChannels * pcm->GetBPS() / 8;
-  wformat.nSamplesPerSec  = pcm->GetSampleRate();
-  wformat.nAvgBytesPerSec = wformat.nSamplesPerSec * wformat.nBlockAlign;
-  wformat.wBitsPerSample  = pcm->GetBPS();
-  wformat.cbSize          = 0;
-
-  // -----------------------------------
-  // Open the driver for Output operation
-  // -----------------------------------
-  if (mode & wxSOUND_OUTPUT) {
-    MMRESULT result;
-
-    result = waveOutOpen(&m_internal->m_devout,
-                         WAVE_MAPPER, &wformat,
-                         (DWORD)m_internal->m_sndWin, 0,
-                         CALLBACK_WINDOW);
-
-    if (result != MMSYSERR_NOERROR) {
-      m_snderror = wxSOUND_INVDEV;
-      return false;
-    }
-
-    m_output_frag_out  = WXSOUND_MAX_QUEUE-1;
-    m_current_frag_out = 0;
-
-    m_internal->m_output_enabled = true;
-  }
-  // -----------------------------------
-  // Open the driver for Input operation
-  // -----------------------------------
-  if (mode & wxSOUND_INPUT) {
-    MMRESULT result;
-
-    result = waveInOpen(&m_internal->m_devin,
-                        WAVE_MAPPER, &wformat,
-                        (DWORD)m_internal->m_sndWin, 0,
-                        CALLBACK_WINDOW);
-
-    if (result != MMSYSERR_NOERROR) {
-      m_snderror = wxSOUND_INVDEV;
-      return false;
-    }
-
-    m_current_frag_in = WXSOUND_MAX_QUEUE-1;
-    m_input_frag_in   = 0;
-
-    m_internal->m_input_enabled = true;
-  }
-
-  if (mode & wxSOUND_OUTPUT) {
-    if (!AllocHeaders(wxSOUND_OUTPUT)) {
-      CloseDevice();
-      return false;
-    }
-  }
-  if (mode & wxSOUND_INPUT) {
-    if (!AllocHeaders(wxSOUND_INPUT)) {
-      CloseDevice();
-      return false;
-    }
-  }
-
-  return true;
-}
-
-// -------------------------------------------------------------------------
-// CloseDevice() closes the driver handles and frees memory allocated for
-// IO queues.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::CloseDevice()
-{
-  if (m_internal->m_output_enabled) {
-    FreeHeaders(wxSOUND_OUTPUT);
-    m_internal->m_output_enabled = false;
-    waveOutClose(m_internal->m_devout);
-  }
-
-  if (m_internal->m_input_enabled) {
-    FreeHeaders(wxSOUND_INPUT);
-    m_internal->m_input_enabled  = false;
-    waveInClose(m_internal->m_devin);
-  }
-}
-
-// -------------------------------------------------------------------------
-// AllocHeader(int mode)
-//
-// mode has the same mean as in OpenDevice() except that here the two flags
-// must be exclusive.
-// AllocHeader() initializes an element of an operation (this can be input
-// or output). It means it allocates the sound header's memory block 
-// and "prepares" it (It is needed by Windows). At the same time, it sets
-// private datas so we can the header's owner (See callback).
-//
-// It returns the new allocated block or NULL.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
-{
-  wxSoundInfoHeader *info;
-  WAVEHDR *header;
-
-  // Some memory allocation
-  info = new wxSoundInfoHeader;
-  info->m_h_data   = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, GetBestSize());
-  info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
-  if (!info->m_h_data || !info->m_h_header) {
-    delete info;
-    m_snderror = wxSOUND_MEMERROR;
-    return NULL;
-  }
-
-  // Get the two pointers from the system
-  info->m_data      = (char *)GlobalLock(info->m_h_data);
-  info->m_header    = (WAVEHDR *)GlobalLock(info->m_h_header);
-  // Set the header's mode
-  info->m_mode      = mode;
-  // Set the parent of the header
-  info->m_driver    = this;
-  // Clean it up
-  ClearHeader(info);
-
-  header            = info->m_header;
-  // Initialize Windows variables
-  header->lpData         = info->m_data;
-  header->dwBufferLength = GetBestSize();
-  header->dwUser         = (DWORD)info;
-  header->dwFlags        = WHDR_DONE;
-
-  // "Prepare" the header
-  if (mode == wxSOUND_INPUT) {
-    MMRESULT result;
-
-    result  = waveInPrepareHeader(m_internal->m_devin, header,
-                                  sizeof(WAVEHDR));
-
-    if (result != MMSYSERR_NOERROR) {
-      // If something goes wrong, free everything.
-      GlobalUnlock(info->m_data);
-      GlobalUnlock(info->m_header);
-      GlobalFree(info->m_h_data);
-      GlobalFree(info->m_h_header);
-      delete info;
-
-      m_snderror = wxSOUND_IOERROR;
-      return NULL;
-    }
-  } else if (mode == wxSOUND_OUTPUT) {
-    MMRESULT result;
-
-    result  = waveOutPrepareHeader(m_internal->m_devout, header,
-                                   sizeof(WAVEHDR));
-
-    if (result != MMSYSERR_NOERROR) {
-      // If something goes wrong, free everything.
-      GlobalUnlock(info->m_data);
-      GlobalUnlock(info->m_header);
-      GlobalFree(info->m_h_data);
-      GlobalFree(info->m_h_header);
-      delete info;
-
-      m_snderror = wxSOUND_IOERROR;
-      return NULL;
-    }
-  }
-  return info;
-}
-
-// -------------------------------------------------------------------------
-// AllocHeaders(int mode)
-//
-// "mode" has the same mean as for OpenDevice() except that the two flags must
-// be exclusive.
-// AllocHeaders() allocates WXSOUND_MAX_QUEUE (= 128) blocks for an operation
-// queue. It uses AllocHeader() for each element.
-//
-// Once it has allocated all blocks, it returns true and if an error occurred
-// it returns false.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::AllocHeaders(int mode)
-{
-  int i;
-  wxSoundInfoHeader **headers;
-
-  if (mode == wxSOUND_OUTPUT)
-    headers = m_headers_play = new wxSoundInfoHeader *[WXSOUND_MAX_QUEUE];
-  else
-    headers = m_headers_rec = new wxSoundInfoHeader *[WXSOUND_MAX_QUEUE];
-
-  memset(headers, 0, WXSOUND_MAX_QUEUE*sizeof(wxSoundInfoHeader *));
-
-  for (i=0;i<WXSOUND_MAX_QUEUE;i++) {
-    headers[i] = AllocHeader(mode);
-    if (!headers[i]) {
-      FreeHeaders(mode);
-      return false;
-    }
-  }
-  return true;
-}
-
-// -------------------------------------------------------------------------
-// FreeHeader(int mode)
-//
-// "mode" has the same mean as for OpenDevice() except that the two flags must
-// be exclusive.
-// FreeHeader() frees a memory block and "unprepares" it.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::FreeHeader(wxSoundInfoHeader *header, int mode)
-{
-  if (mode == wxSOUND_OUTPUT)
-    waveOutUnprepareHeader(m_internal->m_devout, header->m_header, sizeof(WAVEHDR));
-  else
-    waveInUnprepareHeader(m_internal->m_devin, header->m_header, sizeof(WAVEHDR));
-
-  GlobalUnlock(header->m_data);
-  GlobalUnlock(header->m_header);
-  GlobalFree(header->m_h_header);
-  GlobalFree(header->m_h_data);
-  delete header;
-}
-
-// -------------------------------------------------------------------------
-// FreeHeaders(int mode)
-//
-// "mode" has the same mean as for OpenDevice() except that the two flags must
-// be exclusive.
-// FreeHeaders() frees all an operation queue once it has checked that
-// all buffers have been terminated.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::FreeHeaders(int mode)
-{
-  int i;
-  wxSoundInfoHeader ***headers;
-
-  if (mode == wxSOUND_OUTPUT)
-    headers = &m_headers_play;
-  else
-    headers = &m_headers_rec;
-
-  for (i=0;i<WXSOUND_MAX_QUEUE;i++) {
-    if ((*headers)[i]) {
-      // We wait for the end of the buffer
-      WaitFor((*headers)[i]);
-      // Then, we free the header
-      FreeHeader((*headers)[i], mode);
-    }
-  }
-  delete[] (*headers);
-  (*headers) = NULL;
-}
-
-// -------------------------------------------------------------------------
-// WaitFor(wxSoundInfoHeader *info)
-//
-// "info" is one element of an IO queue
-// WaitFor() checks whether the specified block has been terminated.
-// If it hasn't been terminated, it waits for its termination.
-//
-// NB: if it's a partially filled buffer it adds it to the Windows queue
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::WaitFor(wxSoundInfoHeader *info)
-{
-    // If the buffer is finished, we return immediately
-    if (!info->m_playing) {
-        
-        // We begun filling it: we must send it to the Windows queue
-        if (info->m_position != 0) {
-            memset(info->m_data + info->m_position, 0, info->m_size);
-            AddToQueue(info);
-        }
-    }
-    
-    if (m_waiting_for) {
-        // PROBLEM //
-        return;
-    }
-    m_waiting_for = true;
-    // Else, we wait for its termination
-    while (info->m_playing || info->m_recording)
-      wxYield();
-    m_waiting_for = false;
-}
-
-// -------------------------------------------------------------------------
-// AddToQueue(wxSoundInfoHeader *info)
-//
-// For "info", see WaitFor()
-// AddToQueue() sends the IO queue element to the Windows queue.
-//
-// Warning: in the current implementation, it partially assume we send the
-// element in the right order. This is true in that implementation but if
-// you use it elsewhere, be careful: it may shuffle all your sound datas.
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::AddToQueue(wxSoundInfoHeader *info)
-{
-    MMRESULT result;
-    
-    if (info->m_mode == wxSOUND_INPUT) {
-        // Increment the input fragment pointer
-        result = waveInAddBuffer(m_internal->m_devin,
-                                 info->m_header, sizeof(WAVEHDR));
-        if (result == MMSYSERR_NOERROR)
-            info->m_recording = true;
-        else
-            return false;
-    } else if (info->m_mode == wxSOUND_OUTPUT) {
-        result = waveOutWrite(m_internal->m_devout,
-                              info->m_header, sizeof(WAVEHDR));
-        if (result == MMSYSERR_NOERROR)
-      info->m_playing = true;
-        else
-            return false;
-    }
-    return true;
-}
-
-// -------------------------------------------------------------------------
-// ClearHeader(wxSoundInfoHeader *info)
-//
-// ClearHeader() reinitializes the parameters of "info" to their default
-// value.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::ClearHeader(wxSoundInfoHeader *info)
-{
-  info->m_playing   = false;
-  info->m_recording = false;
-  info->m_position  = 0;
-  info->m_size      = GetBestSize();
-}
-
-// -------------------------------------------------------------------------
-// wxSoundInfoHeader *NextFragmentOutput()
-//
-// NextFragmentOutput() looks for a free output block. It will always
-// return you a non-NULL pointer but it may waits for an empty buffer a long
-// time.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::NextFragmentOutput()
-{
-  if (m_headers_play[m_current_frag_out]->m_playing) {
-    m_current_frag_out = (m_current_frag_out + 1) % WXSOUND_MAX_QUEUE;
-
-    if (m_headers_play[m_current_frag_out]->m_playing)
-      WaitFor(m_headers_play[m_current_frag_out]);
-  }
-  if (m_current_frag_out == m_output_frag_out)
-    m_queue_filled = true;
-  return m_headers_play[m_current_frag_out];
-}
-
-// -------------------------------------------------------------------------
-// The behaviour of Write is documented in the global documentation.
-// -------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamWin::Write(const void *buffer, wxUint32 len)
-{
-    m_lastcount = 0;
-    if (!m_internal->m_output_enabled) {
-        m_snderror = wxSOUND_NOTSTARTED;
-        return *this;
-    }
-    
-
-    while (len > 0) {
-        wxSoundInfoHeader *header;
-        wxUint32 to_copy;
-        
-        // Get a new output fragment
-        header              = NextFragmentOutput();
-        
-        to_copy             = (len > header->m_size) ? header->m_size : len;
-        memcpy(header->m_data + header->m_position, buffer, to_copy);
-        
-        header->m_position += to_copy;
-        header->m_size     -= to_copy;
-        buffer              = (((const char *)buffer) + to_copy);
-        len                -= to_copy;
-        m_lastcount        += to_copy;
-        
-        // If the fragment is full, we send it to the Windows queue.
-        if (header->m_size == 0)
-            if (!AddToQueue(header)) {
-                m_snderror = wxSOUND_IOERROR;
-                return *this;
-            }
-    }
-    return *this;
-}
-
-// -------------------------------------------------------------------------
-// NextFragmentInput is not functional.
-// -------------------------------------------------------------------------
-wxSoundInfoHeader *wxSoundStreamWin::NextFragmentInput()
-{
-    wxSoundInfoHeader *header;
-
-    // Queue pointer: reader
-    m_current_frag_in = (m_current_frag_in + 1) % WXSOUND_MAX_QUEUE;
-    
-    header = m_headers_rec[m_current_frag_in];
-    // If the current buffer is in recording mode, we must wait for its
-    // completion.
-    if (header->m_recording)
-        WaitFor(header);
-
-    // We reached the writer position: the queue is full.
-    if (m_current_frag_in == m_input_frag_in)
-        m_queue_filled = true;
-    
-    return header;
-}
-
-// -------------------------------------------------------------------------
-// The behaviour of Read is documented in the global documentation.
-// -------------------------------------------------------------------------
-wxSoundStream& wxSoundStreamWin::Read(void *buffer, wxUint32 len)
-{
-    wxSoundInfoHeader *header;
-    wxUint32 to_copy;
-    
-    m_lastcount = 0;
-    if (!m_internal->m_input_enabled)
-        return *this;
-    
-    while (len > 0) {
-        header = NextFragmentInput();
-        
-        to_copy             = (len > header->m_size) ? header->m_size : len;
-        memcpy(buffer, header->m_data + header->m_position, to_copy);
-        
-        header->m_position += to_copy;
-        header->m_size     -= to_copy;
-        buffer              = (((char *)buffer) + to_copy);
-        len                -= to_copy;
-        m_lastcount        += to_copy;
-        
-        if (header->m_size == 0) {
-            ClearHeader(header);
-            if (!AddToQueue(header)) {
-                m_snderror = wxSOUND_IOERROR;
-                return *this;
-            }
-        }
-    }
-    return *this;
-}
-
-// -------------------------------------------------------------------------
-// NotifyDoneBuffer(wxUint32 dev_handle)
-//
-// NotifyDoneBuffer() is called by wxSoundHandlerProc each time a sound
-// fragment finished. It reinitializes the parameters of the fragment and
-// sends an event to the clients.
-// -------------------------------------------------------------------------
-void wxSoundStreamWin::NotifyDoneBuffer(wxUint32 WXUNUSED(dev_handle), int flag)
-{
-    wxSoundInfoHeader *info;
-    
-    if (flag == wxSOUND_OUTPUT) {
-        if (!m_internal->m_output_enabled)
-            return;
-
-        // Queue pointer: reader
-        m_output_frag_out = (m_output_frag_out + 1) % WXSOUND_MAX_QUEUE;
-        info = m_headers_play[m_output_frag_out];
-        // Clear header to tell the system the buffer is free now
-        ClearHeader(info);
-        m_queue_filled = false;
-        if (!m_waiting_for)
-            // Try to requeue a new buffer.
-            OnSoundEvent(wxSOUND_OUTPUT);
-    } else {
-        if (!m_internal->m_input_enabled)
-            return;
-
-        // Recording completed
-        m_headers_rec[m_input_frag_in]->m_recording = false;
-        // Queue pointer: writer
-        m_input_frag_in = (m_input_frag_in + 1) % WXSOUND_MAX_QUEUE;
-        if (!m_waiting_for)
-            OnSoundEvent(wxSOUND_INPUT);
-        m_queue_filled = false;
-    }
-}
-
-// -------------------------------------------------------------------------
-// SetSoundFormat()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::SetSoundFormat(const wxSoundFormatBase& base)
-{
-  // TODO: detect best format
-  return wxSoundStream::SetSoundFormat(base);
-}
-
-// -------------------------------------------------------------------------
-// StartProduction()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::StartProduction(int evt)
-{
-  if (!m_internal)
-    return false;
-
-  if ((m_internal->m_output_enabled && (evt & wxSOUND_OUTPUT)) ||
-      (m_internal->m_input_enabled && (evt & wxSOUND_INPUT)))
-    CloseDevice();
-
-  if (!OpenDevice(evt))
-    return false;
-
-  m_production_started = true;
-  m_queue_filled = false;
-  // Send a dummy event to start.
-  if (evt & wxSOUND_OUTPUT)
-    OnSoundEvent(wxSOUND_OUTPUT);
-
-  if (evt & wxSOUND_INPUT) {
-    int i;
-    for (i=0;i<WXSOUND_MAX_QUEUE;i++)
-      AddToQueue(m_headers_rec[i]);
-
-    waveInStart(m_internal->m_devin);
-  }
-
-  return true;
-}
-
-// -------------------------------------------------------------------------
-// StopProduction()
-// ------------------------------------------------------------------------
-bool wxSoundStreamWin::StopProduction()
-{
-    if (!m_production_started) {
-        m_snderror = wxSOUND_NOTSTARTED;
-        return false;
-    }
-    
-    m_snderror = wxSOUND_NOERROR;
-    m_production_started = false;
-    CloseDevice();
-    return true;
-}
-
-// -------------------------------------------------------------------------
-// QueueFilled()
-// -------------------------------------------------------------------------
-bool wxSoundStreamWin::QueueFilled() const
-{
-  return (!m_production_started || m_queue_filled);
-}
-
-
-// --------------------------------------------------------------------------
-// wxSoundWinModule
-// --------------------------------------------------------------------------
-
-class wxSoundWinModule : public wxModule {
-   DECLARE_DYNAMIC_CLASS(wxSoundWinModule)
- public:
-   bool OnInit();
-   void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxSoundWinModule, wxModule)
-
-bool wxSoundWinModule::OnInit() {
-  wxSoundHandleList = new wxList(wxKEY_INTEGER);
-  return true;
-}
-
-void wxSoundWinModule::OnExit() {
-  delete wxSoundHandleList;
-}
-
-#endif
-  // __WINDOWS__
diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
deleted file mode 100644
index 00ff2dcc95..0000000000
--- a/contrib/src/mmedia/vidbase.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name:       vidbdrv.cpp
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// License:    wxWindows license
-////////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-#include "wx/intl.h"
-#endif
-
-#include "wx/mmedia/vidbase.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxVideoBaseDriver, wxObject)
-
-///
-wxVideoBaseDriver::wxVideoBaseDriver()
-{
-  m_video_output = NULL;
-}
-
-wxVideoBaseDriver::wxVideoBaseDriver(wxInputStream& WXUNUSED(str))
-{
-  m_video_output = NULL;
-}
-
-wxVideoBaseDriver::wxVideoBaseDriver(const wxString& WXUNUSED(filename))
-{
-  m_video_output = NULL;
-}
-
-wxVideoBaseDriver::~wxVideoBaseDriver()
-{
-}
-
-bool wxVideoBaseDriver::AttachOutput(wxWindow& output)
-{
-  m_video_output = &output;
-  return true;
-}
-
-void wxVideoBaseDriver::DetachOutput()
-{
-  m_video_output = NULL;
-}
-
-// Use an external frame for video output
-
-wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv)
-{
-  wxFrame *frame = new wxFrame(NULL, wxID_ANY, _("Video Output"), wxDefaultPosition, wxSize(100, 100));
-  wxWindow *vid_out = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(300, 300));
-
-  frame->Layout();
-  frame->Show(true);
-
-  vid_drv->AttachOutput(*vid_out);
-  vid_drv->Play();
-
-  return frame;
-}
diff --git a/contrib/src/mmedia/vidwin.cpp b/contrib/src/mmedia/vidwin.cpp
deleted file mode 100644
index 1c951ee22f..0000000000
--- a/contrib/src/mmedia/vidwin.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// -----------------------------------------------------------------------------
-// Name:       vidwin.h
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    February 1998
-// Updated:
-// Copyright:  (C) 1998, 1999, 2000 Guilhem Lavaux
-// License:    wxWindows license
-// -----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
-// versions of Open Watcom and MinGW tested against this source does not
-// deliver "digitalv.h" required in this feature
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/stream.h"
-#include "wx/wfstream.h"
-
-#define WXMMEDIA_INTERNAL
-#include <windows.h>
-#include <mmsystem.h>
-#include <digitalv.h>
-#include "wx/mmedia/vidwin.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxVideoWindows, wxVideoBaseDriver)
-
-wxVideoWindows::wxVideoWindows()
-{
-}
-
-wxVideoWindows::wxVideoWindows(wxInputStream& str)
-  : wxVideoBaseDriver(str)
-{
-    m_internal    = new wxVIDWinternal;
-    m_remove_file = true;
-    m_filename    = wxGetTempFileName(_T("wxvid"));
-    m_paused      = false;
-    m_stopped     = true;
-    m_frameRate   = 1.0;
-    
-    wxFileOutputStream temp_file(m_filename);
-    temp_file << str;
-
-    OpenFile();
-}
-
-wxVideoWindows::wxVideoWindows(const wxString& filename)
-  : wxVideoBaseDriver(filename)
-{
-    m_internal    = new wxVIDWinternal;
-    m_remove_file = false;
-    m_filename    = filename;
-    m_paused      = false;
-    m_stopped     = true;
-    m_frameRate   = 1.0;
-    OpenFile();
-}
-
-wxVideoWindows::~wxVideoWindows(void)
-{
-    mciSendCommand(m_internal->m_dev_id, MCI_CLOSE, 0, 0);
-
-    if (m_internal)
-        delete m_internal;
-}
-
-void wxVideoWindows::OpenFile()
-{
-    MCI_DGV_OPEN_PARMS openStruct;
-    MCI_DGV_SET_PARMS setStruct;
-    MCI_STATUS_PARMS statusStruct;
-
-    openStruct.lpstrDeviceType = _T("avivideo");
-    openStruct.lpstrElementName = (wxChar *)m_filename.c_str();
-    openStruct.hWndParent = 0;
-    
-    mciSendCommand(0, MCI_OPEN,
-             MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
-                         (DWORD)(LPVOID)&openStruct);
-    m_internal->m_dev_id = openStruct.wDeviceID;
-
-
-    setStruct.dwCallback = 0;
-    setStruct.dwTimeFormat = MCI_FORMAT_FRAMES;
-
-    mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
-                         (DWORD)(LPVOID)&setStruct);
-
-
-    statusStruct.dwCallback = 0;
-    statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE;
-    mciSendCommand(m_internal->m_dev_id, MCI_STATUS,
-                         MCI_STATUS_ITEM,
-                         (DWORD)(LPVOID)&statusStruct);
-
-    m_frameRate = ((double)statusStruct.dwReturn) / 1000;
-
-    statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE;
-    mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM,
-                         (DWORD)(LPVOID)&statusStruct);
-    m_bps = statusStruct.dwReturn;
-
-}
-
-bool wxVideoWindows::Pause()
-{
-    if (m_paused || m_stopped)
-        return true;
-    m_paused = true;
-    return (mciSendCommand(m_internal->m_dev_id, MCI_PAUSE, MCI_WAIT, 0) == 0);
-}
-
-bool wxVideoWindows::Resume()
-{
-    if (!m_paused || m_stopped)
-        return true;
-    m_paused = false;
-    return (mciSendCommand(m_internal->m_dev_id, MCI_RESUME, 0, 0) == 0);
-}
-
-bool wxVideoWindows::IsPaused() const
-{
-    return m_paused;
-}
-
-bool wxVideoWindows::IsStopped() const
-{
-    return m_stopped;
-}
-
-bool wxVideoWindows::GetSize(wxSize& size) const
-{
-    size.SetWidth(200);
-    size.SetHeight(200);
-    return true;
-}
-
-bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))
-{
-    return true;
-}
-
-bool wxVideoWindows::IsCapable(wxVideoType v_type) const
-{
-    return (v_type == wxVIDEO_MSAVI);
-}
-
-bool wxVideoWindows::AttachOutput(wxWindow& output)
-{
-    MCI_DGV_WINDOW_PARMS win_struct;
-    
-    if (!wxVideoBaseDriver::AttachOutput(output))
-        return false;
-    
-    win_struct.hWnd = (HWND)output.GetHWND();
-    mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
-           MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
-    return true;
-}
-
-void wxVideoWindows::DetachOutput()
-{
-    MCI_DGV_WINDOW_PARMS win_struct;
-
-    wxVideoBaseDriver::DetachOutput();
-    
-    win_struct.hWnd = 0;
-    mciSendCommand(m_internal->m_dev_id, MCI_WINDOW,
-           MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&win_struct);
-}
-
-bool wxVideoWindows::Play()
-{
-    if (!m_stopped)
-        return false;
-    m_stopped = false;
-    return (mciSendCommand(m_internal->m_dev_id, MCI_PLAY, 0, NULL) == 0);
-}
-
-bool wxVideoWindows::Stop()
-{
-    MCI_SEEK_PARMS seekStruct;
-
-    if (m_stopped)
-        return false;
-    m_stopped = true;
-    if (::mciSendCommand(m_internal->m_dev_id, MCI_STOP, MCI_WAIT, NULL) != 0)
-      return false;
-
-    seekStruct.dwCallback = 0;
-    seekStruct.dwTo = 0;
-    return (::mciSendCommand(m_internal->m_dev_id, MCI_SEEK, MCI_SEEK_TO_START|MCI_WAIT, (DWORD)(LPVOID)&seekStruct) == 0);
-}
-
-// TODO TODO
-// I hate windows :-(. The doc says MCI_STATUS should return all info I want but when I call it
-// it returns to me with an UNSUPPORTED_FUNCTION error. I will have to do all by myself. Grrrr !
-
-wxString wxVideoWindows::GetMovieCodec() const
-{
-    return wxT("No info");
-}
-
-wxString wxVideoWindows::GetAudioCodec() const
-{
-    return wxT("No info");
-}
-
-wxUint32 wxVideoWindows::GetSampleRate() const
-{
-    return 22500;
-}
-
-wxUint8 wxVideoWindows::GetChannels() const
-{
-    return 1;
-}
-
-wxUint8 wxVideoWindows::GetBPS() const
-{
-    return m_bps;
-}
-
-double wxVideoWindows::GetFrameRate() const
-{
-    return m_frameRate;
-}
-
-wxUint32 wxVideoWindows::GetNbFrames() const
-{
-    return 0;
-}
-
-#endif
-   // __WINDOWS__
diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp
deleted file mode 100644
index 9dd6965577..0000000000
--- a/contrib/src/mmedia/vidxanm.cpp
+++ /dev/null
@@ -1,511 +0,0 @@
-// -------------------------------------------------------------------------
-// Name:       vidxanm.cpp
-// Purpose:    wxMMedia
-// Author:     Guilhem Lavaux
-// Created:    1997
-// Updated:    1998
-// Copyright:  (C) 1997, 1998, 1999 Guilhem Lavaux
-// License:    wxWindows license
-// -------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#ifdef __WXGTK__
-// Pizza !
-#include "wx/gtk/win_gtk.h"
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-#ifdef __WXGTK__
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#endif
-
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-#include "wx/datstrm.h"
-#include "wx/tokenzr.h"
-
-#define WXMMEDIA_INTERNAL
-#include "wx/mmedia/vidbase.h"
-#include "wx/mmedia/vidxanm.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxVideoXANIM, wxVideoBaseDriver)
-
-// -------------------------------------------------------------------------
-// End process detector
-
-class wxVideoXANIMProcess: public wxProcess {
-public:
-    wxVideoXANIMProcess(wxVideoXANIM *xanim);
-
-    void OnTerminate(int pid, int status);
-
-protected:
-    wxVideoXANIM *m_vid_xanim;
-};
-
-class wxVideoXANIMOutput: public wxProcess {
-public:
-    wxVideoXANIMOutput();
-
-    void OnTerminate(int pid, int status);
-    
-    bool IsTerminated() const;
-protected:
-    bool m_terminated;
-};
-
-// -------------------------------------------------------------------------
-// XAnim video driver (process handling implementation)
-
-wxVideoXANIMProcess::wxVideoXANIMProcess(wxVideoXANIM *xanim)
-{
-    m_vid_xanim = xanim;
-}
-
-void wxVideoXANIMProcess::OnTerminate(int WXUNUSED(pid), int WXUNUSED(status))
-{
-    m_vid_xanim->m_xanim_started = false;
-    m_vid_xanim->OnFinished();
-}
-
-wxVideoXANIMOutput::wxVideoXANIMOutput()
-        : wxProcess(NULL, wxID_ANY)
-{
-    m_terminated = false;
-    Redirect();
-}
-
-bool wxVideoXANIMOutput::IsTerminated() const
-{
-    return m_terminated;
-}
-
-void wxVideoXANIMOutput::OnTerminate(int pid, int status)
-{
-    m_terminated = true;
-}
-
-// -------------------------------------------------------------------------
-// XAnim video driver (implementation)
-
-wxVideoXANIM::wxVideoXANIM()
- : wxVideoBaseDriver()
-{
-    m_internal       = new wxXANIMinternal;
-    m_xanim_detector = new wxVideoXANIMProcess(this);
-    m_xanim_started  = false;
-    m_paused         = false;
-    m_filename       = wxEmptyString;
-    m_remove_file    = false;
-}
-
-wxVideoXANIM::wxVideoXANIM(wxInputStream& str)
-  : wxVideoBaseDriver(str)
-{
-    m_internal       = new wxXANIMinternal;
-    m_xanim_detector = new wxVideoXANIMProcess(this);
-    m_xanim_started  = false;
-    m_paused         = false;
-    m_size[0]        = 0;
-    m_size[1]        = 0;
-    
-    m_filename       = wxGetTempFileName(_T("vidxa"));
-    m_remove_file    = true;
-    wxFileOutputStream fout(m_filename);
-    
-    fout << str;
-
-    CollectInfo();
-}
-
-wxVideoXANIM::wxVideoXANIM(const wxString& filename)
-{
-    m_internal       = new wxXANIMinternal;
-    m_xanim_detector = new wxVideoXANIMProcess(this);
-    m_xanim_started  = false;
-    m_paused         = false;
-
-    m_filename       = filename;
-    m_remove_file    = false;
-    m_size[0]        = 0;
-    m_size[1]        = 0;
-    
-    CollectInfo();
-}
-
-wxVideoXANIM::~wxVideoXANIM()
-{
-    if (m_xanim_started)
-        Stop();
-    delete m_internal;
-    delete m_xanim_detector;
-    
-    if (m_remove_file)
-        wxRemoveFile(m_filename);
-}
-
-// -------------------------------------------------------------------------
-// Movie controller
-
-bool wxVideoXANIM::Play()
-{
-    if (!m_paused && m_xanim_started)
-        return true; 
-    if (!m_video_output) {
-        wxVideoCreateFrame(this);
-        return true;
-    }
-
-    // The movie starts with xanim
-    if (RestartXANIM()) {
-        m_paused = false;
-        return true;
-    }
-    return false;
-}
-
-bool wxVideoXANIM::Pause()
-{
-    if (!m_paused && SendCommand(" ")) {
-        m_paused = true;
-        return true;
-    }
-    return false;
-}
-
-bool wxVideoXANIM::Resume()
-{
-    if (m_paused && SendCommand(" ")) {
-        m_paused = false;
-        return true;
-    }
-    return false;
-}
-
-bool wxVideoXANIM::Stop()
-{
-    if (!m_xanim_started)
-        return false;
-
-    SendCommand("q");
-
-    // We are waiting for the termination of the subprocess.
-    while (m_xanim_started) { 
-      wxYield();
-    }
-
-    m_paused = false;
-    
-    return true;
-}
-
-// -------------------------------------------------------------------------
-// Movie size controller
-
-bool wxVideoXANIM::SetSize(wxSize size)
-{
-    if (!m_video_output)
-      return false;
-
-    m_video_output->SetSize(size.GetWidth(), size.GetHeight());
-    return false;
-}
-
-bool wxVideoXANIM::GetSize(wxSize& size) const
-{
-    if (m_size[0] == 0)
-        return false;
-    size.Set(m_size[0], m_size[1]);
-    return true;
-}
-
-// -------------------------------------------------------------------------
-// Capabilities of XAnim
-
-bool wxVideoXANIM::IsCapable(wxVideoType v_type) const
-{
-    if (v_type == wxVIDEO_MSAVI || v_type == wxVIDEO_MPEG ||
-        v_type == wxVIDEO_QT || v_type == wxVIDEO_GIF || v_type == wxVIDEO_JMOV ||
-        v_type == wxVIDEO_FLI || v_type == wxVIDEO_IFF || v_type == wxVIDEO_SGI)
-        return true;
-    else
-        return false;
-}
-
-// -------------------------------------------------------------------------
-// Movie state
-
-wxString wxVideoXANIM::GetMovieCodec() const
-{
-    if (m_size[0] == 0)
-        return wxT("");
-    return m_movieCodec;
-}
-
-wxString wxVideoXANIM::GetAudioCodec() const
-{
-    if (m_size[0] == 0)
-        return wxT("");
-    return m_audioCodec;
-}
-
-wxUint32 wxVideoXANIM::GetSampleRate() const
-{
-    if (m_size[0] == 0)
-        return 0;
-    return m_sampleRate;
-}
-
-wxUint8 wxVideoXANIM::GetChannels() const
-{
-    if (m_size[0] == 0)
-        return 0;
-    return m_channels;
-}
-
-wxUint8 wxVideoXANIM::GetBPS() const
-{
-    if (m_size[0] == 0)
-        return 0;
-    return m_bps;
-}
-
-double wxVideoXANIM::GetFrameRate() const
-{
-    if (m_size[0] == 0)
-        return 0.0;
-    return m_frameRate;
-}
-
-wxUint32 wxVideoXANIM::GetNbFrames() const
-{
-    if (m_size[0] == 0)
-        return 0;
-    return m_frames;
-}
-
-
-bool wxVideoXANIM::IsPaused() const
-{
-    return m_paused;
-}
-
-bool wxVideoXANIM::IsStopped() const
-{
-    return !m_xanim_started;
-}
-
-// -------------------------------------------------------------------------
-// Output management
-
-bool wxVideoXANIM::AttachOutput(wxWindow& out)
-{
-    if (!wxVideoBaseDriver::AttachOutput(out))
-        return false;
-    
-    return true;
-}
-
-void wxVideoXANIM::DetachOutput()
-{
-    SendCommand("q");
-    m_xanim_started = false;
-    m_paused = false;
-
-    wxVideoBaseDriver::DetachOutput();
-}
-
-// -------------------------------------------------------------------------
-// Lowlevel XAnim controller
-
-bool wxVideoXANIM::SendCommand(const char *command, char **ret,
-                   wxUint32 *size)
-{
-    if (!m_xanim_started)
-        if (!RestartXANIM())
-        return false;
-
-    // Send a command to XAnim through X11 Property
-    XChangeProperty(m_internal->xanim_dpy, m_internal->xanim_window,
-            m_internal->xanim_atom,
-            XA_STRING, 8, PropModeReplace, (unsigned char *)command,
-            strlen(command));
-    XFlush(m_internal->xanim_dpy);
-    if (ret) {
-        int prop_format;
-    Atom prop_type;
-    unsigned long extra;
-
-    XGetWindowProperty(m_internal->xanim_dpy, m_internal->xanim_window,
-               m_internal->xanim_ret, 0, 16, True, AnyPropertyType,
-               &prop_type, &prop_format, (unsigned long *)size,
-               &extra, (unsigned char **)ret);
-    }
-    return true;
-}
-
-bool wxVideoXANIM::CollectInfo()
-{
-    wxVideoXANIMOutput *xanimProcess;
-    wxString xanim_command;
-    wxStringTokenizer tokenizer;
-    
-    xanimProcess = new wxVideoXANIMOutput;
-    xanim_command = wxT("xanim +v +Zv -Ae ");
-    xanim_command += m_filename;
-    if (!wxExecute(xanim_command, false, xanimProcess))
-        return false;
-
-    wxInputStream *infoStream = xanimProcess->GetInputStream();
-    wxString totalOutput;
-        
-    while (infoStream->GetLastError() == wxSTREAM_NO_ERROR) {
-        char line[100];
-
-        infoStream->Read(line, sizeof(line)-1);
-        if (infoStream->LastRead() == 0)
-            break;
-        
-        line[infoStream->LastRead()] = 0;
-       
-        totalOutput += wxString::FromAscii(line); 
-    }
-
-    // This is good for everything ... :-)
-    int position = totalOutput.Find(wxT("Video Codec:"));
-    
-    totalOutput.Remove(0, position+13);
-
-    position = totalOutput.Find(wxT("depth="));
-    m_movieCodec = totalOutput(0, position);
-
-    totalOutput.Remove(0, position);
-    tokenizer.SetString(totalOutput, wxT("\n\r"));
-
-    // the rest of the line
-    wxString token = tokenizer.GetNextToken();
-    unsigned long my_long;
-    
-#define GETINT(i) \
-totalOutput.ToULong(&my_long); \
-i = my_long;
-    
-    // 'Audio Codec:'
-    totalOutput = tokenizer.GetString();
-    totalOutput.Remove(0, totalOutput.Find(wxT(":"))+2);
-
-    position = totalOutput.Find(wxT("Rate"));
-    m_audioCodec = totalOutput(0, position-1);
-
-    // 'Rate='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    GETINT(m_sampleRate);
-    // 'Chans='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    GETINT(m_channels);
-    // 'Bps='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    GETINT(m_bps);
-    // 'Frame Stats:'
-    tokenizer.Reinit(totalOutput);
-    tokenizer.GetNextToken();
-    totalOutput = tokenizer.GetString();
-    totalOutput.Remove(0, totalOutput.Find(wxT(":"))+2);
-    // 'Size='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    GETINT(m_size[0]);
-    // 'x'
-    totalOutput.Remove(0,1);
-    GETINT(m_size[1]);
-    // 'Frames='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    GETINT(m_frames);
-    // 'avfps='
-    totalOutput.Remove(0, totalOutput.Find(wxT("="))+1);
-    totalOutput.ToDouble(&m_frameRate);
-
-    // We wait for the conclusion
-    while (!xanimProcess->IsTerminated())
-        wxYield();
-
-    delete xanimProcess;
-
-    return true;
-}
-
-bool wxVideoXANIM::RestartXANIM()
-{
-    wxString xanim_command;
-    int ret;
-    Atom prop_type;
-    int prop_format;
-    unsigned long nitems;
-    unsigned long extra;
-    char prop[4];
-    bool xanim_chg_size;
-    
-    if (!m_video_output || m_xanim_started)
-        return false;
-    
-    // Check if we can change the size of the window dynamicly
-    xanim_chg_size = true;
-    // Get current display
-#ifdef __WXGTK__
-    m_internal->xanim_dpy = gdk_display;
-    GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow );
-    GdkWindow *window = pizza->bin_window;
-    
-    m_internal->xanim_window = GDK_WINDOW_XWINDOW(window);
-#endif
-    // Get the XANIM atom
-    m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,
-                     "XANIM_PROPERTY", False);
-    
-    // Build the command
-    xanim_command.Printf(
-        wxT("xanim -Zr +Ze +Sr +f +W%d +f +q +Av70 %s %s"),
-        (int)m_internal->xanim_window,
-        (xanim_chg_size) ? _T("") : _T(""),   // ??? why ???
-        WXSTRINGCAST m_filename);
-    
-        // Execute it
-    if (!wxExecute(xanim_command, false, m_xanim_detector))
-        return false;
-    
-    // Wait for XAnim to be ready
-    nitems = 0;
-    m_xanim_started = true;
-    while (nitems == 0 && m_xanim_started) {
-      ret = XGetWindowProperty(m_internal->xanim_dpy, m_internal->xanim_window,
-                   m_internal->xanim_atom,
-                   0, 4, False, AnyPropertyType, &prop_type,
-                   &prop_format, &nitems, &extra,
-                   (unsigned char **)&prop);
-      wxYield();
-    }
-
-    wxSize vibrato_size;
-    
-    vibrato_size = m_video_output->GetSize();
-    
-    vibrato_size.SetWidth(vibrato_size.GetWidth()+1);
-    m_video_output->SetSize(vibrato_size);
-    vibrato_size.SetWidth(vibrato_size.GetWidth()-1);
-    m_video_output->SetSize(vibrato_size);
-    // Very useful ! Actually it "should" sends a SETSIZE event to XAnim
-    // FIXME: This event is not sent !!
-    
-    m_paused = false;
-    
-    return true;
-}
diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in
deleted file mode 100644
index e7ea259f0f..0000000000
--- a/contrib/src/net/Makefile.in
+++ /dev/null
@@ -1,307 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSDLL_OBJECTS =  \
-	$(__netutilsdll___win32rc) \
-	netutilsdll_email.o \
-	netutilsdll_smapi.o \
-	netutilsdll_web.o
-NETUTILSDLL_ODEP =  $(___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname)
-NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-NETUTILSLIB_OBJECTS =  \
-	netutilslib_email.o \
-	netutilslib_smapi.o \
-	netutilslib_web.o
-NETUTILSLIB_ODEP =  $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___netutilsdll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___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_netutilsdll___depname = install_netutilsdll
-@COND_SHARED_1@__uninstall_netutilsdll___depname = uninstall_netutilsdll
-COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__netutilsdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___netutilsdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__netutilsdll___importlib = $(COND_PLATFORM_OS2_1___netutilsdll___importlib)
-COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__netutilsdll___importlib = $(COND_WINDOWS_IMPLIB_1___netutilsdll___importlib)
-@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll
-@COND_ICC_PCH_1@__netutilsdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_netutilsdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_netutilsdll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___netutilsdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__netutilsdll___soname_flags = $(COND_USE_SOVERLINUX_1___netutilsdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__netutilsdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
-	-f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__netutilsdll___win32rc = netutilsdll_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___netutilslib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname)
-@COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
-@COND_SHARED_0@__uninstall_netutilslib___depname = uninstall_netutilslib
-@COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
-@COND_ICC_PCH_1@__netutilslib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_netutilslib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_netutilslib/wx/wxprec.h.gch
-@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: $(__netutilsdll___depname) $(__netutilslib___depname)
-
-install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.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_netutilsdll___depname) $(__uninstall_netutilslib___depname)
-	for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) $(__netutilsdll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___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@	$(__netutilsdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_netutilsdll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_netutilsdll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETUTILSLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(NETUTILSLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_netutilslib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_netutilslib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
-
-netutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
-	$(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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/email.cpp
-
-netutilsdll_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSDLL_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/smapi.cpp
-
-netutilsdll_web.o: $(srcdir)/web.cpp $(NETUTILSDLL_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(srcdir)/web.cpp
-
-netutilslib_email.o: $(srcdir)/email.cpp $(NETUTILSLIB_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/email.cpp
-
-netutilslib_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSLIB_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/smapi.cpp
-
-netutilslib_web.o: $(srcdir)/web.cpp $(NETUTILSLIB_ODEP)
-	$(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(srcdir)/web.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_netutilsdll uninstall_netutilsdll install_netutilslib uninstall_netutilslib
diff --git a/contrib/src/net/email.cpp b/contrib/src/net/email.cpp
deleted file mode 100644
index 7ca1633ab7..0000000000
--- a/contrib/src/net/email.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        email.h
-// Purpose:     wxEmail: portable email client class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/string.h"
-#include "wx/net/email.h"
-
-#ifdef __WXMSW__
-#include "wx/net/smapi.h"
-#endif
-
-#ifdef __UNIX__
-#include "wx/filefn.h"
-#include "wx/timer.h"
-#include "wx/wfstream.h"
-#include "stdlib.h"
-#include "unistd.h"
-#endif
-
-// Send a message.
-// Specify profile, or leave it to wxWidgets to find the current user name
-
-#ifdef __WXMSW__
-bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail))
-{
-    wxASSERT (message.m_to.GetCount() > 0) ;
-
-    wxString profile(profileName);
-    if (profile.IsEmpty())
-        profile = wxGetUserName();
-
-    wxMapiSession session;
-
-    if (!session.MapiInstalled())
-        return FALSE;
-    if (!session.Logon(profile))
-        return FALSE;
-
-    return session.Send(message);
-}
-#elif defined(__UNIX__)
-bool
-wxEmail::Send(wxMailMessage& message,
-              const wxString& profileName,
-              const wxString& sendMail)
-{
-    wxASSERT_MSG( !message.m_to.IsEmpty(), _T("no recipients to send mail to") ) ;
-
-
-    // The 'from' field is optionally supplied by the app; it's not needed
-    // by MAPI, and on Unix, will be guessed if not supplied.
-    wxString from = message.m_from;
-    if ( from.empty() )
-    {
-        from = wxGetEmailAddress();
-    }
-
-    wxString msg;
-    msg << wxT("To: ");
-
-    const size_t rcptCount = message.m_to.GetCount();
-    for (size_t rcpt = 0; rcpt < rcptCount; rcpt++)
-    {
-        if ( rcpt )
-            msg << wxT(", ");
-        msg << message.m_to[rcpt];
-    }
-
-    msg << wxT("\nFrom: ") << from << wxT("\nSubject: ") << message.m_subject;
-    msg << wxT("\n\n") << message.m_body;
-
-    wxString filename;
-    filename.Printf(wxT("/tmp/msg-%ld-%ld-%ld.txt"), (long) getpid(), wxGetLocalTime(),
-        (long) rand());
-
-    {
-        wxFileOutputStream stream(filename);
-        if (stream.Ok())
-        {
-            stream.Write(msg, msg.Length());
-        }
-        else
-        {
-            return FALSE ;
-        }
-    }
-
-    // TODO search for a suitable sendmail if sendMail is empty
-    wxString sendmail(sendMail);
-
-    wxString cmd;
-    cmd << sendmail << wxT(" < ") << filename;
-
-    // TODO: check return code
-    wxSystem(cmd.c_str());
-
-    wxRemoveFile(filename);
-
-    return TRUE;
-}
-#else
-#error Send not yet implemented for this platform.
-#endif
-
diff --git a/contrib/src/net/readme.txt b/contrib/src/net/readme.txt
deleted file mode 100644
index 1fb7e4f43e..0000000000
--- a/contrib/src/net/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Net library
-===========
-
-This is a library of email and other Internet-related functionality.
-
-wxMailMessage		Populate this before sending a message
-wxMapiSession       Encapsulates Simple MAPI functionality on Windows
-wxEmail             Platform-independent mail functions, such as Send
-wxWeb               Platform-independent web functions, such as OpenURL
-
diff --git a/contrib/src/net/smapi.cpp b/contrib/src/net/smapi.cpp
deleted file mode 100644
index d5db18bf06..0000000000
--- a/contrib/src/net/smapi.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        smapi.cpp
-// Purpose:     Simple MAPI classes
-// Author:      PJ Naughter <pjna@naughter.com>
-// Modified by: Julian Smart
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) PJ Naughter
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifdef __WXMSW__
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/string.h"
-#include "wx/msw/private.h"
-
-// mapi.h in Cygwin's include directory isn't a full implementation and is
-// not sufficient for this lib. However recent versions of Cygwin also
-// have another mapi.h in include/w32api which can be used.
-//
-#ifdef __CYGWIN__
-#include <w32api/mapi.h>
-#else
-#include <mapi.h>
-#endif
-
-#include "wx/net/smapi.h"
-
-class WXDLLIMPEXP_NETUTILS wxMapiData
-{
-public:
-    wxMapiData()
-    {
-        m_hSession = 0;
-        m_nLastError = 0;
-        m_hMapi = NULL;
-        m_lpfnMAPILogon = NULL;
-        m_lpfnMAPILogoff = NULL;
-        m_lpfnMAPISendMail = NULL;
-        m_lpfnMAPIResolveName = NULL;
-        m_lpfnMAPIFreeBuffer = NULL;
-    }
-
-    //Data
-    LHANDLE             m_hSession; //Mapi Session handle
-    long                m_nLastError; //Last Mapi error value
-    HINSTANCE           m_hMapi; //Instance handle of the MAPI dll
-    LPMAPILOGON         m_lpfnMAPILogon; //MAPILogon function pointer
-    LPMAPILOGOFF        m_lpfnMAPILogoff; //MAPILogoff function pointer
-    LPMAPISENDMAIL      m_lpfnMAPISendMail; //MAPISendMail function pointer
-    LPMAPIRESOLVENAME   m_lpfnMAPIResolveName; //MAPIResolveName function pointer
-    LPMAPIFREEBUFFER    m_lpfnMAPIFreeBuffer; //MAPIFreeBuffer function pointer
-};
-
-
-////////////////////////////////// Implementation /////////////////////////////
-
-wxMapiSession::wxMapiSession()
-{
-    m_data = new wxMapiData;
-    
-    Initialise();
-}
-
-wxMapiSession::~wxMapiSession()
-{
-    //Logoff if logged on
-    Logoff();
-    
-    //Unload the MAPI dll
-    Deinitialise();
-    
-    delete m_data;
-}
-
-void wxMapiSession::Initialise() 
-{
-    //First make sure the "WIN.INI" entry for MAPI is present aswell 
-    //as the MAPI32 dll being present on the system
-    bool bMapiInstalled = (GetProfileInt(_T("MAIL"), _T("MAPI"), 0) != 0) && 
-        (SearchPath(NULL, _T("MAPI32.DLL"), NULL, 0, NULL, NULL) != 0);
-    
-    if (bMapiInstalled)
-    {
-        //Load up the MAPI dll and get the function pointers we are interested in
-        m_data->m_hMapi = ::LoadLibrary(_T("MAPI32.DLL"));
-        if (m_data->m_hMapi)
-        {
-            m_data->m_lpfnMAPILogon = (LPMAPILOGON) GetProcAddress(m_data->m_hMapi, "MAPILogon");
-            m_data->m_lpfnMAPILogoff = (LPMAPILOGOFF) GetProcAddress(m_data->m_hMapi, "MAPILogoff");
-            m_data->m_lpfnMAPISendMail = (LPMAPISENDMAIL) GetProcAddress(m_data->m_hMapi, "MAPISendMail");
-            m_data->m_lpfnMAPIResolveName = (LPMAPIRESOLVENAME) GetProcAddress(m_data->m_hMapi, "MAPIResolveName");
-            m_data->m_lpfnMAPIFreeBuffer = (LPMAPIFREEBUFFER) GetProcAddress(m_data->m_hMapi, "MAPIFreeBuffer");
-            
-            //If any of the functions are not installed then fail the load
-            if (m_data->m_lpfnMAPILogon == NULL ||
-                m_data->m_lpfnMAPILogoff == NULL ||
-                m_data->m_lpfnMAPISendMail == NULL ||
-                m_data->m_lpfnMAPIResolveName == NULL ||
-                m_data->m_lpfnMAPIFreeBuffer == NULL)
-            {
-                wxLogDebug(_T("Failed to get one of the functions pointer in MAPI32.DLL\n"));
-                Deinitialise();
-            }
-        }
-    }
-    else
-        wxLogDebug(_T("Mapi is not installed on this computer\n"));
-}
-
-void wxMapiSession::Deinitialise()
-{
-    if (m_data->m_hMapi)
-    {
-        //Unload the MAPI dll and reset the function pointers to NULL
-        FreeLibrary(m_data->m_hMapi);
-        m_data->m_hMapi = NULL;
-        m_data->m_lpfnMAPILogon = NULL;
-        m_data->m_lpfnMAPILogoff = NULL;
-        m_data->m_lpfnMAPISendMail = NULL;
-        m_data->m_lpfnMAPIResolveName = NULL;
-        m_data->m_lpfnMAPIFreeBuffer = NULL;
-    }
-}
-
-bool wxMapiSession::Logon(const wxString& sProfileName, const wxString& sPassword, wxWindow* pParentWnd)
-{
-    wxASSERT(MapiInstalled()); //MAPI must be installed
-    wxASSERT(m_data->m_lpfnMAPILogon); //Function pointer must be valid
-    
-    //Initialise the function return value
-    bool bSuccess = FALSE;
-    
-    //Just in case we are already logged in
-    Logoff();
-    
-    //Setup the ascii versions of the profile name and password
-    int nProfileLength = sProfileName.Length();
-    
-    LPSTR pszProfileName = NULL;
-    LPSTR pszPassword = NULL;
-    wxCharBuffer cbProfile(1),cbPassword(1);
-    if (nProfileLength)
-    {
-#ifndef UNICODE
-        pszProfileName = (LPSTR) sProfileName.c_str();
-        pszPassword = (LPSTR) sPassword.c_str();
-#else
-        cbProfile = sProfileName.mb_str();
-        cbPassword = sPassword.mb_str();
-        pszProfileName = cbProfile.data();
-        pszPassword = cbPassword.data();
-#endif
-    }
-    
-    //Setup the flags & UIParam parameters used in the MapiLogon call
-    FLAGS flags = 0;
-    ULONG nUIParam = 0;
-    if (nProfileLength == 0)
-    {
-        //No profile name given, then we must interactively request a profile name
-        if (pParentWnd)
-        {
-            nUIParam = (ULONG) (HWND) pParentWnd->GetHWND();
-            flags |= MAPI_LOGON_UI;
-        }
-        else
-        {
-            //No window given, just use the main window of the app as the parent window
-            if (wxTheApp->GetTopWindow())
-            {
-                nUIParam = (ULONG) (HWND) wxTheApp->GetTopWindow()->GetHWND();
-                flags |= MAPI_LOGON_UI;
-            }
-        }
-    }
-    
-    //First try to acquire a new MAPI session using the supplied settings using the MAPILogon functio
-    ULONG nError = m_data->m_lpfnMAPILogon(nUIParam, pszProfileName, pszPassword, flags | MAPI_NEW_SESSION, 0, &m_data->m_hSession);
-    if (nError != SUCCESS_SUCCESS && nError != MAPI_E_USER_ABORT)
-    {
-        //Failed to create a create mapi session, try to acquire a shared mapi session
-        wxLogDebug(_T("Failed to logon to MAPI using a new session, trying to acquire a shared one\n"));
-        nError = m_data->m_lpfnMAPILogon(nUIParam, NULL, NULL, 0, 0, &m_data->m_hSession);
-        if (nError == SUCCESS_SUCCESS)
-        {
-            m_data->m_nLastError = SUCCESS_SUCCESS;
-            bSuccess = TRUE;
-        }
-        else
-        {
-            wxLogDebug(_T("Failed to logon to MAPI using a shared session, Error:%ld\n"), nError);
-            m_data->m_nLastError = nError;
-        }
-    }
-    else if (nError == SUCCESS_SUCCESS)
-    {
-        m_data->m_nLastError = SUCCESS_SUCCESS;
-        bSuccess = TRUE;
-    }
-    
-    return bSuccess;
-}
-
-bool wxMapiSession::LoggedOn() const
-{
-    return (m_data->m_hSession != 0);
-}
-
-bool wxMapiSession::MapiInstalled() const
-{
-    return (m_data->m_hMapi != NULL);
-}
-
-bool wxMapiSession::Logoff()
-{
-    wxASSERT(MapiInstalled()); //MAPI must be installed
-    wxASSERT(m_data->m_lpfnMAPILogoff); //Function pointer must be valid
-    
-    //Initialise the function return value
-    bool bSuccess = FALSE;
-    
-    if (m_data->m_hSession)
-    {
-        //Call the MAPILogoff function
-        ULONG nError = m_data->m_lpfnMAPILogoff(m_data->m_hSession, 0, 0, 0); 
-        if (nError != SUCCESS_SUCCESS)
-        {
-            wxLogDebug(_T("Failed in call to MapiLogoff, Error:%ld"), nError);
-            m_data->m_nLastError = nError;
-            bSuccess = TRUE;
-        }
-        else
-        {
-            m_data->m_nLastError = SUCCESS_SUCCESS;
-            bSuccess = TRUE;
-        }
-        m_data->m_hSession = 0;
-    }
-    
-    return bSuccess;
-}
-
-bool wxMapiSession::Resolve(const wxString& sName, void* lppRecip1)
-{
-    lpMapiRecipDesc* lppRecip = (lpMapiRecipDesc*) lppRecip1;
-    
-    wxASSERT(MapiInstalled()); //MAPI must be installed
-    wxASSERT(m_data->m_lpfnMAPIResolveName); //Function pointer must be valid
-    wxASSERT(LoggedOn()); //Must be logged on to MAPI
-    wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
-    
-    //Call the MAPIResolveName function
-#ifndef UNICODE
-    LPSTR lpszAsciiName = (LPSTR) sName.c_str();
-#else
-    wxCharBuffer cbName(1);
-    cbName = sName.mb_str();
-    LPSTR lpszAsciiName = cbName.data();
-#endif
-    ULONG nError = m_data->m_lpfnMAPIResolveName(m_data->m_hSession, 0, lpszAsciiName, 0, 0, lppRecip);
-    if (nError != SUCCESS_SUCCESS)
-    {
-        wxLogDebug(_T("Failed to resolve the name: %s, Error:%ld\n"),
-                   sName.c_str(), nError);
-        m_data->m_nLastError = nError;
-    }
-    
-    return (nError == SUCCESS_SUCCESS);
-}
-
-bool wxMapiSession::Send(wxMailMessage& message)
-{
-    wxASSERT(MapiInstalled()); //MAPI must be installed
-    wxASSERT(m_data->m_lpfnMAPISendMail); //Function pointer must be valid
-    wxASSERT(m_data->m_lpfnMAPIFreeBuffer); //Function pointer must be valid
-    wxASSERT(LoggedOn()); //Must be logged on to MAPI
-    wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
-    
-    //Initialise the function return value
-    bool bSuccess = FALSE;  
-    
-    //Create the MapiMessage structure to match the message parameter send into us
-    MapiMessage mapiMessage;
-    ZeroMemory(&mapiMessage, sizeof(mapiMessage));
-#ifndef UNICODE
-    mapiMessage.lpszSubject = (LPSTR) message.m_subject.c_str();
-    mapiMessage.lpszNoteText = (LPSTR) message.m_body.c_str();
-#else
-    wxCharBuffer cbSubject(1),cbBody(1),cbOriginator(1);
-    cbSubject = message.m_subject.mb_str();
-    cbBody = message.m_body.mb_str();
-    mapiMessage.lpszSubject = cbSubject.data();
-    mapiMessage.lpszNoteText = cbBody.data();
-#endif
-    mapiMessage.nRecipCount = message.m_to.GetCount() + message.m_cc.GetCount() + message.m_bcc.GetCount();
-    wxASSERT(mapiMessage.nRecipCount); //Must have at least 1 recipient!
-    
-    //Allocate the recipients array
-    mapiMessage.lpRecips = new MapiRecipDesc[mapiMessage.nRecipCount];
-
-    // If we have a 'From' field, use it
-    if (!message.m_from.IsEmpty())
-    {
-        mapiMessage.lpOriginator = new MapiRecipDesc;
-        ZeroMemory(mapiMessage.lpOriginator, sizeof(MapiRecipDesc));
-
-        mapiMessage.lpOriginator->ulRecipClass = MAPI_ORIG;
-        // TODO Do we have to call Resolve?
-#ifndef UNICODE
-        mapiMessage.lpOriginator->lpszName = (LPSTR) message.m_from.c_str();
-#else
-        cbOriginator = message.m_from.mb_str();
-        mapiMessage.lpOriginator->lpszName = cbOriginator.data();
-#endif
-    }
-    
-    //Setup the "To" recipients
-    int nRecipIndex = 0;
-    int nToSize = message.m_to.GetCount();
-    int i;
-    for (i=0; i<nToSize; i++)
-    {
-        MapiRecipDesc& recip = mapiMessage.lpRecips[nRecipIndex];
-        ZeroMemory(&recip, sizeof(MapiRecipDesc));
-        recip.ulRecipClass = MAPI_TO;
-        wxString& sName = message.m_to[i];
-
-        //Try to resolve the name
-        lpMapiRecipDesc lpTempRecip;  
-        if (Resolve(sName, (void*) &lpTempRecip))
-        {
-            //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,*wxConvCurrent);
-            
-            //Don't forget to free up the memory MAPI allocated for us
-            m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
-        }
-#ifndef UNICODE
-        recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
-        
-        ++nRecipIndex;
-    }
-    
-    //Setup the "CC" recipients
-    int nCCSize = message.m_cc.GetCount();
-    for (i=0; i<nCCSize; i++)
-    {
-        MapiRecipDesc& recip = mapiMessage.lpRecips[nRecipIndex];
-        ZeroMemory(&recip, sizeof(MapiRecipDesc));
-        recip.ulRecipClass = MAPI_CC;
-        wxString& sName = message.m_cc[i];
-
-        //Try to resolve the name
-        lpMapiRecipDesc lpTempRecip;  
-        if (Resolve(sName, (void*) &lpTempRecip))
-        {
-            //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,*wxConvCurrent);
-            
-            //Don't forget to free up the memory MAPI allocated for us
-            m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
-        }
-#ifndef UNICODE
-        recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
-        
-        ++nRecipIndex;
-    }
-    
-    //Setup the "BCC" recipients
-    int nBCCSize = message.m_bcc.GetCount();
-    for (i=0; i<nBCCSize; i++)
-    {
-        MapiRecipDesc& recip = mapiMessage.lpRecips[nRecipIndex];
-        ZeroMemory(&recip, sizeof(MapiRecipDesc));
-        recip.ulRecipClass = MAPI_BCC;
-        wxString& sName = message.m_bcc[i];
-
-        //Try to resolve the name
-        lpMapiRecipDesc lpTempRecip;  
-        if (Resolve(sName, (void*) &lpTempRecip))
-        {
-            //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
-            
-            //Don't forget to free up the memory MAPI allocated for us
-            m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
-        }
-#ifndef UNICODE
-        recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
-        
-        ++nRecipIndex;
-    }
-    
-    //Setup the attachments 
-    int nAttachmentSize = message.m_attachments.GetCount();
-    int nTitleSize = message.m_attachmentTitles.GetCount();
-    if (nTitleSize)
-    { 
-        wxASSERT(nTitleSize == nAttachmentSize); //If you are going to set the attachment titles then you must set 
-        //the attachment title for each attachment
-    }
-    if (nAttachmentSize)
-    {
-        mapiMessage.nFileCount = nAttachmentSize;
-        mapiMessage.lpFiles = new MapiFileDesc[nAttachmentSize];
-        for (i=0; i<nAttachmentSize; i++)
-        {
-            MapiFileDesc& file = mapiMessage.lpFiles[i];
-            ZeroMemory(&file, sizeof(MapiFileDesc));
-            file.nPosition = 0xFFFFFFFF;
-            wxString& sFilename = message.m_attachments[i];
-
-#ifndef UNICODE
-            file.lpszPathName = (LPSTR) sFilename.c_str();
-#else
-            file.lpszPathName = sFilename.mb_str().release();
-#endif
-            //file.lpszFileName = file.lpszPathName;
-            file.lpszFileName = NULL;
-
-            if (nTitleSize && !message.m_attachmentTitles[i].IsEmpty())
-            {
-                wxString& sTitle = message.m_attachmentTitles[i];
-#ifndef UNICODE
-                file.lpszFileName = (LPSTR) sTitle.c_str();
-#else
-                file.lpszFileName = sTitle.mb_str().release();
-#endif
-            }
-        }
-    }
-    
-    //Do the actual send using MAPISendMail
-    ULONG nError = m_data->m_lpfnMAPISendMail(m_data->m_hSession, 0, &mapiMessage, MAPI_DIALOG, 0);
-    if (nError == SUCCESS_SUCCESS)
-    {
-        bSuccess = TRUE;
-        m_data->m_nLastError = SUCCESS_SUCCESS;
-    }
-    else
-    {
-        wxLogDebug(_T("Failed to send mail message, Error:%ld\n"), nError);
-        m_data->m_nLastError = nError;
-    }
-    
-    //Tidy up the Attachements
-    if (nAttachmentSize)
-    {
-#ifdef UNICODE
-        for (i = 0;i < nAttachmentSize;i++)
-        {
-            free(mapiMessage.lpFiles[i].lpszPathName);
-            free(mapiMessage.lpFiles[i].lpszFileName);
-        }
-#endif
-        delete [] mapiMessage.lpFiles;
-    }
-    
-    //Free up the Recipients and Originator memory
-#ifdef UNICODE
-    for (i = 0;i < nRecipIndex;i++)
-        free(mapiMessage.lpRecips[i].lpszName);
-#endif
-    delete [] mapiMessage.lpRecips;
-
-    delete mapiMessage.lpOriginator;
-    
-    return bSuccess;
-}
-
-long wxMapiSession::GetLastError() const
-{
-    return m_data->m_nLastError;
-}
-
-#endif // __WXMSW__
diff --git a/contrib/src/net/web.cpp b/contrib/src/net/web.cpp
deleted file mode 100644
index c41593bbd9..0000000000
--- a/contrib/src/net/web.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        web.h
-// Purpose:     wxWeb: portable web browser-related class
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-08-21
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// 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/string.h"
-
-
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
deleted file mode 100644
index 99df9e56b8..0000000000
--- a/contrib/src/ogl/Makefile.in
+++ /dev/null
@@ -1,378 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
-	$(CPPFLAGS) $(CXXFLAGS)
-OGLDLL_OBJECTS =  \
-	$(__ogldll___win32rc) \
-	ogldll_basic2.o \
-	ogldll_canvas.o \
-	ogldll_divided.o \
-	ogldll_mfutils.o \
-	ogldll_oglmisc.o \
-	ogldll_basic.o \
-	ogldll_composit.o \
-	ogldll_drawn.o \
-	ogldll_bmpshape.o \
-	ogldll_constrnt.o \
-	ogldll_lines.o \
-	ogldll_ogldiag.o
-OGLDLL_ODEP =  $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname)
-OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-OGLLIB_OBJECTS =  \
-	ogllib_basic2.o \
-	ogllib_canvas.o \
-	ogllib_divided.o \
-	ogllib_mfutils.o \
-	ogllib_oglmisc.o \
-	ogllib_basic.o \
-	ogllib_composit.o \
-	ogllib_drawn.o \
-	ogllib_bmpshape.o \
-	ogllib_constrnt.o \
-	ogllib_lines.o \
-	ogllib_ogldiag.o
-OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___ogldll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___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_ogldll___depname = install_ogldll
-@COND_SHARED_1@__uninstall_ogldll___depname = uninstall_ogldll
-COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___ogldll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__ogldll___importlib = $(COND_PLATFORM_OS2_1___ogldll___importlib)
-COND_WINDOWS_IMPLIB_1___ogldll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__ogldll___importlib = $(COND_WINDOWS_IMPLIB_1___ogldll___importlib)
-@COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
-@COND_ICC_PCH_1@__ogldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_ogldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_ogldll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___ogldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = $(COND_USE_SOVERLINUX_1___ogldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ogldll___soname_flags)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_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___ogllib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
-@COND_SHARED_0@__install_ogllib___depname = install_ogllib
-@COND_SHARED_0@__uninstall_ogllib___depname = uninstall_ogllib
-@COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
-@COND_ICC_PCH_1@__ogllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_ogllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_ogllib/wx/wxprec.h.gch
-@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: $(__ogldll___depname) $(__ogllib___depname)
-
-install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.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_ogldll___depname) $(__uninstall_ogllib___depname)
-	for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___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@	$(__ogldll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_ogldll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_ogldll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(OGLLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_ogllib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_ogllib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
-
-ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
-	$(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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic2.cpp
-
-ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/canvas.cpp
-
-ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/divided.cpp
-
-ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/mfutils.cpp
-
-ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/oglmisc.cpp
-
-ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic.cpp
-
-ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/composit.cpp
-
-ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/drawn.cpp
-
-ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/bmpshape.cpp
-
-ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/constrnt.cpp
-
-ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/lines.cpp
-
-ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP)
-	$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/ogldiag.cpp
-
-ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic2.cpp
-
-ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/canvas.cpp
-
-ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/divided.cpp
-
-ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/mfutils.cpp
-
-ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/oglmisc.cpp
-
-ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic.cpp
-
-ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/composit.cpp
-
-ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/drawn.cpp
-
-ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/bmpshape.cpp
-
-ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/constrnt.cpp
-
-ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/lines.cpp
-
-ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
-	$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/ogldiag.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_ogldll uninstall_ogldll install_ogllib uninstall_ogllib
diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
deleted file mode 100644
index ab9c5a8334..0000000000
--- a/contrib/src/ogl/basic.cpp
+++ /dev/null
@@ -1,3286 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        basic.cpp
-// Purpose:     Basic OGL classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include "wx/ogl/ogl.h"
-
-
-// Control point types
-// Rectangle and most other shapes
-#define CONTROL_POINT_VERTICAL   1
-#define CONTROL_POINT_HORIZONTAL 2
-#define CONTROL_POINT_DIAGONAL   3
-
-// Line
-#define CONTROL_POINT_ENDPOINT_TO 4
-#define CONTROL_POINT_ENDPOINT_FROM 5
-#define CONTROL_POINT_LINE       6
-
-IMPLEMENT_DYNAMIC_CLASS(wxShapeTextLine, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxAttachmentPoint, wxObject)
-
-wxShapeTextLine::wxShapeTextLine(double the_x, double the_y, const wxString& the_line)
-{
-  m_x = the_x; m_y = the_y; m_line = the_line;
-}
-
-wxShapeTextLine::~wxShapeTextLine()
-{
-}
-
-IMPLEMENT_ABSTRACT_CLASS(wxShapeEvtHandler, wxObject)
-
-wxShapeEvtHandler::wxShapeEvtHandler(wxShapeEvtHandler *prev, wxShape *shape)
-{
-  m_previousHandler = prev;
-  m_handlerShape = shape;
-}
-
-wxShapeEvtHandler::~wxShapeEvtHandler()
-{
-}
-
-// Creates a copy of this event handler.
-wxShapeEvtHandler* wxShapeEvtHandler::CreateNewCopy()
-{
-  wxShapeEvtHandler* newObject = (wxShapeEvtHandler*) GetClassInfo()->CreateObject();
-
-  wxASSERT( (newObject != NULL) );
-  wxASSERT( (newObject->IsKindOf(CLASSINFO(wxShapeEvtHandler))) );
-
-  newObject->m_previousHandler = newObject;
-
-  CopyData(*newObject);
-
-  return newObject;
-}
-
-
-void wxShapeEvtHandler::OnDelete()
-{
-  if (this != GetShape())
-    delete this;
-}
-
-void wxShapeEvtHandler::OnDraw(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDraw(dc);
-}
-
-void wxShapeEvtHandler::OnMoveLinks(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnMoveLinks(dc);
-}
-
-void wxShapeEvtHandler::OnMoveLink(wxDC& dc, bool moveControlPoints)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnMoveLink(dc, moveControlPoints);
-}
-
-void wxShapeEvtHandler::OnDrawContents(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDrawContents(dc);
-}
-
-void wxShapeEvtHandler::OnDrawBranches(wxDC& dc, bool erase)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDrawBranches(dc, erase);
-}
-
-void wxShapeEvtHandler::OnSize(double x, double y)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnSize(x, y);
-}
-
-bool wxShapeEvtHandler::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
-{
-  if (m_previousHandler)
-    return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display);
-  else
-    return true;
-}
-
-void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnMovePost(dc, x, y, old_x, old_y, display);
-}
-
-void wxShapeEvtHandler::OnErase(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnErase(dc);
-}
-
-void wxShapeEvtHandler::OnEraseContents(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnEraseContents(dc);
-}
-
-void wxShapeEvtHandler::OnHighlight(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnHighlight(dc);
-}
-
-void wxShapeEvtHandler::OnLeftClick(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnLeftClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnLeftDoubleClick(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnLeftDoubleClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnRightClick(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnRightClick(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnEndDragLeft(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDragRight(bool draw, double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDragRight(draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnBeginDragRight(x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnEndDragRight(double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnEndDragRight(x, y, keys, attachment);
-}
-
-// Control points ('handles') redirect control to the actual shape, to make it easier
-// to override sizing behaviour.
-void wxShapeEvtHandler::OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnSizingDragLeft(pt, draw, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnSizingBeginDragLeft(pt, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnSizingEndDragLeft(pt, x, y, keys, attachment);
-}
-
-void wxShapeEvtHandler::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDrawOutline(dc, x, y, w, h);
-}
-
-void wxShapeEvtHandler::OnDrawControlPoints(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnDrawControlPoints(dc);
-}
-
-void wxShapeEvtHandler::OnEraseControlPoints(wxDC& dc)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnEraseControlPoints(dc);
-}
-
-// Can override this to prevent or intercept line reordering.
-void wxShapeEvtHandler::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
-  if (m_previousHandler)
-    m_previousHandler->OnChangeAttachment(attachment, line, ordering);
-}
-
-IMPLEMENT_ABSTRACT_CLASS(wxShape, wxShapeEvtHandler)
-
-wxShape::wxShape(wxShapeCanvas *can)
-{
-  m_eventHandler = this;
-  SetShape(this);
-  m_id = 0;
-  m_formatted = false;
-  m_canvas = can;
-  m_xpos = 0.0; m_ypos = 0.0;
-  m_pen = g_oglBlackPen;
-  m_brush = wxWHITE_BRUSH;
-  m_font = g_oglNormalFont;
-  m_textColour = wxT("BLACK");
-  m_textColourName = wxT("BLACK");
-  m_visible = false;
-  m_selected = false;
-  m_attachmentMode = ATTACHMENT_MODE_NONE;
-  m_spaceAttachments = true;
-  m_disableLabel = false;
-  m_fixedWidth = false;
-  m_fixedHeight = false;
-  m_drawHandles = true;
-  m_sensitivity = OP_ALL;
-  m_draggable = true;
-  m_parent = NULL;
-  m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
-  m_shadowMode = SHADOW_NONE;
-  m_shadowOffsetX = 6;
-  m_shadowOffsetY = 6;
-  m_shadowBrush = wxBLACK_BRUSH;
-  m_textMarginX = 5;
-  m_textMarginY = 5;
-  m_regionName = wxT("0");
-  m_centreResize = true;
-  m_maintainAspectRatio = false;
-  m_highlighted = false;
-  m_rotation = 0.0;
-  m_branchNeckLength = 10;
-  m_branchStemLength = 10;
-  m_branchSpacing = 10;
-  m_branchStyle = BRANCHING_ATTACHMENT_NORMAL;
-
-  // Set up a default region. Much of the above will be put into
-  // the region eventually (the duplication is for compatibility)
-  wxShapeRegion *region = new wxShapeRegion;
-  m_regions.Append(region);
-  region->SetName(wxT("0"));
-  region->SetFont(g_oglNormalFont);
-  region->SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
-  region->SetColour(wxT("BLACK"));
-}
-
-wxShape::~wxShape()
-{
-  if (m_parent)
-    m_parent->GetChildren().DeleteObject(this);
-
-  ClearText();
-  ClearRegions();
-  ClearAttachments();
-
-  if (m_canvas)
-    m_canvas->RemoveShape(this);
-
-  GetEventHandler()->OnDelete();
-}
-
-void wxShape::SetHighlight(bool hi, bool recurse)
-{
-  m_highlighted = hi;
-  if (recurse)
-  {
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->SetHighlight(hi, recurse);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::SetSensitivityFilter(int sens, bool recursive)
-{
-  if (sens & OP_DRAG_LEFT)
-    m_draggable = true;
-  else
-    m_draggable = false;
-
-  m_sensitivity = sens;
-  if (recursive)
-  {
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *obj = (wxShape *)node->GetData();
-      obj->SetSensitivityFilter(sens, true);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::SetDraggable(bool drag, bool recursive)
-{
-  m_draggable = drag;
-  if (m_draggable)
-    m_sensitivity |= OP_DRAG_LEFT;
-  else
-    if (m_sensitivity & OP_DRAG_LEFT)
-      m_sensitivity = m_sensitivity - OP_DRAG_LEFT;
-
-  if (recursive)
-  {
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *obj = (wxShape *)node->GetData();
-      obj->SetDraggable(drag, true);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::SetDrawHandles(bool drawH)
-{
-  m_drawHandles = drawH;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *obj = (wxShape *)node->GetData();
-    obj->SetDrawHandles(drawH);
-    node = node->GetNext();
-  }
-}
-
-void wxShape::SetShadowMode(int mode, bool redraw)
-{
-  if (redraw && GetCanvas())
-  {
-    wxClientDC dc(GetCanvas());
-    GetCanvas()->PrepareDC(dc);
-    Erase(dc);
-
-    m_shadowMode = mode;
-
-    Draw(dc);
-  }
-  else
-  {
-    m_shadowMode = mode;
-  }
-}
-
-void wxShape::SetCanvas(wxShapeCanvas *theCanvas)
-{
-  m_canvas = theCanvas;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    child->SetCanvas(theCanvas);
-    node = node->GetNext();
-  }
-}
-
-void wxShape::AddToCanvas(wxShapeCanvas *theCanvas, wxShape *addAfter)
-{
-  theCanvas->AddShape(this, addAfter);
-  wxNode *node = m_children.GetFirst();
-  wxShape *lastImage = this;
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->AddToCanvas(theCanvas, lastImage);
-    lastImage = object;
-
-    node = node->GetNext();
-  }
-}
-
-// Insert at front of canvas
-void wxShape::InsertInCanvas(wxShapeCanvas *theCanvas)
-{
-  theCanvas->InsertShape(this);
-  wxNode *node = m_children.GetFirst();
-  wxShape *lastImage = this;
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->AddToCanvas(theCanvas, lastImage);
-    lastImage = object;
-
-    node = node->GetNext();
-  }
-}
-
-void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas)
-{
-  if (Selected())
-    Select(false);
-  theCanvas->RemoveShape(this);
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->RemoveFromCanvas(theCanvas);
-
-    node = node->GetNext();
-  }
-}
-
-void wxShape::ClearAttachments()
-{
-  wxNode *node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    delete point;
-    node = node->GetNext();
-  }
-  m_attachmentPoints.Clear();
-}
-
-void wxShape::ClearText(int regionId)
-{
-  if (regionId == 0)
-  {
-    m_text.DeleteContents(true);
-    m_text.Clear();
-    m_text.DeleteContents(false);
-  }
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->ClearText();
-}
-
-void wxShape::ClearRegions()
-{
-  wxNode *node = m_regions.GetFirst();
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    wxNode *next = node->GetNext();
-    delete region;
-    delete node;
-    node = next;
-  }
-}
-
-void wxShape::AddRegion(wxShapeRegion *region)
-{
-  m_regions.Append(region);
-}
-
-void wxShape::SetDefaultRegionSize()
-{
-  wxNode *node = m_regions.GetFirst();
-  if (!node) return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  double w, h;
-  GetBoundingBoxMin(&w, &h);
-  region->SetSize(w, h);
-}
-
-bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
-{
-//  if (!sensitive)
-//    return false;
-
-  double width = 0.0, height = 0.0;
-  GetBoundingBoxMin(&width, &height);
-  if (fabs(width) < 4.0) width = 4.0;
-  if (fabs(height) < 4.0) height = 4.0;
-
-  width += (double)4.0; height += (double)4.0; // Allowance for inaccurate mousing
-
-  double left = (double)(m_xpos - (width/2.0));
-  double top = (double)(m_ypos - (height/2.0));
-  double right = (double)(m_xpos + (width/2.0));
-  double bottom = (double)(m_ypos + (height/2.0));
-
-  int nearest_attachment = 0;
-
-  // If within the bounding box, check the attachment points
-  // within the object.
-
-  if (x >= left && x <= right && y >= top && y <= bottom)
-  {
-    int n = GetNumberOfAttachments();
-    double nearest = 999999.0;
-
-    // GetAttachmentPosition[Edge] takes a logical attachment position,
-    // i.e. if it's rotated through 90%, position 0 is East-facing.
-
-    for (int i = 0; i < n; i++)
-    {
-      double xp, yp;
-      if (GetAttachmentPositionEdge(i, &xp, &yp))
-      {
-        double l = (double)sqrt(((xp - x) * (xp - x)) +
-                   ((yp - y) * (yp - y)));
-
-        if (l < nearest)
-        {
-          nearest = l;
-          nearest_attachment = i;
-        }
-      }
-    }
-    *attachment = nearest_attachment;
-    *distance = nearest;
-    return true;
-  }
-  else return false;
-}
-
-// Format a text string according to the region size, adding
-// strings with positions to region text list
-
-static bool GraphicsInSizeToContents = false; // Infinite recursion elimination
-void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
-{
-  double w, h;
-  ClearText(i);
-
-  if (m_regions.GetCount() < 1)
-    return;
-  wxNode *node = m_regions.Item(i);
-  if (!node)
-    return;
-
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  // region->SetText(s);  // don't set the formatted text yet, it will be done below
-  region->m_regionText = s;
-  dc.SetFont(* region->GetFont());
-
-  region->GetSize(&w, &h);
-
-  wxStringList *stringList = oglFormatText(dc, s, (w-2*m_textMarginX), (h-2*m_textMarginY), region->GetFormatMode());
-  node = (wxNode*)stringList->GetFirst();
-  while (node)
-  {
-    wxChar *s = (wxChar *)node->GetData();
-    wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
-    region->GetFormattedText().Append((wxObject *)line);
-    node = node->GetNext();
-  }
-  delete stringList;
-  double actualW = w;
-  double actualH = h;
-  // Don't try to resize an object with more than one image (this case should be dealt
-  // with by overriden handlers)
-  if ((region->GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) &&
-      (region->GetFormattedText().GetCount() > 0) &&
-      (m_regions.GetCount() == 1) && !GraphicsInSizeToContents)
-  {
-    oglGetCentredTextExtent(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, &actualW, &actualH);
-    if ((actualW+2*m_textMarginX != w ) || (actualH+2*m_textMarginY != h))
-    {
-      // If we are a descendant of a composite, must make sure the composite gets
-      // resized properly
-      wxShape *topAncestor = GetTopAncestor();
-
-      if (topAncestor != this)
-      {
-        // Make sure we don't recurse infinitely
-        GraphicsInSizeToContents = true;
-
-        wxCompositeShape *composite = (wxCompositeShape *)topAncestor;
-        composite->Erase(dc);
-        SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
-        Move(dc, m_xpos, m_ypos);
-        composite->CalculateSize();
-        if (composite->Selected())
-        {
-          composite->DeleteControlPoints(& dc);
-          composite->MakeControlPoints();
-          composite->MakeMandatoryControlPoints();
-        }
-        // Where infinite recursion might happen if we didn't stop it
-        composite->Draw(dc);
-
-        GraphicsInSizeToContents = false;
-      }
-      else
-      {
-        Erase(dc);
-        SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
-        Move(dc, m_xpos, m_ypos);
-      }
-      SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);
-      Move(dc, m_xpos, m_ypos);
-      EraseContents(dc);
-    }
-  }
-  oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW-2*m_textMarginX, actualH-2*m_textMarginY, region->GetFormatMode());
-  m_formatted = true;
-}
-
-void wxShape::Recentre(wxDC& dc)
-{
-  double w, h;
-  GetBoundingBoxMin(&w, &h);
-
-  int noRegions = m_regions.GetCount();
-  for (int i = 0; i < noRegions; i++)
-  {
-    wxNode *node = m_regions.Item(i);
-    if (node)
-    {
-      wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w-2*m_textMarginX, h-2*m_textMarginY, region->GetFormatMode());
-    }
-  }
-}
-
-bool wxShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
-                                     double WXUNUSED(x2), double WXUNUSED(y2),
-                                     double *WXUNUSED(x3), double *WXUNUSED(y3))
-{
-  return false;
-}
-
-void wxShape::SetPen(const wxPen *the_pen)
-{
-  m_pen = the_pen;
-}
-
-void wxShape::SetBrush(const wxBrush *the_brush)
-{
-  m_brush = the_brush;
-}
-
-// Get the top-most (non-division) ancestor, or self
-wxShape *wxShape::GetTopAncestor()
-{
-  if (!GetParent())
-    return this;
-
-  if (GetParent()->IsKindOf(CLASSINFO(wxDivisionShape)))
-    return this;
-  else return GetParent()->GetTopAncestor();
-}
-
-/*
- * Region functions
- *
- */
-void wxShape::SetFont(wxFont *the_font, int regionId)
-{
-  m_font = the_font;
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->SetFont(the_font);
-}
-
-wxFont *wxShape::GetFont(int n) const
-{
-  wxNode *node = m_regions.Item(n);
-  if (!node)
-    return NULL;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  return region->GetFont();
-}
-
-void wxShape::SetFormatMode(int mode, int regionId)
-{
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->SetFormatMode(mode);
-}
-
-int wxShape::GetFormatMode(int regionId) const
-{
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return 0;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  return region->GetFormatMode();
-}
-
-void wxShape::SetTextColour(const wxString& the_colour, int regionId)
-{
-  m_textColour = wxTheColourDatabase->Find(the_colour);
-  m_textColourName = the_colour;
-
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->SetColour(the_colour);
-}
-
-wxString wxShape::GetTextColour(int regionId) const
-{
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return wxEmptyString;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  return region->GetColour();
-}
-
-void wxShape::SetRegionName(const wxString& name, int regionId)
-{
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->SetName(name);
-}
-
-wxString wxShape::GetRegionName(int regionId)
-{
-  wxNode *node = m_regions.Item(regionId);
-  if (!node)
-    return wxEmptyString;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  return region->GetName();
-}
-
-int wxShape::GetRegionId(const wxString& name)
-{
-  wxNode *node = m_regions.GetFirst();
-  int i = 0;
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    if (region->GetName() == name)
-      return i;
-    node = node->GetNext();
-    i ++;
-  }
-  return -1;
-}
-
-// Name all m_regions in all subimages recursively.
-void wxShape::NameRegions(const wxString& parentName)
-{
-  int n = GetNumberOfTextRegions();
-  wxString buff;
-  for (int i = 0; i < n; i++)
-  {
-    if (parentName.Length() > 0)
-      buff << parentName << wxT(".") << i;
-    else
-      buff << i;
-    SetRegionName(buff, i);
-  }
-  wxNode *node = m_children.GetFirst();
-  int j = 0;
-  while (node)
-  {
-    buff.Empty();
-    wxShape *child = (wxShape *)node->GetData();
-    if (parentName.Length() > 0)
-      buff << parentName << wxT(".") << j;
-    else
-      buff << j;
-    child->NameRegions(buff);
-    node = node->GetNext();
-    j ++;
-  }
-}
-
-// Get a region by name, possibly looking recursively into composites.
-wxShape *wxShape::FindRegion(const wxString& name, int *regionId)
-{
-  int id = GetRegionId(name);
-  if (id > -1)
-  {
-    *regionId = id;
-    return this;
-  }
-
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    wxShape *actualImage = child->FindRegion(name, regionId);
-    if (actualImage)
-      return actualImage;
-    node = node->GetNext();
-  }
-  return NULL;
-}
-
-// Finds all region names for this image (composite or simple).
-// Supply empty string list.
-void wxShape::FindRegionNames(wxStringList& list)
-{
-  int n = GetNumberOfTextRegions();
-  for (int i = 0; i < n; i++)
-  {
-    wxString name(GetRegionName(i));
-    list.Add(name);
-  }
-
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    child->FindRegionNames(list);
-    node = node->GetNext();
-  }
-}
-
-void wxShape::AssignNewIds()
-{
-//  if (m_id == 0)
-  m_id = wxNewId();
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    child->AssignNewIds();
-    node = node->GetNext();
-  }
-}
-
-void wxShape::OnDraw(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxShape::OnMoveLinks(wxDC& dc)
-{
-  // Want to set the ends of all attached links
-  // to point to/from this object
-
-  wxNode *current = m_lines.GetFirst();
-  while (current)
-  {
-    wxLineShape *line = (wxLineShape *)current->GetData();
-    line->GetEventHandler()->OnMoveLink(dc);
-    current = current->GetNext();
-  }
-}
-
-
-void wxShape::OnDrawContents(wxDC& dc)
-{
-  double bound_x, bound_y;
-  GetBoundingBoxMin(&bound_x, &bound_y);
-    if (m_regions.GetCount() < 1) return;
-
-    if (m_pen) dc.SetPen(* m_pen);
-
-    wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();
-    if (region->GetFont()) dc.SetFont(* region->GetFont());
-
-    dc.SetTextForeground(region->GetActualColourObject());
-    dc.SetBackgroundMode(wxTRANSPARENT);
-    if (!m_formatted)
-    {
-      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
-      m_formatted = true;
-    }
-    if (!GetDisableLabel())
-    {
-      oglDrawFormattedText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
-    }
-}
-
-void wxShape::DrawContents(wxDC& dc)
-{
-  GetEventHandler()->OnDrawContents(dc);
-}
-
-void wxShape::OnSize(double WXUNUSED(x), double WXUNUSED(y))
-{
-}
-
-bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
-{
-  return true;
-}
-
-void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
-{
-}
-
-void wxShape::OnErase(wxDC& dc)
-{
-  if (!m_visible)
-    return;
-
-  // Erase links
-  wxNode *current = m_lines.GetFirst();
-  while (current)
-  {
-    wxLineShape *line = (wxLineShape *)current->GetData();
-    line->GetEventHandler()->OnErase(dc);
-    current = current->GetNext();
-  }
-  GetEventHandler()->OnEraseContents(dc);
-}
-
-void wxShape::OnEraseContents(wxDC& dc)
-{
-  if (!m_visible)
-    return;
-
-  double maxX, maxY, minX, minY;
-  double xp = GetX();
-  double yp = GetY();
-  GetBoundingBoxMin(&minX, &minY);
-  GetBoundingBoxMax(&maxX, &maxY);
-  double topLeftX = (double)(xp - (maxX / 2.0) - 2.0);
-  double topLeftY = (double)(yp - (maxY / 2.0) - 2.0);
-
-    int penWidth = 0;
-    if (m_pen)
-      penWidth = m_pen->GetWidth();
-
-    dc.SetPen(GetBackgroundPen());
-    dc.SetBrush(GetBackgroundBrush());
-
-    dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
-                      WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
-}
-
-void wxShape::EraseLinks(wxDC& dc, int attachment, bool recurse)
-{
-  if (!m_visible)
-    return;
-
-  wxNode *current = m_lines.GetFirst();
-  while (current)
-  {
-    wxLineShape *line = (wxLineShape *)current->GetData();
-    if (attachment == -1 || ((line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
-                             (line->GetFrom() == this && line->GetAttachmentFrom() == attachment)))
-      line->GetEventHandler()->OnErase(dc);
-    current = current->GetNext();
-  }
-  if (recurse)
-  {
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->EraseLinks(dc, attachment, recurse);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::DrawLinks(wxDC& dc, int attachment, bool recurse)
-{
-  if (!m_visible)
-    return;
-
-  wxNode *current = m_lines.GetFirst();
-  while (current)
-  {
-    wxLineShape *line = (wxLineShape *)current->GetData();
-    if (attachment == -1 ||
-        (line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
-        (line->GetFrom() == this && line->GetAttachmentFrom() == attachment))
-      line->Draw(dc);
-    current = current->GetNext();
-  }
-  if (recurse)
-  {
-    wxNode *node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->DrawLinks(dc, attachment, recurse);
-      node = node->GetNext();
-    }
-  }
-}
-
-// Returns true if pt1 <= pt2 in the sense that one point comes before another on an
-// edge of the shape.
-// attachmentPoint is the attachment point (= side) in question.
-
-// This is the default, rectangular implementation.
-bool wxShape::AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2)
-{
-    int physicalAttachment = LogicalToPhysicalAttachment(attachmentPoint);
-    switch (physicalAttachment)
-    {
-        case 0:
-        case 2:
-        {
-          return (pt1.x <= pt2.x) ;
-        }
-        case 1:
-        case 3:
-        {
-          return (pt1.y <= pt2.y) ;
-        }
-    }
-
-    return false;
-}
-
-bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
-                                       double x, double y)
-{
-  if (GetAttachmentMode() == ATTACHMENT_MODE_NONE)
-      return false;
-
-  int newAttachment, oldAttachment;
-  double distance;
-
-  // Is (x, y) on this object? If so, find the new attachment point
-  // the user has moved the point to
-  bool hit = HitTest(x, y, &newAttachment, &distance);
-  if (!hit)
-    return false;
-
-  EraseLinks(dc);
-
-  if (to_move->GetTo() == this)
-    oldAttachment = to_move->GetAttachmentTo();
-  else
-    oldAttachment = to_move->GetAttachmentFrom();
-
-  // The links in a new ordering.
-  wxList newOrdering;
-
-  // First, add all links to the new list.
-  wxNode *node = m_lines.GetFirst();
-  while (node)
-  {
-    newOrdering.Append(node->GetData());
-    node = node->GetNext();
-  }
-
-  // Delete the line object from the list of links; we're going to move
-  // it to another position in the list
-  newOrdering.DeleteObject(to_move);
-
-  double old_x = (double) -99999.9;
-  double old_y = (double) -99999.9;
-
-  node = newOrdering.GetFirst();
-  bool found = false;
-
-  while (!found && node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    if ((line->GetTo() == this && oldAttachment == line->GetAttachmentTo()) ||
-        (line->GetFrom() == this && oldAttachment == line->GetAttachmentFrom()))
-    {
-      double startX, startY, endX, endY;
-      double xp, yp;
-      line->GetEnds(&startX, &startY, &endX, &endY);
-      if (line->GetTo() == this)
-      {
-        xp = endX;
-        yp = endY;
-      } else
-      {
-        xp = startX;
-        yp = startY;
-      }
-
-      wxRealPoint thisPoint(xp, yp);
-      wxRealPoint lastPoint(old_x, old_y);
-      wxRealPoint newPoint(x, y);
-
-      if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint))
-      {
-        found = true;
-        newOrdering.Insert(node, to_move);
-      }
-
-      old_x = xp;
-      old_y = yp;
-    }
-    node = node->GetNext();
-  }
-
-  if (!found)
-    newOrdering.Append(to_move);
-
-  GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
-
-  return true;
-}
-
-void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
-{
-    if (line->GetTo() == this)
-        line->SetAttachmentTo(attachment);
-    else
-        line->SetAttachmentFrom(attachment);
-
-    ApplyAttachmentOrdering(ordering);
-
-    wxClientDC dc(GetCanvas());
-    GetCanvas()->PrepareDC(dc);
-
-    MoveLinks(dc);
-
-    if (!GetCanvas()->GetQuickEditMode()) GetCanvas()->Redraw(dc);
-}
-
-// Reorders the lines according to the given list.
-void wxShape::ApplyAttachmentOrdering(wxList& linesToSort)
-{
-  // This is a temporary store of all the lines.
-  wxList linesStore;
-
-  wxNode *node = m_lines.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    linesStore.Append(line);
-    node = node->GetNext();;
-  }
-
-  m_lines.Clear();
-
-  node = linesToSort.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    if (linesStore.Member(line))
-    {
-      // Done this one
-      linesStore.DeleteObject(line);
-      m_lines.Append(line);
-    }
-    node = node->GetNext();
-  }
-
-  // Now add any lines that haven't been listed in linesToSort.
-  node = linesStore.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    m_lines.Append(line);
-    node = node->GetNext();
-  }
-}
-
-// Reorders the lines coming into the node image at this attachment
-// position, in the order in which they appear in linesToSort.
-// Any remaining lines not in the list will be added to the end.
-void wxShape::SortLines(int attachment, wxList& linesToSort)
-{
-  // This is a temporary store of all the lines at this attachment
-  // point. We'll tick them off as we've processed them.
-  wxList linesAtThisAttachment;
-
-  wxNode *node = m_lines.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    wxNode *next = node->GetNext();
-    if ((line->GetTo() == this && line->GetAttachmentTo() == attachment) ||
-        (line->GetFrom() == this && line->GetAttachmentFrom() == attachment))
-    {
-      linesAtThisAttachment.Append(line);
-      delete node;
-      node = next;
-    }
-    else node = node->GetNext();
-  }
-
-  node = linesToSort.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    if (linesAtThisAttachment.Member(line))
-    {
-      // Done this one
-      linesAtThisAttachment.DeleteObject(line);
-      m_lines.Append(line);
-    }
-    node = node->GetNext();
-  }
-
-  // Now add any lines that haven't been listed in linesToSort.
-  node = linesAtThisAttachment.GetFirst();
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-    m_lines.Append(line);
-    node = node->GetNext();
-  }
-}
-
-void wxShape::OnHighlight(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxShape::OnLeftClick(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_CLICK_LEFT) != OP_CLICK_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnLeftClick(x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-void wxShape::OnRightClick(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_CLICK_RIGHT) != OP_CLICK_RIGHT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnRightClick(x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-double DragOffsetX = 0.0;
-double DragOffsetY = 0.0;
-
-void wxShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnDragLeft(draw, x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-  double xx, yy;
-  xx = x + DragOffsetX;
-  yy = y + DragOffsetY;
-
-  m_canvas->Snap(&xx, &yy);
-//  m_xpos = xx; m_ypos = yy;
-  double w, h;
-  GetBoundingBoxMax(&w, &h);
-  GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-}
-
-void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnBeginDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  DragOffsetX = m_xpos - x;
-  DragOffsetY = m_ypos - y;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  // New policy: don't erase shape until end of drag.
-//  Erase(dc);
-
-  double xx, yy;
-  xx = x + DragOffsetX;
-  yy = y + DragOffsetY;
-  m_canvas->Snap(&xx, &yy);
-//  m_xpos = xx; m_ypos = yy;
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  double w, h;
-  GetBoundingBoxMax(&w, &h);
-  GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
-  m_canvas->CaptureMouse();
-}
-
-void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  if (!m_draggable)
-    return;
-  m_canvas->ReleaseMouse();
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnEndDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(wxCOPY);
-
-  double xx = x + DragOffsetX;
-  double yy = y + DragOffsetY;
-  m_canvas->Snap(&xx, &yy);
-//  canvas->Snap(&m_xpos, &m_ypos);
-
-  // New policy: erase shape at end of drag.
-  Erase(dc);
-
-  Move(dc, xx, yy);
-  if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-
-void wxShape::OnDragRight(bool draw, double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnDragRight(draw, x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-void wxShape::OnBeginDragRight(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnBeginDragRight(x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-void wxShape::OnEndDragRight(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_RIGHT) != OP_DRAG_RIGHT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnEndDragRight(x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-void wxShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
-  double top_left_x = (double)(x - w/2.0);
-  double top_left_y = (double)(y - h/2.0);
-  double top_right_x = (double)(top_left_x + w);
-  double top_right_y = (double)top_left_y;
-  double bottom_left_x = (double)top_left_x;
-  double bottom_left_y = (double)(top_left_y + h);
-  double bottom_right_x = (double)top_right_x;
-  double bottom_right_y = (double)bottom_left_y;
-
-  wxPoint points[5];
-  points[0].x = WXROUND(top_left_x); points[0].y = WXROUND(top_left_y);
-  points[1].x = WXROUND(top_right_x); points[1].y = WXROUND(top_right_y);
-  points[2].x = WXROUND(bottom_right_x); points[2].y = WXROUND(bottom_right_y);
-  points[3].x = WXROUND(bottom_left_x); points[3].y = WXROUND(bottom_left_y);
-  points[4].x = WXROUND(top_left_x); points[4].y = WXROUND(top_left_y);
-
-  dc.DrawLines(5, points);
-}
-
-void wxShape::Attach(wxShapeCanvas *can)
-{
-  m_canvas = can;
-}
-
-void wxShape::Detach()
-{
-  m_canvas = NULL;
-}
-
-void wxShape::Move(wxDC& dc, double x, double y, bool display)
-{
-  double old_x = m_xpos;
-  double old_y = m_ypos;
-
-  if (!GetEventHandler()->OnMovePre(dc, x, y, old_x, old_y, display))
-  {
-//    m_xpos = old_x;
-//    m_ypos = old_y;
-    return;
-  }
-
-  m_xpos = x; m_ypos = y;
-
-  ResetControlPoints();
-
-  if (display)
-    Draw(dc);
-
-  MoveLinks(dc);
-
-  GetEventHandler()->OnMovePost(dc, x, y, old_x, old_y, display);
-}
-
-void wxShape::MoveLinks(wxDC& dc)
-{
-  GetEventHandler()->OnMoveLinks(dc);
-}
-
-
-void wxShape::Draw(wxDC& dc)
-{
-  if (m_visible)
-  {
-    GetEventHandler()->OnDraw(dc);
-    GetEventHandler()->OnDrawContents(dc);
-    GetEventHandler()->OnDrawControlPoints(dc);
-    GetEventHandler()->OnDrawBranches(dc);
-  }
-}
-
-void wxShape::Flash()
-{
-    if (GetCanvas())
-    {
-        wxClientDC dc(GetCanvas());
-        GetCanvas()->PrepareDC(dc);
-
-        dc.SetLogicalFunction(OGLRBLF);
-        Draw(dc);
-        dc.SetLogicalFunction(wxCOPY);
-        Draw(dc);
-    }
-}
-
-void wxShape::Show(bool show)
-{
-  m_visible = show;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *image = (wxShape *)node->GetData();
-    image->Show(show);
-    node = node->GetNext();
-  }
-}
-
-void wxShape::Erase(wxDC& dc)
-{
-  GetEventHandler()->OnErase(dc);
-  GetEventHandler()->OnEraseControlPoints(dc);
-  GetEventHandler()->OnDrawBranches(dc, true);
-}
-
-void wxShape::EraseContents(wxDC& dc)
-{
-  GetEventHandler()->OnEraseContents(dc);
-}
-
-void wxShape::AddText(const wxString& string)
-{
-  wxNode *node = m_regions.GetFirst();
-  if (!node)
-    return;
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->ClearText();
-  wxShapeTextLine *new_line =
-      new wxShapeTextLine(0.0, 0.0, string);
-  region->GetFormattedText().Append(new_line);
-
-  m_formatted = false;
-}
-
-void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(x, y);
-  SetDefaultRegionSize();
-}
-
-void wxShape::SetAttachmentSize(double w, double h)
-{
-  double scaleX;
-  double scaleY;
-  double width, height;
-  GetBoundingBoxMin(&width, &height);
-  if (width == 0.0)
-    scaleX = 1.0;
-  else scaleX = w/width;
-  if (height == 0.0)
-    scaleY = 1.0;
-  else scaleY = h/height;
-
-  wxNode *node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    point->m_x = (double)(point->m_x * scaleX);
-    point->m_y = (double)(point->m_y * scaleY);
-    node = node->GetNext();
-  }
-}
-
-// Add line FROM this object
-void wxShape::AddLine(wxLineShape *line, wxShape *other,
-                            int attachFrom, int attachTo,
-                            // The line ordering
-                            int positionFrom, int positionTo)
-{
-    if (positionFrom == -1)
-    {
-        if (!m_lines.Member(line))
-            m_lines.Append(line);
-    }
-    else
-    {
-        // Don't preserve old ordering if we have new ordering instructions
-        m_lines.DeleteObject(line);
-        if (positionFrom < (int) m_lines.GetCount())
-        {
-            wxNode* node = m_lines.Item(positionFrom);
-            m_lines.Insert(node, line);
-        }
-        else
-            m_lines.Append(line);
-    }
-
-    if (positionTo == -1)
-    {
-        if (!other->m_lines.Member(line))
-            other->m_lines.Append(line);
-    }
-    else
-    {
-        // Don't preserve old ordering if we have new ordering instructions
-        other->m_lines.DeleteObject(line);
-        if (positionTo < (int) other->m_lines.GetCount())
-        {
-            wxNode* node = other->m_lines.Item(positionTo);
-            other->m_lines.Insert(node, line);
-        }
-        else
-            other->m_lines.Append(line);
-    }
-#if 0
-    // Wrong: doesn't preserve ordering of shape already linked
-    m_lines.DeleteObject(line);
-    other->m_lines.DeleteObject(line);
-
-    if (positionFrom == -1)
-        m_lines.Append(line);
-    else
-    {
-        if (positionFrom < m_lines.GetCount())
-        {
-            wxNode* node = m_lines.Item(positionFrom);
-            m_lines.Insert(node, line);
-        }
-        else
-            m_lines.Append(line);
-    }
-
-    if (positionTo == -1)
-        other->m_lines.Append(line);
-    else
-    {
-        if (positionTo < other->m_lines.GetCount())
-        {
-            wxNode* node = other->m_lines.Item(positionTo);
-            other->m_lines.Insert(node, line);
-        }
-        else
-            other->m_lines.Append(line);
-    }
-#endif
-
-    line->SetFrom(this);
-    line->SetTo(other);
-    line->SetAttachments(attachFrom, attachTo);
-}
-
-void wxShape::RemoveLine(wxLineShape *line)
-{
-  if (line->GetFrom() == this)
-    line->GetTo()->m_lines.DeleteObject(line);
-  else
-   line->GetFrom()->m_lines.DeleteObject(line);
-
-  m_lines.DeleteObject(line);
-}
-
-#if wxUSE_PROLOGIO
-void wxShape::WriteAttributes(wxExpr *clause)
-{
-  clause->AddAttributeValueString(_T("type"), GetClassInfo()->GetClassName());
-  clause->AddAttributeValue(_T("id"), m_id);
-
-  if (m_pen)
-  {
-    int penWidth = m_pen->GetWidth();
-    int penStyle = m_pen->GetStyle();
-    if (penWidth != 1)
-      clause->AddAttributeValue(_T("pen_width"), (long)penWidth);
-    if (penStyle != wxSOLID)
-      clause->AddAttributeValue(_T("pen_style"), (long)penStyle);
-
-    wxString penColour = wxTheColourDatabase->FindName(m_pen->GetColour());
-    if (penColour == wxEmptyString)
-    {
-      wxString hex(oglColourToHex(m_pen->GetColour()));
-      hex = wxString(_T("#")) + hex;
-      clause->AddAttributeValueString(_T("pen_colour"), hex);
-    }
-    else if (penColour != _T("BLACK"))
-      clause->AddAttributeValueString(_T("pen_colour"), penColour);
-  }
-
-  if (m_brush)
-  {
-    wxString brushColour = wxTheColourDatabase->FindName(m_brush->GetColour());
-
-    if (brushColour == wxEmptyString)
-    {
-      wxString hex(oglColourToHex(m_brush->GetColour()));
-      hex = wxString(_T("#")) + hex;
-      clause->AddAttributeValueString(_T("brush_colour"), hex);
-    }
-    else if (brushColour != _T("WHITE"))
-      clause->AddAttributeValueString(_T("brush_colour"), brushColour);
-
-    if (m_brush->GetStyle() != wxSOLID)
-      clause->AddAttributeValue(_T("brush_style"), (long)m_brush->GetStyle());
-  }
-
-  // Output line ids
-
-  int n_lines = m_lines.GetCount();
-  if (n_lines > 0)
-  {
-    wxExpr *list = new wxExpr(wxExprList);
-    wxNode *node = m_lines.GetFirst();
-    while (node)
-    {
-      wxShape *line = (wxShape *)node->GetData();
-      wxExpr *id_expr = new wxExpr(line->GetId());
-      list->Append(id_expr);
-      node = node->GetNext();
-    }
-    clause->AddAttributeValue(_T("arcs"), list);
-  }
-
-  // Miscellaneous members
-  if (m_attachmentMode != 0)
-    clause->AddAttributeValue(_T("use_attachments"), (long)m_attachmentMode);
-  if (m_sensitivity != OP_ALL)
-    clause->AddAttributeValue(_T("sensitivity"), (long)m_sensitivity);
-  if (!m_spaceAttachments)
-    clause->AddAttributeValue(_T("space_attachments"), (long)m_spaceAttachments);
-  if (m_fixedWidth)
-    clause->AddAttributeValue(_T("fixed_width"), (long)m_fixedWidth);
-  if (m_fixedHeight)
-    clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight);
-  if (m_shadowMode != SHADOW_NONE)
-    clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode);
-  if (m_centreResize != true)
-    clause->AddAttributeValue(_T("centre_resize"), (long)0);
-  clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio);
-  if (m_highlighted != false)
-    clause->AddAttributeValue(_T("hilite"), (long)m_highlighted);
-
-  if (m_parent) // For composite objects
-    clause->AddAttributeValue(_T("parent"), (long)m_parent->GetId());
-
-  if (m_rotation != 0.0)
-    clause->AddAttributeValue(_T("rotation"), m_rotation);
-
-  if (!this->IsKindOf(CLASSINFO(wxLineShape)))
-  {
-    clause->AddAttributeValue(_T("neck_length"), (long) m_branchNeckLength);
-    clause->AddAttributeValue(_T("stem_length"), (long) m_branchStemLength);
-    clause->AddAttributeValue(_T("branch_spacing"), (long) m_branchSpacing);
-    clause->AddAttributeValue(_T("branch_style"), (long) m_branchStyle);
-  }
-
-  // Write user-defined attachment points, if any
-  if (m_attachmentPoints.GetCount() > 0)
-  {
-    wxExpr *attachmentList = new wxExpr(wxExprList);
-    wxNode *node = m_attachmentPoints.GetFirst();
-    while (node)
-    {
-      wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-      wxExpr *pointExpr = new wxExpr(wxExprList);
-      pointExpr->Append(new wxExpr((long)point->m_id));
-      pointExpr->Append(new wxExpr(point->m_x));
-      pointExpr->Append(new wxExpr(point->m_y));
-      attachmentList->Append(pointExpr);
-      node = node->GetNext();
-    }
-    clause->AddAttributeValue(_T("user_attachments"), attachmentList);
-  }
-
-  // Write text regions
-  WriteRegions(clause);
-}
-
-void wxShape::WriteRegions(wxExpr *clause)
-{
-  // Output regions as region1 = (...), region2 = (...), etc
-  // and formatted text as text1 = (...), text2 = (...) etc.
-  int regionNo = 1;
-  wxChar regionNameBuf[20];
-  wxChar textNameBuf[20];
-  wxNode *node = m_regions.GetFirst();
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    wxSprintf(regionNameBuf, _T("region%d"), regionNo);
-    wxSprintf(textNameBuf, _T("text%d"), regionNo);
-
-    // Original text and region attributes:
-    // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
-    //            formatMode fontSize fontFamily fontStyle fontWeight textColour)
-    wxExpr *regionExpr = new wxExpr(wxExprList);
-    regionExpr->Append(new wxExpr(wxExprString, region->m_regionName));
-    regionExpr->Append(new wxExpr(wxExprString, region->m_regionText));
-
-    regionExpr->Append(new wxExpr(region->m_x));
-    regionExpr->Append(new wxExpr(region->m_y));
-    regionExpr->Append(new wxExpr(region->GetWidth()));
-    regionExpr->Append(new wxExpr(region->GetHeight()));
-
-    regionExpr->Append(new wxExpr(region->m_minWidth));
-    regionExpr->Append(new wxExpr(region->m_minHeight));
-    regionExpr->Append(new wxExpr(region->m_regionProportionX));
-    regionExpr->Append(new wxExpr(region->m_regionProportionY));
-
-    regionExpr->Append(new wxExpr((long)region->m_formatMode));
-
-    regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetPointSize() : 10)));
-    regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetFamily() : wxDEFAULT)));
-    regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetStyle() : wxDEFAULT)));
-    regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetWeight() : wxNORMAL)));
-    regionExpr->Append(new wxExpr(wxExprString, region->m_textColour));
-
-    // New members for pen colour/style
-    regionExpr->Append(new wxExpr(wxExprString, region->m_penColour));
-    regionExpr->Append(new wxExpr((long)region->m_penStyle));
-
-    // Formatted text:
-    // text1 = ((x y string) (x y string) ...)
-    wxExpr *textExpr = new wxExpr(wxExprList);
-
-    wxNode *textNode = region->m_formattedText.GetFirst();
-    while (textNode)
-    {
-      wxShapeTextLine *line = (wxShapeTextLine *)textNode->GetData();
-      wxExpr *list2 = new wxExpr(wxExprList);
-      list2->Append(new wxExpr(line->GetX()));
-      list2->Append(new wxExpr(line->GetY()));
-      list2->Append(new wxExpr(wxExprString, line->GetText()));
-      textExpr->Append(list2);
-      textNode = textNode->GetNext();
-    }
-
-    // Now add both attributes to the clause
-    clause->AddAttributeValue(regionNameBuf, regionExpr);
-    clause->AddAttributeValue(textNameBuf, textExpr);
-
-    node = node->GetNext();
-    regionNo ++;
-  }
-}
-
-void wxShape::ReadAttributes(wxExpr *clause)
-{
-  clause->GetAttributeValue(_T("id"), m_id);
-  wxRegisterId(m_id);
-
-  clause->GetAttributeValue(_T("x"), m_xpos);
-  clause->GetAttributeValue(_T("y"), m_ypos);
-
-  // Input text strings (FOR COMPATIBILITY WITH OLD FILES ONLY. SEE REGION CODE BELOW.)
-  ClearText();
-  wxExpr *strings = clause->AttributeValue(_T("text"));
-  if (strings && strings->Type() == wxExprList)
-  {
-    m_formatted = true;  // Assume text is formatted unless we prove otherwise
-    wxExpr *node = strings->value.first;
-    while (node)
-    {
-      wxExpr *string_expr = node;
-      double the_x = 0.0;
-      double the_y = 0.0;
-      wxString the_string = wxEmptyString;
-
-      // string_expr can either be a string, or a list of
-      // 3 elements: x, y, and string.
-      if (string_expr->Type() == wxExprString)
-      {
-        the_string = string_expr->StringValue();
-        m_formatted = false;
-      }
-      else if (string_expr->Type() == wxExprList)
-      {
-        wxExpr *first = string_expr->value.first;
-        wxExpr *second = first ? first->next : (wxExpr*) NULL;
-        wxExpr *third = second ? second->next : (wxExpr*) NULL;
-
-        if (first && second && third &&
-            (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
-            (second->Type() == wxExprReal || second->Type() == wxExprInteger) &&
-            third->Type() == wxExprString)
-          {
-            if (first->Type() == wxExprReal)
-              the_x = first->RealValue();
-            else the_x = (double)first->IntegerValue();
-
-            if (second->Type() == wxExprReal)
-              the_y = second->RealValue();
-            else the_y = (double)second->IntegerValue();
-
-            the_string = third->StringValue();
-          }
-      }
-      wxShapeTextLine *line =
-            new wxShapeTextLine(the_x, the_y, the_string);
-      m_text.Append(line);
-
-      node = node->next;
-    }
-  }
-
-  wxString pen_string = wxEmptyString;
-  wxString brush_string = wxEmptyString;
-  int pen_width = 1;
-  int pen_style = wxSOLID;
-  int brush_style = wxSOLID;
-  m_attachmentMode = ATTACHMENT_MODE_NONE;
-
-  clause->GetAttributeValue(_T("pen_colour"), pen_string);
-  clause->GetAttributeValue(_T("text_colour"), m_textColourName);
-
-  SetTextColour(m_textColourName);
-
-  clause->GetAttributeValue(_T("region_name"), m_regionName);
-
-  clause->GetAttributeValue(_T("brush_colour"), brush_string);
-  clause->GetAttributeValue(_T("pen_width"), pen_width);
-  clause->GetAttributeValue(_T("pen_style"), pen_style);
-  clause->GetAttributeValue(_T("brush_style"), brush_style);
-
-  int iVal = (int) m_attachmentMode;
-  clause->GetAttributeValue(_T("use_attachments"), iVal);
-  m_attachmentMode = iVal;
-
-  clause->GetAttributeValue(_T("sensitivity"), m_sensitivity);
-
-  iVal = (int) m_spaceAttachments;
-  clause->GetAttributeValue(_T("space_attachments"), iVal);
-  m_spaceAttachments = (iVal != 0);
-
-  iVal = (int) m_fixedWidth;
-  clause->GetAttributeValue(_T("fixed_width"), iVal);
-  m_fixedWidth = (iVal != 0);
-
-  iVal = (int) m_fixedHeight;
-  clause->GetAttributeValue(_T("fixed_height"), iVal);
-  m_fixedHeight = (iVal != 0);
-
-  clause->GetAttributeValue(_T("format_mode"), m_formatMode);
-  clause->GetAttributeValue(_T("shadow_mode"), m_shadowMode);
-
-  iVal = m_branchNeckLength;
-  clause->GetAttributeValue(_T("neck_length"), iVal);
-  m_branchNeckLength = iVal;
-
-  iVal = m_branchStemLength;
-  clause->GetAttributeValue(_T("stem_length"), iVal);
-  m_branchStemLength = iVal;
-
-  iVal = m_branchSpacing;
-  clause->GetAttributeValue(_T("branch_spacing"), iVal);
-  m_branchSpacing = iVal;
-
-  clause->GetAttributeValue(_T("branch_style"), m_branchStyle);
-
-  iVal = (int) m_centreResize;
-  clause->GetAttributeValue(_T("centre_resize"), iVal);
-  m_centreResize = (iVal != 0);
-
-  iVal = (int) m_maintainAspectRatio;
-  clause->GetAttributeValue(_T("maintain_aspect_ratio"), iVal);
-  m_maintainAspectRatio = (iVal != 0);
-
-  iVal = (int) m_highlighted;
-  clause->GetAttributeValue(_T("hilite"), iVal);
-  m_highlighted = (iVal != 0);
-
-  clause->GetAttributeValue(_T("rotation"), m_rotation);
-
-  if (pen_string == wxEmptyString)
-    pen_string = _T("BLACK");
-  if (brush_string == wxEmptyString)
-    brush_string = _T("WHITE");
-
-  if (pen_string.GetChar(0) == '#')
-  {
-    wxColour col(oglHexToColour(pen_string.After('#')));
-    m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);
-  }
-  else
-    m_pen = wxThePenList->FindOrCreatePen(pen_string, pen_width, pen_style);
-
-  if (!m_pen)
-    m_pen = wxBLACK_PEN;
-
-  if (brush_string.GetChar(0) == '#')
-  {
-    wxColour col(oglHexToColour(brush_string.After('#')));
-    m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);
-  }
-  else
-    m_brush = wxTheBrushList->FindOrCreateBrush(brush_string, brush_style);
-
-  if (!m_brush)
-    m_brush = wxWHITE_BRUSH;
-
-  int point_size = 10;
-  clause->GetAttributeValue(_T("point_size"), point_size);
-  SetFont(oglMatchFont(point_size));
-
-  // Read user-defined attachment points, if any
-  wxExpr *attachmentList = clause->AttributeValue(_T("user_attachments"));
-  if (attachmentList)
-  {
-    wxExpr *pointExpr = attachmentList->GetFirst();
-    while (pointExpr)
-    {
-      wxExpr *idExpr = pointExpr->Nth(0);
-      wxExpr *xExpr = pointExpr->Nth(1);
-      wxExpr *yExpr = pointExpr->Nth(2);
-      if (idExpr && xExpr && yExpr)
-      {
-        wxAttachmentPoint *point = new wxAttachmentPoint;
-        point->m_id = (int)idExpr->IntegerValue();
-        point->m_x = xExpr->RealValue();
-        point->m_y = yExpr->RealValue();
-        m_attachmentPoints.Append((wxObject *)point);
-      }
-      pointExpr = pointExpr->GetNext();
-    }
-  }
-
-  // Read text regions
-  ReadRegions(clause);
-}
-
-void wxShape::ReadRegions(wxExpr *clause)
-{
-  ClearRegions();
-
-  // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
-  //            formatMode fontSize fontFamily fontStyle fontWeight textColour)
-  int regionNo = 1;
-  wxChar regionNameBuf[20];
-  wxChar textNameBuf[20];
-
-  wxExpr *regionExpr;
-  wxExpr *textExpr = NULL;
-  wxSprintf(regionNameBuf, _T("region%d"), regionNo);
-  wxSprintf(textNameBuf, _T("text%d"), regionNo);
-
-  m_formatted = true;  // Assume text is formatted unless we prove otherwise
-
-  while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL)
-  {
-    /*
-     * Get the region information
-     *
-     */
-
-    wxString regionName = wxEmptyString;
-    wxString regionText = wxEmptyString;
-    double x = 0.0;
-    double y = 0.0;
-    double width = 0.0;
-    double height = 0.0;
-    double minWidth = 5.0;
-    double minHeight = 5.0;
-    double m_regionProportionX = -1.0;
-    double m_regionProportionY = -1.0;
-    int formatMode = FORMAT_NONE;
-    int fontSize = 10;
-    int fontFamily = wxSWISS;
-    int fontStyle = wxNORMAL;
-    int fontWeight = wxNORMAL;
-    wxString regionTextColour = wxEmptyString;
-    wxString penColour = wxEmptyString;
-    int penStyle = wxSOLID;
-
-    if (regionExpr->Type() == wxExprList)
-    {
-      wxExpr *nameExpr = regionExpr->Nth(0);
-      wxExpr *textExpr = regionExpr->Nth(1);
-      wxExpr *xExpr = regionExpr->Nth(2);
-      wxExpr *yExpr = regionExpr->Nth(3);
-      wxExpr *widthExpr = regionExpr->Nth(4);
-      wxExpr *heightExpr = regionExpr->Nth(5);
-      wxExpr *minWidthExpr = regionExpr->Nth(6);
-      wxExpr *minHeightExpr = regionExpr->Nth(7);
-      wxExpr *propXExpr = regionExpr->Nth(8);
-      wxExpr *propYExpr = regionExpr->Nth(9);
-      wxExpr *formatExpr = regionExpr->Nth(10);
-      wxExpr *sizeExpr = regionExpr->Nth(11);
-      wxExpr *familyExpr = regionExpr->Nth(12);
-      wxExpr *styleExpr = regionExpr->Nth(13);
-      wxExpr *weightExpr = regionExpr->Nth(14);
-      wxExpr *colourExpr = regionExpr->Nth(15);
-      wxExpr *penColourExpr = regionExpr->Nth(16);
-      wxExpr *penStyleExpr = regionExpr->Nth(17);
-
-      regionName = nameExpr->StringValue();
-      regionText = textExpr->StringValue();
-
-      x = xExpr->RealValue();
-      y = yExpr->RealValue();
-
-      width = widthExpr->RealValue();
-      height = heightExpr->RealValue();
-
-      minWidth = minWidthExpr->RealValue();
-      minHeight = minHeightExpr->RealValue();
-
-      m_regionProportionX = propXExpr->RealValue();
-      m_regionProportionY = propYExpr->RealValue();
-
-      formatMode = (int) formatExpr->IntegerValue();
-      fontSize = (int)sizeExpr->IntegerValue();
-      fontFamily = (int)familyExpr->IntegerValue();
-      fontStyle = (int)styleExpr->IntegerValue();
-      fontWeight = (int)weightExpr->IntegerValue();
-
-      if (colourExpr)
-      {
-        regionTextColour = colourExpr->StringValue();
-      }
-      else
-        regionTextColour = _T("BLACK");
-
-      if (penColourExpr)
-        penColour = penColourExpr->StringValue();
-      if (penStyleExpr)
-        penStyle = (int)penStyleExpr->IntegerValue();
-    }
-    wxFont *font = wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight);
-
-    wxShapeRegion *region = new wxShapeRegion;
-    region->SetProportions(m_regionProportionX, m_regionProportionY);
-    region->SetFont(font);
-    region->SetSize(width, height);
-    region->SetPosition(x, y);
-    region->SetMinSize(minWidth, minHeight);
-    region->SetFormatMode(formatMode);
-    region->SetPenStyle(penStyle);
-    if (penColour != wxEmptyString)
-      region->SetPenColour(penColour);
-
-    region->m_textColour = regionTextColour;
-    region->m_regionText = regionText;
-    region->m_regionName = regionName;
-
-    m_regions.Append(region);
-
-    /*
-     * Get the formatted text strings
-     *
-     */
-    textExpr = clause->AttributeValue(textNameBuf);
-    if (textExpr && (textExpr->Type() == wxExprList))
-    {
-      wxExpr *node = textExpr->value.first;
-      while (node)
-      {
-        wxExpr *string_expr = node;
-        double the_x = 0.0;
-        double the_y = 0.0;
-        wxString the_string = wxEmptyString;
-
-        // string_expr can either be a string, or a list of
-        // 3 elements: x, y, and string.
-        if (string_expr->Type() == wxExprString)
-        {
-          the_string = string_expr->StringValue();
-          m_formatted = false;
-        }
-        else if (string_expr->Type() == wxExprList)
-        {
-          wxExpr *first = string_expr->value.first;
-          wxExpr *second = first ? first->next : (wxExpr*) NULL;
-          wxExpr *third = second ? second->next : (wxExpr*) NULL;
-
-          if (first && second && third &&
-              (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
-              (second->Type() == wxExprReal || second->Type() == wxExprInteger) &&
-              third->Type() == wxExprString)
-          {
-            if (first->Type() == wxExprReal)
-              the_x = first->RealValue();
-            else the_x = (double)first->IntegerValue();
-
-            if (second->Type() == wxExprReal)
-              the_y = second->RealValue();
-            else the_y = (double)second->IntegerValue();
-
-            the_string = third->StringValue();
-          }
-        }
-        if (the_string)
-        {
-          wxShapeTextLine *line =
-              new wxShapeTextLine(the_x, the_y, the_string);
-          region->m_formattedText.Append(line);
-        }
-        node = node->next;
-      }
-    }
-
-    regionNo ++;
-    wxSprintf(regionNameBuf, _T("region%d"), regionNo);
-    wxSprintf(textNameBuf, _T("text%d"), regionNo);
-  }
-
-  // Compatibility: check for no regions (old file).
-  // Lines and divided rectangles must deal with this compatibility
-  // theirselves. Composites _may_ not have any regions anyway.
-  if ((m_regions.GetCount() == 0) &&
-      !this->IsKindOf(CLASSINFO(wxLineShape)) && !this->IsKindOf(CLASSINFO(wxDividedShape)) &&
-      !this->IsKindOf(CLASSINFO(wxCompositeShape)))
-  {
-    wxShapeRegion *newRegion = new wxShapeRegion;
-    newRegion->SetName(_T("0"));
-    m_regions.Append((wxObject *)newRegion);
-    if (m_text.GetCount() > 0)
-    {
-      newRegion->ClearText();
-      wxNode *node = m_text.GetFirst();
-      while (node)
-      {
-        wxShapeTextLine *textLine = (wxShapeTextLine *)node->GetData();
-        wxNode *next = node->GetNext();
-        newRegion->GetFormattedText().Append((wxObject *)textLine);
-        delete node;
-        node = next;
-      }
-    }
-  }
-}
-
-#endif
-
-void wxShape::Copy(wxShape& copy)
-{
-  copy.m_id = m_id;
-  copy.m_xpos = m_xpos;
-  copy.m_ypos = m_ypos;
-  copy.m_pen = m_pen;
-  copy.m_brush = m_brush;
-  copy.m_textColour = m_textColour;
-  copy.m_centreResize = m_centreResize;
-  copy.m_maintainAspectRatio = m_maintainAspectRatio;
-  copy.m_attachmentMode = m_attachmentMode;
-  copy.m_spaceAttachments = m_spaceAttachments;
-  copy.m_highlighted = m_highlighted;
-  copy.m_rotation = m_rotation;
-  copy.m_textColourName = m_textColourName;
-  copy.m_regionName = m_regionName;
-
-  copy.m_sensitivity = m_sensitivity;
-  copy.m_draggable = m_draggable;
-  copy.m_fixedWidth = m_fixedWidth;
-  copy.m_fixedHeight = m_fixedHeight;
-  copy.m_formatMode = m_formatMode;
-  copy.m_drawHandles = m_drawHandles;
-
-  copy.m_visible = m_visible;
-  copy.m_shadowMode = m_shadowMode;
-  copy.m_shadowOffsetX = m_shadowOffsetX;
-  copy.m_shadowOffsetY = m_shadowOffsetY;
-  copy.m_shadowBrush = m_shadowBrush;
-
-  copy.m_branchNeckLength = m_branchNeckLength;
-  copy.m_branchStemLength = m_branchStemLength;
-  copy.m_branchSpacing = m_branchSpacing;
-
-  // Copy text regions
-  copy.ClearRegions();
-  wxNode *node = m_regions.GetFirst();
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    wxShapeRegion *newRegion = new wxShapeRegion(*region);
-    copy.m_regions.Append(newRegion);
-    node = node->GetNext();
-  }
-
-  // Copy attachments
-  copy.ClearAttachments();
-  node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    wxAttachmentPoint *newPoint = new wxAttachmentPoint;
-    newPoint->m_id = point->m_id;
-    newPoint->m_x = point->m_x;
-    newPoint->m_y = point->m_y;
-    copy.m_attachmentPoints.Append((wxObject *)newPoint);
-    node = node->GetNext();
-  }
-
-  // Copy lines
-  copy.m_lines.Clear();
-  node = m_lines.GetFirst();
-  while (node)
-  {
-    wxLineShape* line = (wxLineShape*) node->GetData();
-    copy.m_lines.Append(line);
-    node = node->GetNext();
-  }
-}
-
-// Create and return a new, fully copied object.
-wxShape *wxShape::CreateNewCopy(bool resetMapping, bool recompute)
-{
-  if (resetMapping)
-    oglObjectCopyMapping.Clear();
-
-  wxShape* newObject = (wxShape*) GetClassInfo()->CreateObject();
-
-  wxASSERT( (newObject != NULL) );
-  wxASSERT( (newObject->IsKindOf(CLASSINFO(wxShape))) );
-
-  Copy(*newObject);
-
-  if (GetEventHandler() != this)
-  {
-    wxShapeEvtHandler* newHandler = GetEventHandler()->CreateNewCopy();
-    newObject->SetEventHandler(newHandler);
-    newObject->SetPreviousHandler(NULL);
-    newHandler->SetPreviousHandler(newObject);
-    newHandler->SetShape(newObject);
-  }
-
-  if (recompute)
-    newObject->Recompute();
-  return newObject;
-}
-
-// Does the copying for this object, including copying event
-// handler data if any. Calls the virtual Copy function.
-void wxShape::CopyWithHandler(wxShape& copy)
-{
-    Copy(copy);
-
-    if (GetEventHandler() != this)
-    {
-        wxASSERT( copy.GetEventHandler() != NULL );
-        wxASSERT( copy.GetEventHandler() != (&copy) );
-        wxASSERT( GetEventHandler()->GetClassInfo() == copy.GetEventHandler()->GetClassInfo() );
-        GetEventHandler()->CopyData(* (copy.GetEventHandler()));
-    }
-}
-
-
-// Default - make 6 control points
-void wxShape::MakeControlPoints()
-{
-  double maxX, maxY, minX, minY;
-
-  GetBoundingBoxMax(&maxX, &maxY);
-  GetBoundingBoxMin(&minX, &minY);
-
-  double widthMin = (double)(minX + CONTROL_POINT_SIZE + 2);
-  double heightMin = (double)(minY + CONTROL_POINT_SIZE + 2);
-
-  // Offsets from main object
-  double top = (double)(- (heightMin / 2.0));
-  double bottom = (double)(heightMin / 2.0 + (maxY - minY));
-  double left = (double)(- (widthMin / 2.0));
-  double right = (double)(widthMin / 2.0 + (maxX - minX));
-
-  wxControlPoint *control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, top,
-                                           CONTROL_POINT_DIAGONAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, top,
-                                           CONTROL_POINT_VERTICAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, top,
-                                           CONTROL_POINT_DIAGONAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, 0,
-                                           CONTROL_POINT_HORIZONTAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, bottom,
-                                           CONTROL_POINT_DIAGONAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, bottom,
-                                           CONTROL_POINT_VERTICAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, bottom,
-                                           CONTROL_POINT_DIAGONAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, 0,
-                                           CONTROL_POINT_HORIZONTAL);
-  m_canvas->AddShape(control);
-  m_controlPoints.Append(control);
-
-}
-
-void wxShape::MakeMandatoryControlPoints()
-{
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    child->MakeMandatoryControlPoints();
-    node = node->GetNext();
-  }
-}
-
-void wxShape::ResetMandatoryControlPoints()
-{
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    child->ResetMandatoryControlPoints();
-    node = node->GetNext();
-  }
-}
-
-void wxShape::ResetControlPoints()
-{
-  ResetMandatoryControlPoints();
-
-  if (m_controlPoints.GetCount() < 1)
-    return;
-
-  double maxX, maxY, minX, minY;
-
-  GetBoundingBoxMax(&maxX, &maxY);
-  GetBoundingBoxMin(&minX, &minY);
-
-  double widthMin = (double)(minX + CONTROL_POINT_SIZE + 2);
-  double heightMin = (double)(minY + CONTROL_POINT_SIZE + 2);
-
-  // Offsets from main object
-  double top = (double)(- (heightMin / 2.0));
-  double bottom = (double)(heightMin / 2.0 + (maxY - minY));
-  double left = (double)(- (widthMin / 2.0));
-  double right = (double)(widthMin / 2.0 + (maxX - minX));
-
-  wxNode *node = m_controlPoints.GetFirst();
-  wxControlPoint *control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = left; control->m_yoffset = top;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = 0; control->m_yoffset = top;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = right; control->m_yoffset = top;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = right; control->m_yoffset = 0;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = right; control->m_yoffset = bottom;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = 0; control->m_yoffset = bottom;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = left; control->m_yoffset = bottom;
-
-  node = node->GetNext(); control = (wxControlPoint *)node->GetData();
-  control->m_xoffset = left; control->m_yoffset = 0;
-}
-
-void wxShape::DeleteControlPoints(wxDC *dc)
-{
-  wxNode *node = m_controlPoints.GetFirst();
-  while (node)
-  {
-    wxControlPoint *control = (wxControlPoint *)node->GetData();
-    if (dc)
-        control->GetEventHandler()->OnErase(*dc);
-    m_canvas->RemoveShape(control);
-    delete control;
-    delete node;
-    node = m_controlPoints.GetFirst();
-  }
-  // Children of divisions are contained objects,
-  // so stop here
-  if (!IsKindOf(CLASSINFO(wxDivisionShape)))
-  {
-    node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->DeleteControlPoints(dc);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::OnDrawControlPoints(wxDC& dc)
-{
-  if (!m_drawHandles)
-    return;
-
-  dc.SetBrush(* wxBLACK_BRUSH);
-  dc.SetPen(* wxBLACK_PEN);
-
-  wxNode *node = m_controlPoints.GetFirst();
-  while (node)
-  {
-    wxControlPoint *control = (wxControlPoint *)node->GetData();
-    control->Draw(dc);
-    node = node->GetNext();
-  }
-  // Children of divisions are contained objects,
-  // so stop here.
-  // This test bypasses the type facility for speed
-  // (critical when drawing)
-  if (!IsKindOf(CLASSINFO(wxDivisionShape)))
-  {
-    node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->GetEventHandler()->OnDrawControlPoints(dc);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::OnEraseControlPoints(wxDC& dc)
-{
-  wxNode *node = m_controlPoints.GetFirst();
-  while (node)
-  {
-    wxControlPoint *control = (wxControlPoint *)node->GetData();
-    control->Erase(dc);
-    node = node->GetNext();
-  }
-  if (!IsKindOf(CLASSINFO(wxDivisionShape)))
-  {
-    node = m_children.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      child->GetEventHandler()->OnEraseControlPoints(dc);
-      node = node->GetNext();
-    }
-  }
-}
-
-void wxShape::Select(bool select, wxDC* dc)
-{
-  m_selected = select;
-  if (select)
-  {
-    MakeControlPoints();
-    // Children of divisions are contained objects,
-    // so stop here
-    if (!IsKindOf(CLASSINFO(wxDivisionShape)))
-    {
-      wxNode *node = m_children.GetFirst();
-      while (node)
-      {
-        wxShape *child = (wxShape *)node->GetData();
-        child->MakeMandatoryControlPoints();
-        node = node->GetNext();
-      }
-    }
-    if (dc)
-        GetEventHandler()->OnDrawControlPoints(*dc);
-  }
-  if (!select)
-  {
-    DeleteControlPoints(dc);
-    if (!IsKindOf(CLASSINFO(wxDivisionShape)))
-    {
-      wxNode *node = m_children.GetFirst();
-      while (node)
-      {
-        wxShape *child = (wxShape *)node->GetData();
-        child->DeleteControlPoints(dc);
-        node = node->GetNext();
-      }
-    }
-  }
-}
-
-bool wxShape::Selected() const
-{
-  return m_selected;
-}
-
-bool wxShape::AncestorSelected() const
-{
-  if (m_selected) return true;
-  if (!GetParent())
-    return false;
-  else
-    return GetParent()->AncestorSelected();
-}
-
-int wxShape::GetNumberOfAttachments() const
-{
-  // Should return the MAXIMUM attachment point id here,
-  // so higher-level functions can iterate through all attachments,
-  // even if they're not contiguous.
-  if (m_attachmentPoints.GetCount() == 0)
-    return 4;
-  else
-  {
-    int maxN = 3;
-    wxNode *node = m_attachmentPoints.GetFirst();
-    while (node)
-    {
-      wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-      if (point->m_id > maxN)
-        maxN = point->m_id;
-      node = node->GetNext();
-    }
-    return maxN+1;;
-  }
-}
-
-bool wxShape::AttachmentIsValid(int attachment) const
-{
-  if (m_attachmentPoints.GetCount() == 0)
-  {
-    return ((attachment >= 0) && (attachment < 4)) ;
-  }
-
-  wxNode *node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    if (point->m_id == attachment)
-      return true;
-    node = node->GetNext();
-  }
-  return false;
-}
-
-bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
-                                         int nth, int no_arcs, wxLineShape *line)
-{
-    if (m_attachmentMode == ATTACHMENT_MODE_NONE)
-    {
-        *x = m_xpos; *y = m_ypos;
-        return true;
-    }
-    else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
-    {
-        wxRealPoint pt, stemPt;
-        GetBranchingAttachmentPoint(attachment, nth, pt, stemPt);
-        *x = pt.x;
-        *y = pt.y;
-        return true;
-    }
-    else if (m_attachmentMode == ATTACHMENT_MODE_EDGE)
-    {
-        if (m_attachmentPoints.GetCount() > 0)
-        {
-            wxNode *node = m_attachmentPoints.GetFirst();
-            while (node)
-            {
-                wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-                if (point->m_id == attachment)
-                {
-                    *x = (double)(m_xpos + point->m_x);
-                    *y = (double)(m_ypos + point->m_y);
-                    return true;
-                }
-                node = node->GetNext();
-            }
-            *x = m_xpos; *y = m_ypos;
-            return false;
-        }
-        else
-        {
-            // Assume is rectangular
-            double w, h;
-            GetBoundingBoxMax(&w, &h);
-            double top = (double)(m_ypos + h/2.0);
-            double bottom = (double)(m_ypos - h/2.0);
-            double left = (double)(m_xpos - w/2.0);
-            double right = (double)(m_xpos + w/2.0);
-
-#if 0
-            /* bool isEnd = */ (line && line->IsEnd(this));
-#endif
-
-            int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
-            // Simplified code
-            switch (physicalAttachment)
-            {
-                case 0:
-                {
-                    wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, bottom), wxRealPoint(right, bottom),
-                            nth, no_arcs, line);
-
-                    *x = pt.x; *y = pt.y;
-                    break;
-                }
-                case 1:
-                {
-                    wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(right, bottom), wxRealPoint(right, top),
-                            nth, no_arcs, line);
-
-                    *x = pt.x; *y = pt.y;
-                    break;
-                }
-                case 2:
-                {
-                    wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, top), wxRealPoint(right, top),
-                            nth, no_arcs, line);
-
-                    *x = pt.x; *y = pt.y;
-                    break;
-                }
-                case 3:
-                {
-                    wxRealPoint pt = CalcSimpleAttachment(wxRealPoint(left, bottom), wxRealPoint(left, top),
-                            nth, no_arcs, line);
-
-                    *x = pt.x; *y = pt.y;
-                    break;
-                }
-                default:
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-void wxShape::GetBoundingBoxMax(double *w, double *h)
-{
-  double ww, hh;
-  GetBoundingBoxMin(&ww, &hh);
-  if (m_shadowMode != SHADOW_NONE)
-  {
-    ww += m_shadowOffsetX;
-    hh += m_shadowOffsetY;
-  }
-  *w = ww;
-  *h = hh;
-}
-
-// Returns true if image is a descendant of this composite
-bool wxShape::HasDescendant(wxShape *image)
-{
-  if (image == this)
-    return true;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    bool ans = child->HasDescendant(image);
-    if (ans)
-      return true;
-    node = node->GetNext();
-  }
-  return false;
-}
-
-// Clears points from a list of wxRealPoints, and clears list
-void wxShape::ClearPointList(wxList& list)
-{
-    wxNode* node = list.GetFirst();
-    while (node)
-    {
-        wxRealPoint* pt = (wxRealPoint*) node->GetData();
-        delete pt;
-
-        node = node->GetNext();
-    }
-    list.Clear();
-}
-
-// Assuming the attachment lies along a vertical or horizontal line,
-// calculate the position on that point.
-wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
-    int nth, int noArcs, wxLineShape* line)
-{
-    bool isEnd = (line && line->IsEnd(this));
-
-    // Are we horizontal or vertical?
-    bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == true);
-
-    double x, y;
-
-    if (isHorizontal)
-    {
-        wxRealPoint firstPoint, secondPoint;
-        if (pt1.x > pt2.x)
-        {
-            firstPoint = pt2;
-            secondPoint = pt1;
-        }
-        else
-        {
-            firstPoint = pt1;
-            secondPoint = pt2;
-        }
-
-        if (m_spaceAttachments)
-        {
-          if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
-          {
-            // Align line according to the next handle along
-            wxRealPoint *point = line->GetNextControlPoint(this);
-            if (point->x < firstPoint.x)
-              x = firstPoint.x;
-            else if (point->x > secondPoint.x)
-              x = secondPoint.x;
-            else
-              x = point->x;
-          }
-          else
-            x = firstPoint.x + (nth + 1)*(secondPoint.x - firstPoint.x)/(noArcs + 1);
-        }
-        else x = (secondPoint.x - firstPoint.x)/2.0; // Midpoint
-
-        y = pt1.y;
-    }
-    else
-    {
-        wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == true );
-
-        wxRealPoint firstPoint, secondPoint;
-        if (pt1.y > pt2.y)
-        {
-            firstPoint = pt2;
-            secondPoint = pt1;
-        }
-        else
-        {
-            firstPoint = pt1;
-            secondPoint = pt2;
-        }
-
-        if (m_spaceAttachments)
-        {
-          if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
-          {
-            // Align line according to the next handle along
-            wxRealPoint *point = line->GetNextControlPoint(this);
-            if (point->y < firstPoint.y)
-              y = firstPoint.y;
-            else if (point->y > secondPoint.y)
-              y = secondPoint.y;
-            else
-              y = point->y;
-          }
-          else
-            y = firstPoint.y + (nth + 1)*(secondPoint.y - firstPoint.y)/(noArcs + 1);
-        }
-        else y = (secondPoint.y - firstPoint.y)/2.0; // Midpoint
-
-        x = pt1.x;
-    }
-
-    return wxRealPoint(x, y);
-}
-
-// Return the zero-based position in m_lines of line.
-int wxShape::GetLinePosition(wxLineShape* line)
-{
-    for (size_t i = 0; i < m_lines.GetCount(); i++)
-        if ((wxLineShape*) (m_lines.Item(i)->GetData()) == line)
-            return i;
-
-    return 0;
-}
-
-//
-//             |________|
-//                 | <- root
-//                 | <- neck
-// shoulder1 ->---------<- shoulder2
-//             | | | | |
-//                      <- branching attachment point N-1
-
-// This function gets information about where branching connections go.
-// Returns false if there are no lines at this attachment.
-bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
-    wxRealPoint& shoulder1, wxRealPoint& shoulder2)
-{
-    int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
-    // Number of lines at this attachment.
-    int lineCount = GetAttachmentLineCount(attachment);
-
-    if (lineCount == 0)
-        return false;
-
-    int totalBranchLength = m_branchSpacing * (lineCount - 1);
-
-    root = GetBranchingAttachmentRoot(attachment);
-
-    // Assume that we have attachment points 0 to 3: top, right, bottom, left.
-    switch (physicalAttachment)
-    {
-        case 0:
-        {
-            neck.x = GetX();
-            neck.y = root.y - m_branchNeckLength;
-
-            shoulder1.x = root.x - (totalBranchLength/2.0) ;
-            shoulder2.x = root.x + (totalBranchLength/2.0) ;
-
-            shoulder1.y = neck.y;
-            shoulder2.y = neck.y;
-            break;
-        }
-        case 1:
-        {
-            neck.x = root.x + m_branchNeckLength;
-            neck.y = root.y;
-
-            shoulder1.x = neck.x ;
-            shoulder2.x = neck.x ;
-
-            shoulder1.y = neck.y - (totalBranchLength/2.0) ;
-            shoulder2.y = neck.y + (totalBranchLength/2.0) ;
-            break;
-        }
-        case 2:
-        {
-            neck.x = GetX();
-            neck.y = root.y + m_branchNeckLength;
-
-            shoulder1.x = root.x - (totalBranchLength/2.0) ;
-            shoulder2.x = root.x + (totalBranchLength/2.0) ;
-
-            shoulder1.y = neck.y;
-            shoulder2.y = neck.y;
-            break;
-        }
-        case 3:
-        {
-            neck.x = root.x - m_branchNeckLength;
-            neck.y = root.y ;
-
-            shoulder1.x = neck.x ;
-            shoulder2.x = neck.x ;
-
-            shoulder1.y = neck.y - (totalBranchLength/2.0) ;
-            shoulder2.y = neck.y + (totalBranchLength/2.0) ;
-            break;
-        }
-        default:
-        {
-            wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentInfo.") );
-            break;
-        }
-    }
-    return true;
-}
-
-// n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
-// at this attachment point.
-// Get the attachment point where the arc joins the stem, and also the point where the
-// the stem meets the shoulder.
-bool wxShape::GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& pt, wxRealPoint& stemPt)
-{
-    int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
-    wxRealPoint root, neck, shoulder1, shoulder2;
-    GetBranchingAttachmentInfo(attachment, root, neck, shoulder1, shoulder2);
-
-    // Assume that we have attachment points 0 to 3: top, right, bottom, left.
-    switch (physicalAttachment)
-    {
-        case 0:
-        {
-            pt.y = neck.y - m_branchStemLength;
-            pt.x = shoulder1.x + n*m_branchSpacing;
-
-            stemPt.x = pt.x;
-            stemPt.y = neck.y;
-            break;
-        }
-        case 2:
-        {
-            pt.y = neck.y + m_branchStemLength;
-            pt.x = shoulder1.x + n*m_branchSpacing;
-
-            stemPt.x = pt.x;
-            stemPt.y = neck.y;
-            break;
-        }
-        case 1:
-        {
-            pt.x = neck.x + m_branchStemLength;
-            pt.y = shoulder1.y + n*m_branchSpacing;
-
-            stemPt.x = neck.x;
-            stemPt.y = pt.y;
-            break;
-        }
-        case 3:
-        {
-            pt.x = neck.x - m_branchStemLength;
-            pt.y = shoulder1.y + n*m_branchSpacing;
-
-            stemPt.x = neck.x;
-            stemPt.y = pt.y;
-            break;
-        }
-        default:
-        {
-            wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentPoint.") );
-            break;
-        }
-    }
-
-    return true;
-}
-
-// Get the number of lines at this attachment position.
-int wxShape::GetAttachmentLineCount(int attachment) const
-{
-    int count = 0;
-    wxNode* node = m_lines.GetFirst();
-    while (node)
-    {
-        wxLineShape* lineShape = (wxLineShape*) node->GetData();
-        if ((lineShape->GetFrom() == this) && (lineShape->GetAttachmentFrom() == attachment))
-            count ++;
-        else if ((lineShape->GetTo() == this) && (lineShape->GetAttachmentTo() == attachment))
-            count ++;
-
-        node = node->GetNext();
-    }
-    return count;
-}
-
-// This function gets the root point at the given attachment.
-wxRealPoint wxShape::GetBranchingAttachmentRoot(int attachment)
-{
-    int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
-    wxRealPoint root;
-
-    double width, height;
-    GetBoundingBoxMax(& width, & height);
-
-    // Assume that we have attachment points 0 to 3: top, right, bottom, left.
-    switch (physicalAttachment)
-    {
-        case 0:
-        {
-            root.x = GetX() ;
-            root.y = GetY() - height/2.0;
-            break;
-        }
-        case 1:
-        {
-            root.x = GetX() + width/2.0;
-            root.y = GetY() ;
-            break;
-        }
-        case 2:
-        {
-            root.x = GetX() ;
-            root.y = GetY() + height/2.0;
-            break;
-        }
-        case 3:
-        {
-            root.x = GetX() - width/2.0;
-            root.y = GetY() ;
-            break;
-        }
-        default:
-        {
-            wxFAIL_MSG( wxT("Unrecognised attachment point in GetBranchingAttachmentRoot.") );
-            break;
-        }
-    }
-    return root;
-}
-
-// Draw or erase the branches (not the actual arcs though)
-void wxShape::OnDrawBranches(wxDC& dc, int attachment, bool erase)
-{
-    int count = GetAttachmentLineCount(attachment);
-    if (count == 0)
-        return;
-
-    wxRealPoint root, neck, shoulder1, shoulder2;
-    GetBranchingAttachmentInfo(attachment, root, neck, shoulder1, shoulder2);
-
-    if (erase)
-    {
-        dc.SetPen(*wxWHITE_PEN);
-        dc.SetBrush(*wxWHITE_BRUSH);
-    }
-    else
-    {
-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetBrush(*wxBLACK_BRUSH);
-    }
-
-    // Draw neck
-    dc.DrawLine((long) root.x, (long) root.y, (long) neck.x, (long) neck.y);
-
-    if (count > 1)
-    {
-        // Draw shoulder-to-shoulder line
-        dc.DrawLine((long) shoulder1.x, (long) shoulder1.y, (long) shoulder2.x, (long) shoulder2.y);
-    }
-    // Draw all the little branches
-    int i;
-    for (i = 0; i < count; i++)
-    {
-        wxRealPoint pt, stemPt;
-        GetBranchingAttachmentPoint(attachment, i, pt, stemPt);
-        dc.DrawLine((long) stemPt.x, (long) stemPt.y, (long) pt.x, (long) pt.y);
-
-        if ((GetBranchStyle() & BRANCHING_ATTACHMENT_BLOB) && (count > 1))
-        {
-            long blobSize=6;
-//            dc.DrawEllipse((long) (stemPt.x + 0.5 - (blobSize/2.0)), (long) (stemPt.y + 0.5 - (blobSize/2.0)), blobSize, blobSize);
-            dc.DrawEllipse((long) (stemPt.x - (blobSize/2.0)), (long) (stemPt.y - (blobSize/2.0)), blobSize, blobSize);
-        }
-    }
-}
-
-// Draw or erase the branches (not the actual arcs though)
-void wxShape::OnDrawBranches(wxDC& dc, bool erase)
-{
-    if (m_attachmentMode != ATTACHMENT_MODE_BRANCHING)
-        return;
-
-    int count = GetNumberOfAttachments();
-    int i;
-    for (i = 0; i < count; i++)
-        OnDrawBranches(dc, i, erase);
-}
-
-// Only get the attachment position at the _edge_ of the shape, ignoring
-// branching mode. This is used e.g. to indicate the edge of interest, not the point
-// on the attachment branch.
-bool wxShape::GetAttachmentPositionEdge(int attachment, double *x, double *y,
-                                     int nth, int no_arcs, wxLineShape *line)
-{
-    int oldMode = m_attachmentMode;
-
-    // Calculate as if to edge, not branch
-    if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
-        m_attachmentMode = ATTACHMENT_MODE_EDGE;
-    bool success = GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
-    m_attachmentMode = oldMode;
-
-    return success;
-}
-
-// Rotate the standard attachment point from physical (0 is always North)
-// to logical (0 -> 1 if rotated by 90 degrees)
-int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
-{
-    const double pi = M_PI ;
-    int i;
-    if (oglRoughlyEqual(GetRotation(), 0.0))
-    {
-        i = physicalAttachment;
-    }
-    else if (oglRoughlyEqual(GetRotation(), (pi/2.0)))
-    {
-        i = physicalAttachment - 1;
-    }
-    else if (oglRoughlyEqual(GetRotation(), pi))
-    {
-        i = physicalAttachment - 2;
-    }
-    else if (oglRoughlyEqual(GetRotation(), (3.0*pi/2.0)))
-    {
-        i = physicalAttachment - 3;
-    }
-    else
-        // Can't handle -- assume the same.
-        return physicalAttachment;
-
-    if (i < 0)
-      i += 4;
-
-    return i;
-}
-
-// Rotate the standard attachment point from logical
-// to physical (0 is always North)
-int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
-{
-    const double pi = M_PI ;
-    int i;
-    if (oglRoughlyEqual(GetRotation(), 0.0))
-    {
-        i = logicalAttachment;
-    }
-    else if (oglRoughlyEqual(GetRotation(), (pi/2.0)))
-    {
-        i = logicalAttachment + 1;
-    }
-    else if (oglRoughlyEqual(GetRotation(), pi))
-    {
-        i = logicalAttachment + 2;
-    }
-    else if (oglRoughlyEqual(GetRotation(), (3.0*pi/2.0)))
-    {
-        i = logicalAttachment + 3;
-    }
-    else
-        // Can't handle -- assume the same.
-        return logicalAttachment;
-
-    if (i > 3)
-      i -= 4;
-
-    return i;
-}
-
-void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
-{
-    const double pi = M_PI ;
-    m_rotation = theta;
-    if (m_rotation < 0.0)
-    {
-        m_rotation += 2*pi;
-    }
-    else if (m_rotation > 2*pi)
-    {
-        m_rotation -= 2*pi;
-    }
-}
-
-
-wxPen wxShape::GetBackgroundPen()
-{
-    if (GetCanvas())
-    {
-        wxColour c = GetCanvas()->GetBackgroundColour();
-        return wxPen(c, 1, wxSOLID);
-    }
-    return * g_oglWhiteBackgroundPen;
-}
-
-
-wxBrush wxShape::GetBackgroundBrush()
-{
-    if (GetCanvas())
-    {
-        wxColour c = GetCanvas()->GetBackgroundColour();
-        return wxBrush(c, wxSOLID);
-    }
-    return * g_oglWhiteBackgroundBrush;
-}
diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
deleted file mode 100644
index cecd9d3dbf..0000000000
--- a/contrib/src/ogl/basic2.cpp
+++ /dev/null
@@ -1,1892 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        basic2.cpp
-// Purpose:     Basic OGL classes (2)
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-
-#include "wx/ogl/ogl.h"
-
-
-// Control point types
-// Rectangle and most other shapes
-#define CONTROL_POINT_VERTICAL   1
-#define CONTROL_POINT_HORIZONTAL 2
-#define CONTROL_POINT_DIAGONAL   3
-
-// Line
-#define CONTROL_POINT_ENDPOINT_TO 4
-#define CONTROL_POINT_ENDPOINT_FROM 5
-#define CONTROL_POINT_LINE       6
-
-// Two stage construction: need to call Create
-IMPLEMENT_DYNAMIC_CLASS(wxPolygonShape, wxShape)
-
-wxPolygonShape::wxPolygonShape()
-{
-  m_points = NULL;
-  m_originalPoints = NULL;
-}
-
-void wxPolygonShape::Create(wxList *the_points)
-{
-  ClearPoints();
-
-  if (!the_points)
-  {
-      m_originalPoints = new wxList;
-      m_points = new wxList;
-  }
-  else
-  {
-      m_originalPoints = the_points;
-
-      // Duplicate the list of points
-      m_points = new wxList;
-
-      wxObjectList::compatibility_iterator node = the_points->GetFirst();
-      while (node)
-      {
-          wxRealPoint *point = (wxRealPoint *)node->GetData();
-          wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
-          m_points->Append((wxObject*) new_point);
-          node = node->GetNext();
-      }
-      CalculateBoundingBox();
-      m_originalWidth = m_boundWidth;
-      m_originalHeight = m_boundHeight;
-      SetDefaultRegionSize();
-  }
-}
-
-wxPolygonShape::~wxPolygonShape()
-{
-    ClearPoints();
-}
-
-void wxPolygonShape::ClearPoints()
-{
-  if (m_points)
-  {
-    wxObjectList::compatibility_iterator node = m_points->GetFirst();
-    while (node)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      delete point;
-      m_points->Erase(node);
-      node = m_points->GetFirst();
-    }
-    delete m_points;
-    m_points = NULL;
-  }
-  if (m_originalPoints)
-  {
-    wxObjectList::compatibility_iterator node = m_originalPoints->GetFirst();
-    while (node)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      delete point;
-      m_originalPoints->Erase(node);
-      node = m_originalPoints->GetFirst();
-    }
-    delete m_originalPoints;
-    m_originalPoints = NULL;
-  }
-}
-
-
-// Width and height. Centre of object is centre of box.
-void wxPolygonShape::GetBoundingBoxMin(double *width, double *height)
-{
-  *width = m_boundWidth;
-  *height = m_boundHeight;
-}
-
-void wxPolygonShape::CalculateBoundingBox()
-{
-  // Calculate bounding box at construction (and presumably resize) time
-  double left = 10000;
-  double right = -10000;
-  double top = 10000;
-  double bottom = -10000;
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    if (point->x < left) left = point->x;
-    if (point->x > right) right = point->x;
-
-    if (point->y < top) top = point->y;
-    if (point->y > bottom) bottom = point->y;
-
-    node = node->GetNext();
-  }
-  m_boundWidth = right - left;
-  m_boundHeight = bottom - top;
-}
-
-// Recalculates the centre of the polygon, and
-// readjusts the point offsets accordingly.
-// Necessary since the centre of the polygon
-// is expected to be the real centre of the bounding
-// box.
-void wxPolygonShape::CalculatePolygonCentre()
-{
-  double left = 10000;
-  double right = -10000;
-  double top = 10000;
-  double bottom = -10000;
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    if (point->x < left) left = point->x;
-    if (point->x > right) right = point->x;
-
-    if (point->y < top) top = point->y;
-    if (point->y > bottom) bottom = point->y;
-
-    node = node->GetNext();
-  }
-  double bwidth = right - left;
-  double bheight = bottom - top;
-
-  double newCentreX = (double)(left + (bwidth/2.0));
-  double newCentreY = (double)(top + (bheight/2.0));
-
-  node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    point->x -= newCentreX;
-    point->y -= newCentreY;
-    node = node->GetNext();
-  }
-  m_xpos += newCentreX;
-  m_ypos += newCentreY;
-}
-
-bool PolylineHitTest(double n, double xvec[], double yvec[],
-                           double x1, double y1, double x2, double y2)
-{
-  bool isAHit = false;
-  int i;
-  double lastx = xvec[0];
-  double lasty = yvec[0];
-
-  double min_ratio = 1.0;
-  double line_ratio;
-  double other_ratio;
-
-  for (i = 1; i < n; i++)
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[i], yvec[i],
-                            &line_ratio, &other_ratio);
-    if (line_ratio != 1.0)
-      isAHit = true;
-    lastx = xvec[i];
-    lasty = yvec[i];
-
-    if (line_ratio < min_ratio)
-      min_ratio = line_ratio;
-  }
-
-  // Do last (implicit) line if last and first doubles are not identical
-  if (!(xvec[0] == lastx && yvec[0] == lasty))
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[0], yvec[0],
-                            &line_ratio, &other_ratio);
-    if (line_ratio != 1.0)
-      isAHit = true;
-
-  }
-  return isAHit;
-}
-
-bool wxPolygonShape::HitTest(double x, double y, int *attachment, double *distance)
-{
-  // Imagine four lines radiating from this point. If all of these lines hit the polygon,
-  // we're inside it, otherwise we're not. Obviously we'd need more radiating lines
-  // to be sure of correct results for very strange (concave) shapes.
-  double endPointsX[4];
-  double endPointsY[4];
-  // North
-  endPointsX[0] = x;
-  endPointsY[0] = (double)(y - 1000.0);
-  // East
-  endPointsX[1] = (double)(x + 1000.0);
-  endPointsY[1] = y;
-  // South
-  endPointsX[2] = x;
-  endPointsY[2] = (double)(y + 1000.0);
-  // West
-  endPointsX[3] = (double)(x - 1000.0);
-  endPointsY[3] = y;
-
-  // Store polygon points in an array
-  int np = m_points->GetCount();
-  double *xpoints = new double[np];
-  double *ypoints = new double[np];
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  int i = 0;
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    xpoints[i] = point->x + m_xpos;
-    ypoints[i] = point->y + m_ypos;
-    node = node->GetNext();
-    i ++;
-  }
-
-  // We assume it's inside the polygon UNLESS one or more
-  // lines don't hit the outline.
-  bool isContained = true;
-
-  int noPoints = 4;
-  for (i = 0; i < noPoints; i++)
-  {
-    if (!PolylineHitTest(np, xpoints, ypoints, x, y, endPointsX[i], endPointsY[i]))
-      isContained = false;
-  }
-/*
-  if (isContained)
-    ClipsErrorFunction("It's a hit!\n");
-  else
-    ClipsErrorFunction("No hit.\n");
-*/
-  delete[] xpoints;
-  delete[] ypoints;
-
-  if (!isContained)
-    return false;
-
-  int nearest_attachment = 0;
-
-  // If a hit, check the attachment points within the object.
-  int n = GetNumberOfAttachments();
-  double nearest = 999999.0;
-
-  for (i = 0; i < n; i++)
-  {
-    double xp, yp;
-    if (GetAttachmentPositionEdge(i, &xp, &yp))
-    {
-      double l = (double)sqrt(((xp - x) * (xp - x)) +
-                 ((yp - y) * (yp - y)));
-      if (l < nearest)
-      {
-        nearest = l;
-        nearest_attachment = i;
-      }
-    }
-  }
-  *attachment = nearest_attachment;
-  *distance = nearest;
-  return true;
-}
-
-// Really need to be able to reset the shape! Otherwise, if the
-// points ever go to zero, we've lost it, and can't resize.
-void wxPolygonShape::SetSize(double new_width, double new_height, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(new_width, new_height);
-
-  // Multiply all points by proportion of new size to old size
-  double x_proportion = (double)(fabs(new_width/m_originalWidth));
-  double y_proportion = (double)(fabs(new_height/m_originalHeight));
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  wxObjectList::compatibility_iterator original_node = m_originalPoints->GetFirst();
-  while (node && original_node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *original_point = (wxRealPoint *)original_node->GetData();
-
-    point->x = (original_point->x * x_proportion);
-    point->y = (original_point->y * y_proportion);
-
-    node = node->GetNext();
-    original_node = original_node->GetNext();
-  }
-
-//  CalculateBoundingBox();
-  m_boundWidth = (double)fabs(new_width);
-  m_boundHeight = (double)fabs(new_height);
-  SetDefaultRegionSize();
-}
-
-// Make the original points the same as the working points
-void wxPolygonShape::UpdateOriginalPoints()
-{
-  if (!m_originalPoints) m_originalPoints = new wxList;
-  wxObjectList::compatibility_iterator original_node = m_originalPoints->GetFirst();
-  while (original_node)
-  {
-    wxObjectList::compatibility_iterator next_node = original_node->GetNext();
-    wxRealPoint *original_point = (wxRealPoint *)original_node->GetData();
-    delete original_point;
-    m_originalPoints->Erase(original_node);
-
-    original_node = next_node;
-  }
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *original_point = new wxRealPoint(point->x, point->y);
-    m_originalPoints->Append((wxObject*) original_point);
-
-    node = node->GetNext();
-  }
-  CalculateBoundingBox();
-  m_originalWidth = m_boundWidth;
-  m_originalHeight = m_boundHeight;
-}
-
-void wxPolygonShape::AddPolygonPoint(int pos)
-{
-  wxObjectList::compatibility_iterator node = m_points->Item(pos);
-  if (!node) node = m_points->GetFirst();
-  wxRealPoint *firstPoint = (wxRealPoint *)node->GetData();
-
-  wxObjectList::compatibility_iterator node2 = m_points->Item(pos + 1);
-  if (!node2) node2 = m_points->GetFirst();
-  wxRealPoint *secondPoint = (wxRealPoint *)node2->GetData();
-
-  double x = (double)((secondPoint->x - firstPoint->x)/2.0 + firstPoint->x);
-  double y = (double)((secondPoint->y - firstPoint->y)/2.0 + firstPoint->y);
-  wxRealPoint *point = new wxRealPoint(x, y);
-
-  if (pos >= (int) (m_points->GetCount() - 1))
-    m_points->Append((wxObject*) point);
-  else
-    m_points->Insert(node2, (wxObject*) point);
-
-  UpdateOriginalPoints();
-
-  if (m_selected)
-  {
-    DeleteControlPoints();
-    MakeControlPoints();
-  }
-}
-
-void wxPolygonShape::DeletePolygonPoint(int pos)
-{
-  wxObjectList::compatibility_iterator node = m_points->Item(pos);
-  if (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    delete point;
-    m_points->Erase(node);
-    UpdateOriginalPoints();
-    if (m_selected)
-    {
-      DeleteControlPoints();
-      MakeControlPoints();
-    }
-  }
-}
-
-// Assume (x1, y1) is centre of box (most generally, line end at box)
-bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3)
-{
-  int n = m_points->GetCount();
-
-  // First check for situation where the line is vertical,
-  // and we would want to connect to a point on that vertical --
-  // oglFindEndForPolyline can't cope with this (the arrow
-  // gets drawn to the wrong place).
-  if ((m_attachmentMode == ATTACHMENT_MODE_NONE) && (x1 == x2))
-  {
-    // Look for the point we'd be connecting to. This is
-    // a heuristic...
-    wxObjectList::compatibility_iterator node = m_points->GetFirst();
-    while (node)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      if (point->x == 0.0)
-      {
-        if ((y2 > y1) && (point->y > 0.0))
-        {
-          *x3 = point->x + m_xpos;
-          *y3 = point->y + m_ypos;
-          return true;
-        }
-        else if ((y2 < y1) && (point->y < 0.0))
-        {
-          *x3 = point->x + m_xpos;
-          *y3 = point->y + m_ypos;
-          return true;
-        }
-      }
-      node = node->GetNext();
-    }
-  }
-
-  double *xpoints = new double[n];
-  double *ypoints = new double[n];
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  int i = 0;
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    xpoints[i] = point->x + m_xpos;
-    ypoints[i] = point->y + m_ypos;
-    node = node->GetNext();
-    i ++;
-  }
-
-  oglFindEndForPolyline(n, xpoints, ypoints,
-                        x1, y1, x2, y2, x3, y3);
-
-  delete[] xpoints;
-  delete[] ypoints;
-
-  return true;
-}
-
-void wxPolygonShape::OnDraw(wxDC& dc)
-{
-    int n = m_points->GetCount();
-    wxPoint *intPoints = new wxPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-      wxRealPoint* point = (wxRealPoint*) m_points->Item(i)->GetData();
-      intPoints[i].x = WXROUND(point->x);
-      intPoints[i].y = WXROUND(point->y);
-    }
-
-    if (m_shadowMode != SHADOW_NONE)
-    {
-      if (m_shadowBrush)
-        dc.SetBrush(* m_shadowBrush);
-      dc.SetPen(* g_oglTransparentPen);
-
-      dc.DrawPolygon(n, intPoints, WXROUND(m_xpos + m_shadowOffsetX), WXROUND(m_ypos + m_shadowOffsetY));
-    }
-
-    if (m_pen)
-    {
-      if (m_pen->GetWidth() == 0)
-        dc.SetPen(* g_oglTransparentPen);
-      else
-        dc.SetPen(* m_pen);
-    }
-    if (m_brush)
-      dc.SetBrush(* m_brush);
-    dc.DrawPolygon(n, intPoints, WXROUND(m_xpos), WXROUND(m_ypos));
-
-    delete[] intPoints;
-}
-
-void wxPolygonShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
-  dc.SetBrush(* wxTRANSPARENT_BRUSH);
-  // Multiply all points by proportion of new size to old size
-  double x_proportion = (double)(fabs(w/m_originalWidth));
-  double y_proportion = (double)(fabs(h/m_originalHeight));
-
-  int n = m_originalPoints->GetCount();
-  wxPoint *intPoints = new wxPoint[n];
-  int i;
-  for (i = 0; i < n; i++)
-  {
-    wxRealPoint* point = (wxRealPoint*) m_originalPoints->Item(i)->GetData();
-    intPoints[i].x = WXROUND(x_proportion * point->x);
-    intPoints[i].y = WXROUND(y_proportion * point->y);
-  }
-  dc.DrawPolygon(n, intPoints, WXROUND(x), WXROUND(y));
-  delete[] intPoints;
-}
-
-// Make as many control points as there are vertices.
-void wxPolygonShape::MakeControlPoints()
-{
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxPolygonControlPoint *control = new wxPolygonControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
-      point, point->x, point->y);
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-    node = node->GetNext();
-  }
-}
-
-void wxPolygonShape::ResetControlPoints()
-{
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  wxObjectList::compatibility_iterator controlPointNode = m_controlPoints.GetFirst();
-  while (node && controlPointNode)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxPolygonControlPoint *controlPoint = (wxPolygonControlPoint *)controlPointNode->GetData();
-
-    controlPoint->m_xoffset = point->x;
-    controlPoint->m_yoffset = point->y;
-    controlPoint->m_polygonVertex = point;
-
-    node = node->GetNext();
-    controlPointNode = controlPointNode->GetNext();
-  }
-}
-
-
-#if wxUSE_PROLOGIO
-void wxPolygonShape::WriteAttributes(wxExpr *clause)
-{
-  wxShape::WriteAttributes(clause);
-
-  clause->AddAttributeValue(wxT("x"), m_xpos);
-  clause->AddAttributeValue(wxT("y"), m_ypos);
-
-  // Make a list of lists for the coordinates
-  wxExpr *list = new wxExpr(wxExprList);
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxExpr *point_list = new wxExpr(wxExprList);
-    wxExpr *x_expr = new wxExpr((double)point->x);
-    wxExpr *y_expr = new wxExpr((double)point->y);
-
-    point_list->Append(x_expr);
-    point_list->Append(y_expr);
-    list->Append(point_list);
-
-    node = node->GetNext();
-  }
-  clause->AddAttributeValue(wxT("points"), list);
-
-  // Save the original (unscaled) points
-  list = new wxExpr(wxExprList);
-  node = m_originalPoints->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxExpr *point_list = new wxExpr(wxExprList);
-    wxExpr *x_expr = new wxExpr((double) point->x);
-    wxExpr *y_expr = new wxExpr((double) point->y);
-    point_list->Append(x_expr);
-    point_list->Append(y_expr);
-    list->Append(point_list);
-
-    node = node->GetNext();
-  }
-  clause->AddAttributeValue(wxT("m_originalPoints"), list);
-}
-
-void wxPolygonShape::ReadAttributes(wxExpr *clause)
-{
-  wxShape::ReadAttributes(clause);
-
-  // Read a list of lists
-  m_points = new wxList;
-  m_originalPoints = new wxList;
-
-  wxExpr *points_list = NULL;
-  clause->AssignAttributeValue(wxT("points"), &points_list);
-
-  // If no points_list, don't crash!! Assume a diamond instead.
-  double the_height = 100.0;
-  double the_width = 100.0;
-  if (!points_list)
-  {
-    wxRealPoint *point = new wxRealPoint(0.0, (-the_height/2));
-    m_points->Append((wxObject*) point);
-
-    point = new wxRealPoint((the_width/2), 0.0);
-    m_points->Append((wxObject*) point);
-
-    point = new wxRealPoint(0.0, (the_height/2));
-    m_points->Append((wxObject*) point);
-
-    point = new wxRealPoint((-the_width/2), 0.0);
-    m_points->Append((wxObject*) point);
-
-    point = new wxRealPoint(0.0, (-the_height/2));
-    m_points->Append((wxObject*) point);
-  }
-  else
-  {
-    wxExpr *node = points_list->value.first;
-
-    while (node)
-    {
-      wxExpr *xexpr = node->value.first;
-      long x = xexpr->IntegerValue();
-
-      wxExpr *yexpr = xexpr->next;
-      long y = yexpr->IntegerValue();
-
-      wxRealPoint *point = new wxRealPoint((double)x, (double)y);
-      m_points->Append((wxObject*) point);
-
-      node = node->next;
-    }
-  }
-
-  points_list = NULL;
-  clause->AssignAttributeValue(wxT("m_originalPoints"), &points_list);
-
-  // If no points_list, don't crash!! Assume a diamond instead.
-  if (!points_list)
-  {
-    wxRealPoint *point = new wxRealPoint(0.0, (-the_height/2));
-    m_originalPoints->Append((wxObject*) point);
-
-    point = new wxRealPoint((the_width/2), 0.0);
-    m_originalPoints->Append((wxObject*) point);
-
-    point = new wxRealPoint(0.0, (the_height/2));
-    m_originalPoints->Append((wxObject*) point);
-
-    point = new wxRealPoint((-the_width/2), 0.0);
-    m_originalPoints->Append((wxObject*) point);
-
-    point = new wxRealPoint(0.0, (-the_height/2));
-    m_originalPoints->Append((wxObject*) point);
-
-    m_originalWidth = the_width;
-    m_originalHeight = the_height;
-  }
-  else
-  {
-    wxExpr *node = points_list->value.first;
-    double min_x = 1000;
-    double min_y = 1000;
-    double max_x = -1000;
-    double max_y = -1000;
-    while (node)
-    {
-      wxExpr *xexpr = node->value.first;
-      long x = xexpr->IntegerValue();
-
-      wxExpr *yexpr = xexpr->next;
-      long y = yexpr->IntegerValue();
-
-      wxRealPoint *point = new wxRealPoint((double)x, (double)y);
-      m_originalPoints->Append((wxObject*) point);
-
-      if (x < min_x)
-        min_x = (double)x;
-      if (y < min_y)
-        min_y = (double)y;
-      if (x > max_x)
-        max_x = (double)x;
-      if (y > max_y)
-        max_y = (double)y;
-
-      node = node->next;
-    }
-    m_originalWidth = max_x - min_x;
-    m_originalHeight = max_y - min_y;
-  }
-
-  CalculateBoundingBox();
-}
-#endif
-
-void wxPolygonShape::Copy(wxShape& copy)
-{
-  wxShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxPolygonShape)) );
-
-  wxPolygonShape& polyCopy = (wxPolygonShape&) copy;
-
-  polyCopy.ClearPoints();
-
-  polyCopy.m_points = new wxList;
-  polyCopy.m_originalPoints = new wxList;
-
-  wxObjectList::compatibility_iterator node = m_points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
-    polyCopy.m_points->Append((wxObject*) new_point);
-    node = node->GetNext();
-  }
-  node = m_originalPoints->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
-    polyCopy.m_originalPoints->Append((wxObject*) new_point);
-    node = node->GetNext();
-  }
-  polyCopy.m_boundWidth = m_boundWidth;
-  polyCopy.m_boundHeight = m_boundHeight;
-  polyCopy.m_originalWidth = m_originalWidth;
-  polyCopy.m_originalHeight = m_originalHeight;
-}
-
-int wxPolygonShape::GetNumberOfAttachments() const
-{
-  int maxN = (m_points ? (m_points->GetCount() - 1) : 0);
-  wxObjectList::compatibility_iterator node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    if (point->m_id > maxN)
-      maxN = point->m_id;
-    node = node->GetNext();
-  }
-  return maxN+1;;
-}
-
-bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
-                                         int nth, int no_arcs, wxLineShape *line)
-{
-  if ((m_attachmentMode == ATTACHMENT_MODE_EDGE) && m_points && attachment < (int) m_points->GetCount())
-  {
-    wxRealPoint *point = (wxRealPoint *)m_points->Item(attachment)->GetData();
-    *x = point->x + m_xpos;
-    *y = point->y + m_ypos;
-    return true;
-  }
-  else
-  { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
-}
-
-bool wxPolygonShape::AttachmentIsValid(int attachment) const
-{
-  if (!m_points)
-    return false;
-
-  if ((attachment >= 0) && (attachment < (int) m_points->GetCount()))
-    return true;
-
-  wxObjectList::compatibility_iterator node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    if (point->m_id == attachment)
-      return true;
-    node = node->GetNext();
-  }
-  return false;
-}
-
-// Rotate about the given axis by the given amount in radians
-void wxPolygonShape::Rotate(double x, double y, double theta)
-{
-    double actualTheta = theta-m_rotation;
-
-    // Rotate attachment points
-    double sinTheta = (double)sin(actualTheta);
-    double cosTheta = (double)cos(actualTheta);
-    wxObjectList::compatibility_iterator node = m_attachmentPoints.GetFirst();
-    while (node)
-    {
-        wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-        double x1 = point->m_x;
-        double y1 = point->m_y;
-        point->m_x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-        point->m_y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-        node = node->GetNext();
-    }
-
-    node = m_points->GetFirst();
-    while (node)
-    {
-        wxRealPoint *point = (wxRealPoint *)node->GetData();
-        double x1 = point->x;
-        double y1 = point->y;
-        point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-        point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-        node = node->GetNext();
-    }
-    node = m_originalPoints->GetFirst();
-    while (node)
-    {
-        wxRealPoint *point = (wxRealPoint *)node->GetData();
-        double x1 = point->x;
-        double y1 = point->y;
-        point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-        point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-        node = node->GetNext();
-    }
-
-    m_rotation = theta;
-
-    CalculatePolygonCentre();
-    CalculateBoundingBox();
-    ResetControlPoints();
-}
-
-// Rectangle object
-
-IMPLEMENT_DYNAMIC_CLASS(wxRectangleShape, wxShape)
-
-wxRectangleShape::wxRectangleShape(double w, double h)
-{
-  m_width = w; m_height = h; m_cornerRadius = 0.0;
-  SetDefaultRegionSize();
-}
-
-void wxRectangleShape::OnDraw(wxDC& dc)
-{
-    double x1 = (double)(m_xpos - m_width/2.0);
-    double y1 = (double)(m_ypos - m_height/2.0);
-
-    if (m_shadowMode != SHADOW_NONE)
-    {
-      if (m_shadowBrush)
-        dc.SetBrush(* m_shadowBrush);
-      dc.SetPen(* g_oglTransparentPen);
-
-      if (m_cornerRadius != 0.0)
-        dc.DrawRoundedRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY),
-                                 WXROUND(m_width), WXROUND(m_height), m_cornerRadius);
-      else
-        dc.DrawRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY), WXROUND(m_width), WXROUND(m_height));
-    }
-
-    if (m_pen)
-    {
-      if (m_pen->GetWidth() == 0)
-        dc.SetPen(* g_oglTransparentPen);
-      else
-        dc.SetPen(* m_pen);
-    }
-    if (m_brush)
-      dc.SetBrush(* m_brush);
-
-    if (m_cornerRadius != 0.0)
-      dc.DrawRoundedRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height), m_cornerRadius);
-    else
-      dc.DrawRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height));
-}
-
-void wxRectangleShape::GetBoundingBoxMin(double *the_width, double *the_height)
-{
-  *the_width = m_width;
-  *the_height = m_height;
-}
-
-void wxRectangleShape::SetSize(double x, double y, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(x, y);
-  m_width = (double)wxMax(x, 1.0);
-  m_height = (double)wxMax(y, 1.0);
-  SetDefaultRegionSize();
-}
-
-void wxRectangleShape::SetCornerRadius(double rad)
-{
-  m_cornerRadius = rad;
-}
-
-// Assume (x1, y1) is centre of box (most generally, line end at box)
-bool wxRectangleShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
-                                     double x2, double y2,
-                                     double *x3, double *y3)
-{
-  double bound_x, bound_y;
-  GetBoundingBoxMax(&bound_x, &bound_y);
-  oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3);
-
-  return true;
-}
-
-#if wxUSE_PROLOGIO
-void wxRectangleShape::WriteAttributes(wxExpr *clause)
-{
-  wxShape::WriteAttributes(clause);
-  clause->AddAttributeValue(wxT("x"), m_xpos);
-  clause->AddAttributeValue(wxT("y"), m_ypos);
-
-  clause->AddAttributeValue(wxT("width"), m_width);
-  clause->AddAttributeValue(wxT("height"), m_height);
-  if (m_cornerRadius != 0.0)
-    clause->AddAttributeValue(wxT("corner"), m_cornerRadius);
-}
-
-void wxRectangleShape::ReadAttributes(wxExpr *clause)
-{
-  wxShape::ReadAttributes(clause);
-  clause->AssignAttributeValue(wxT("width"), &m_width);
-  clause->AssignAttributeValue(wxT("height"), &m_height);
-  clause->AssignAttributeValue(wxT("corner"), &m_cornerRadius);
-
-  // In case we're reading an old file, set the region's size
-  if (m_regions.GetCount() == 1)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();
-    region->SetSize(m_width, m_height);
-  }
-}
-#endif
-
-void wxRectangleShape::Copy(wxShape& copy)
-{
-  wxShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxRectangleShape)) );
-
-  wxRectangleShape& rectCopy = (wxRectangleShape&) copy;
-  rectCopy.m_width = m_width;
-  rectCopy.m_height = m_height;
-  rectCopy.m_cornerRadius = m_cornerRadius;
-}
-
-int wxRectangleShape::GetNumberOfAttachments() const
-{
-  return wxShape::GetNumberOfAttachments();
-}
-
-
-// There are 4 attachment points on a rectangle - 0 = top, 1 = right, 2 = bottom,
-// 3 = left.
-bool wxRectangleShape::GetAttachmentPosition(int attachment, double *x, double *y,
-                                         int nth, int no_arcs, wxLineShape *line)
-{
-    return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
-}
-
-// Text object (no box)
-
-IMPLEMENT_DYNAMIC_CLASS(wxTextShape, wxRectangleShape)
-
-wxTextShape::wxTextShape(double width, double height):
-  wxRectangleShape(width, height)
-{
-}
-
-void wxTextShape::OnDraw(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxTextShape::Copy(wxShape& copy)
-{
-  wxRectangleShape::Copy(copy);
-}
-
-#if wxUSE_PROLOGIO
-void wxTextShape::WriteAttributes(wxExpr *clause)
-{
-  wxRectangleShape::WriteAttributes(clause);
-}
-#endif
-
-// Ellipse object
-
-IMPLEMENT_DYNAMIC_CLASS(wxEllipseShape, wxShape)
-
-wxEllipseShape::wxEllipseShape(double w, double h)
-{
-  m_width = w; m_height = h;
-  SetDefaultRegionSize();
-}
-
-void wxEllipseShape::GetBoundingBoxMin(double *w, double *h)
-{
-  *w = m_width; *h = m_height;
-}
-
-bool wxEllipseShape::GetPerimeterPoint(double x1, double y1,
-                                      double x2, double y2,
-                                      double *x3, double *y3)
-{
-  double bound_x, bound_y;
-  GetBoundingBoxMax(&bound_x, &bound_y);
-
-//  oglFindEndForBox(bound_x, bound_y, m_xpos, m_ypos, x2, y2, x3, y3);
-  oglDrawArcToEllipse(m_xpos, m_ypos, bound_x, bound_y, x2, y2, x1, y1, x3, y3);
-
-  return true;
-}
-
-void wxEllipseShape::OnDraw(wxDC& dc)
-{
-    if (m_shadowMode != SHADOW_NONE)
-    {
-      if (m_shadowBrush)
-        dc.SetBrush(* m_shadowBrush);
-      dc.SetPen(* g_oglTransparentPen);
-      dc.DrawEllipse((long) ((m_xpos - GetWidth()/2) + m_shadowOffsetX),
-                      (long) ((m_ypos - GetHeight()/2) + m_shadowOffsetY),
-                      (long) GetWidth(), (long) GetHeight());
-    }
-
-    if (m_pen)
-    {
-      if (m_pen->GetWidth() == 0)
-        dc.SetPen(* g_oglTransparentPen);
-      else
-        dc.SetPen(* m_pen);
-    }
-    if (m_brush)
-      dc.SetBrush(* m_brush);
-    dc.DrawEllipse((long) (m_xpos - GetWidth()/2), (long) (m_ypos - GetHeight()/2), (long) GetWidth(), (long) GetHeight());
-}
-
-void wxEllipseShape::SetSize(double x, double y, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(x, y);
-  m_width = x;
-  m_height = y;
-  SetDefaultRegionSize();
-}
-
-#if wxUSE_PROLOGIO
-void wxEllipseShape::WriteAttributes(wxExpr *clause)
-{
-  wxShape::WriteAttributes(clause);
-  clause->AddAttributeValue(wxT("x"), m_xpos);
-  clause->AddAttributeValue(wxT("y"), m_ypos);
-
-  clause->AddAttributeValue(wxT("width"), m_width);
-  clause->AddAttributeValue(wxT("height"), m_height);
-}
-
-void wxEllipseShape::ReadAttributes(wxExpr *clause)
-{
-  wxShape::ReadAttributes(clause);
-  clause->AssignAttributeValue(wxT("width"), &m_width);
-  clause->AssignAttributeValue(wxT("height"), &m_height);
-
-  // In case we're reading an old file, set the region's size
-  if (m_regions.GetCount() == 1)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();
-    region->SetSize(m_width, m_height);
-  }
-}
-#endif
-
-void wxEllipseShape::Copy(wxShape& copy)
-{
-  wxShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxEllipseShape)) );
-
-  wxEllipseShape& ellipseCopy = (wxEllipseShape&) copy;
-
-  ellipseCopy.m_width = m_width;
-  ellipseCopy.m_height = m_height;
-}
-
-int wxEllipseShape::GetNumberOfAttachments() const
-{
-  return wxShape::GetNumberOfAttachments();
-}
-
-// There are 4 attachment points on an ellipse - 0 = top, 1 = right, 2 = bottom,
-// 3 = left.
-bool wxEllipseShape::GetAttachmentPosition(int attachment, double *x, double *y,
-                                         int nth, int no_arcs, wxLineShape *line)
-{
-  if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
-    return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
-
-  if (m_attachmentMode != ATTACHMENT_MODE_NONE)
-  {
-    double top = (double)(m_ypos + m_height/2.0);
-    double bottom = (double)(m_ypos - m_height/2.0);
-    double left = (double)(m_xpos - m_width/2.0);
-    double right = (double)(m_xpos + m_width/2.0);
-
-    int physicalAttachment = LogicalToPhysicalAttachment(attachment);
-
-    switch (physicalAttachment)
-    {
-      case 0:
-      {
-        if (m_spaceAttachments)
-          *x = left + (nth + 1)*m_width/(no_arcs + 1);
-        else *x = m_xpos;
-        *y = top;
-        // We now have the point on the bounding box: but get the point on the ellipse
-        // by imagining a vertical line from (*x, m_ypos - m_height- 500) to (*x, m_ypos) intersecting
-        // the ellipse.
-        oglDrawArcToEllipse(m_xpos, m_ypos, m_width, m_height, *x, (double)(m_ypos-m_height-500), *x, m_ypos, x, y);
-        break;
-      }
-      case 1:
-      {
-        *x = right;
-        if (m_spaceAttachments)
-          *y = bottom + (nth + 1)*m_height/(no_arcs + 1);
-        else *y = m_ypos;
-        oglDrawArcToEllipse(m_xpos, m_ypos, m_width, m_height, (double)(m_xpos+m_width+500), *y, m_xpos, *y, x, y);
-        break;
-      }
-      case 2:
-      {
-        if (m_spaceAttachments)
-          *x = left + (nth + 1)*m_width/(no_arcs + 1);
-        else *x = m_xpos;
-        *y = bottom;
-        oglDrawArcToEllipse(m_xpos, m_ypos, m_width, m_height, *x, (double)(m_ypos+m_height+500), *x, m_ypos, x, y);
-        break;
-      }
-      case 3:
-      {
-        *x = left;
-        if (m_spaceAttachments)
-          *y = bottom + (nth + 1)*m_height/(no_arcs + 1);
-        else *y = m_ypos;
-        oglDrawArcToEllipse(m_xpos, m_ypos, m_width, m_height, (double)(m_xpos-m_width-500), *y, m_xpos, *y, x, y);
-        break;
-      }
-      default:
-      {
-        return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line);
-      }
-    }
-    return true;
-  }
-  else
-  { *x = m_xpos; *y = m_ypos; return true; }
-}
-
-
-// Circle object
-IMPLEMENT_DYNAMIC_CLASS(wxCircleShape, wxEllipseShape)
-
-wxCircleShape::wxCircleShape(double diameter):wxEllipseShape(diameter, diameter)
-{
-    SetMaintainAspectRatio(true);
-}
-
-void wxCircleShape::Copy(wxShape& copy)
-{
-  wxEllipseShape::Copy(copy);
-}
-
-bool wxCircleShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
-                                      double x2, double y2,
-                                      double *x3, double *y3)
-{
-  oglFindEndForCircle(m_width/2,
-                      m_xpos, m_ypos,  // Centre of circle
-                      x2, y2,  // Other end of line
-                      x3, y3);
-
-  return true;
-}
-
-// Control points
-
-double wxControlPoint::sm_controlPointDragStartX = 0.0;
-double wxControlPoint::sm_controlPointDragStartY = 0.0;
-double wxControlPoint::sm_controlPointDragStartWidth = 0.0;
-double wxControlPoint::sm_controlPointDragStartHeight = 0.0;
-double wxControlPoint::sm_controlPointDragEndWidth = 0.0;
-double wxControlPoint::sm_controlPointDragEndHeight = 0.0;
-double wxControlPoint::sm_controlPointDragPosX = 0.0;
-double wxControlPoint::sm_controlPointDragPosY = 0.0;
-
-IMPLEMENT_DYNAMIC_CLASS(wxControlPoint, wxRectangleShape)
-
-wxControlPoint::wxControlPoint(wxShapeCanvas *theCanvas, wxShape *object, double size, double the_xoffset, double the_yoffset, int the_type):wxRectangleShape(size, size)
-{
-  m_canvas = theCanvas;
-  m_shape = object;
-  m_xoffset = the_xoffset;
-  m_yoffset = the_yoffset;
-  m_type = the_type;
-  SetPen(g_oglBlackForegroundPen);
-  SetBrush(wxBLACK_BRUSH);
-  m_oldCursor = NULL;
-  m_visible = true;
-  m_eraseObject = true;
-}
-
-wxControlPoint::~wxControlPoint()
-{
-}
-
-// Don't even attempt to draw any text - waste of time!
-void wxControlPoint::OnDrawContents(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxControlPoint::OnDraw(wxDC& dc)
-{
-  m_xpos = m_shape->GetX() + m_xoffset;
-  m_ypos = m_shape->GetY() + m_yoffset;
-  wxRectangleShape::OnDraw(dc);
-}
-
-void wxControlPoint::OnErase(wxDC& dc)
-{
-  wxRectangleShape::OnErase(dc);
-}
-
-// Implement resizing of canvas object
-void wxControlPoint::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingDragLeft(this, draw, x, y, keys, attachment);
-}
-
-void wxControlPoint::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingBeginDragLeft(this, x, y, keys, attachment);
-}
-
-void wxControlPoint::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingEndDragLeft(this, x, y, keys, attachment);
-}
-
-int wxControlPoint::GetNumberOfAttachments() const
-{
-  return 1;
-}
-
-bool wxControlPoint::GetAttachmentPosition(int WXUNUSED(attachment), double *x, double *y,
-                                         int WXUNUSED(nth), int WXUNUSED(no_arcs), wxLineShape *WXUNUSED(line))
-{
-  *x = m_xpos; *y = m_ypos;
-  return true;
-}
-
-// Control points ('handles') redirect control to the actual shape, to make it easier
-// to override sizing behaviour.
-void wxShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), double x, double y, int keys, int WXUNUSED(attachment))
-{
-  double bound_x;
-  double bound_y;
-  this->GetBoundingBoxMin(&bound_x, &bound_y);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  if (this->GetCentreResize())
-  {
-    // Maintain the same centre point.
-    double new_width = (double)(2.0*fabs(x - this->GetX()));
-    double new_height = (double)(2.0*fabs(y - this->GetY()));
-
-    // Constrain sizing according to what control point you're dragging
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL)
-    {
-        if (GetMaintainAspectRatio())
-        {
-            new_height = bound_y*(new_width/bound_x);
-        }
-        else
-            new_height = bound_y;
-    }
-    else if (pt->m_type == CONTROL_POINT_VERTICAL)
-    {
-        if (GetMaintainAspectRatio())
-        {
-            new_width = bound_x*(new_height/bound_y);
-        }
-        else
-            new_width = bound_x;
-    }
-    else if (pt->m_type == CONTROL_POINT_DIAGONAL && (keys & KEY_SHIFT))
-      new_height = bound_y*(new_width/bound_x);
-
-    if (this->GetFixedWidth())
-      new_width = bound_x;
-
-    if (this->GetFixedHeight())
-      new_height = bound_y;
-
-    pt->sm_controlPointDragEndWidth = new_width;
-    pt->sm_controlPointDragEndHeight = new_height;
-
-    this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
-                                new_width, new_height);
-  }
-  else
-  {
-    // Don't maintain the same centre point!
-    double newX1 = wxMin(pt->sm_controlPointDragStartX, x);
-    double newY1 = wxMin(pt->sm_controlPointDragStartY, y);
-    double newX2 = wxMax(pt->sm_controlPointDragStartX, x);
-    double newY2 = wxMax(pt->sm_controlPointDragStartY, y);
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL)
-    {
-      newY1 = pt->sm_controlPointDragStartY;
-      newY2 = newY1 + pt->sm_controlPointDragStartHeight;
-    }
-    else if (pt->m_type == CONTROL_POINT_VERTICAL)
-    {
-      newX1 = pt->sm_controlPointDragStartX;
-      newX2 = newX1 + pt->sm_controlPointDragStartWidth;
-    }
-    else if (pt->m_type == CONTROL_POINT_DIAGONAL && ((keys & KEY_SHIFT) || GetMaintainAspectRatio()))
-    {
-      double newH = (double)((newX2 - newX1)*(pt->sm_controlPointDragStartHeight/pt->sm_controlPointDragStartWidth));
-      if (GetY() > pt->sm_controlPointDragStartY)
-        newY2 = (double)(newY1 + newH);
-      else
-        newY1 = (double)(newY2 - newH);
-    }
-    double newWidth = (double)(newX2 - newX1);
-    double newHeight = (double)(newY2 - newY1);
-
-    if (pt->m_type == CONTROL_POINT_VERTICAL && GetMaintainAspectRatio())
-    {
-        newWidth = bound_x * (newHeight/bound_y) ;
-    }
-
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL && GetMaintainAspectRatio())
-    {
-        newHeight = bound_y * (newWidth/bound_x) ;
-    }
-
-    pt->sm_controlPointDragPosX = (double)(newX1 + (newWidth/2.0));
-    pt->sm_controlPointDragPosY = (double)(newY1 + (newHeight/2.0));
-    if (this->GetFixedWidth())
-      newWidth = bound_x;
-
-    if (this->GetFixedHeight())
-      newHeight = bound_y;
-
-    pt->sm_controlPointDragEndWidth = newWidth;
-    pt->sm_controlPointDragEndHeight = newHeight;
-    this->GetEventHandler()->OnDrawOutline(dc, pt->sm_controlPointDragPosX, pt->sm_controlPointDragPosY, newWidth, newHeight);
-  }
-}
-
-void wxShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys, int WXUNUSED(attachment))
-{
-  m_canvas->CaptureMouse();
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-/*
-  if (pt->m_eraseObject)
-    this->Erase(dc);
-*/
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  double bound_x;
-  double bound_y;
-  this->GetBoundingBoxMin(&bound_x, &bound_y);
-  this->GetEventHandler()->OnBeginSize(bound_x, bound_y);
-
-  // Choose the 'opposite corner' of the object as the stationary
-  // point in case this is non-centring resizing.
-  if (pt->GetX() < this->GetX())
-    pt->sm_controlPointDragStartX = (double)(this->GetX() + (bound_x/2.0));
-  else
-    pt->sm_controlPointDragStartX = (double)(this->GetX() - (bound_x/2.0));
-
-  if (pt->GetY() < this->GetY())
-    pt->sm_controlPointDragStartY = (double)(this->GetY() + (bound_y/2.0));
-  else
-    pt->sm_controlPointDragStartY = (double)(this->GetY() - (bound_y/2.0));
-
-  if (pt->m_type == CONTROL_POINT_HORIZONTAL)
-    pt->sm_controlPointDragStartY = (double)(this->GetY() - (bound_y/2.0));
-  else if (pt->m_type == CONTROL_POINT_VERTICAL)
-    pt->sm_controlPointDragStartX = (double)(this->GetX() - (bound_x/2.0));
-
-  // We may require the old width and height.
-  pt->sm_controlPointDragStartWidth = bound_x;
-  pt->sm_controlPointDragStartHeight = bound_y;
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  if (this->GetCentreResize())
-  {
-    double new_width = (double)(2.0*fabs(x - this->GetX()));
-    double new_height = (double)(2.0*fabs(y - this->GetY()));
-
-    // Constrain sizing according to what control point you're dragging
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL)
-    {
-        if (GetMaintainAspectRatio())
-        {
-            new_height = bound_y*(new_width/bound_x);
-        }
-        else
-            new_height = bound_y;
-    }
-    else if (pt->m_type == CONTROL_POINT_VERTICAL)
-    {
-        if (GetMaintainAspectRatio())
-        {
-            new_width = bound_x*(new_height/bound_y);
-        }
-        else
-            new_width = bound_x;
-    }
-    else if (pt->m_type == CONTROL_POINT_DIAGONAL && (keys & KEY_SHIFT))
-      new_height = bound_y*(new_width/bound_x);
-
-    if (this->GetFixedWidth())
-      new_width = bound_x;
-
-    if (this->GetFixedHeight())
-      new_height = bound_y;
-
-    pt->sm_controlPointDragEndWidth = new_width;
-    pt->sm_controlPointDragEndHeight = new_height;
-    this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
-                                new_width, new_height);
-  }
-  else
-  {
-    // Don't maintain the same centre point!
-    double newX1 = wxMin(pt->sm_controlPointDragStartX, x);
-    double newY1 = wxMin(pt->sm_controlPointDragStartY, y);
-    double newX2 = wxMax(pt->sm_controlPointDragStartX, x);
-    double newY2 = wxMax(pt->sm_controlPointDragStartY, y);
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL)
-    {
-      newY1 = pt->sm_controlPointDragStartY;
-      newY2 = newY1 + pt->sm_controlPointDragStartHeight;
-    }
-    else if (pt->m_type == CONTROL_POINT_VERTICAL)
-    {
-      newX1 = pt->sm_controlPointDragStartX;
-      newX2 = newX1 + pt->sm_controlPointDragStartWidth;
-    }
-    else if (pt->m_type == CONTROL_POINT_DIAGONAL && ((keys & KEY_SHIFT) || GetMaintainAspectRatio()))
-    {
-      double newH = (double)((newX2 - newX1)*(pt->sm_controlPointDragStartHeight/pt->sm_controlPointDragStartWidth));
-      if (pt->GetY() > pt->sm_controlPointDragStartY)
-        newY2 = (double)(newY1 + newH);
-      else
-        newY1 = (double)(newY2 - newH);
-    }
-    double newWidth = (double)(newX2 - newX1);
-    double newHeight = (double)(newY2 - newY1);
-
-    if (pt->m_type == CONTROL_POINT_VERTICAL && GetMaintainAspectRatio())
-    {
-        newWidth = bound_x * (newHeight/bound_y) ;
-    }
-
-    if (pt->m_type == CONTROL_POINT_HORIZONTAL && GetMaintainAspectRatio())
-    {
-        newHeight = bound_y * (newWidth/bound_x) ;
-    }
-
-    pt->sm_controlPointDragPosX = (double)(newX1 + (newWidth/2.0));
-    pt->sm_controlPointDragPosY = (double)(newY1 + (newHeight/2.0));
-    if (this->GetFixedWidth())
-      newWidth = bound_x;
-
-    if (this->GetFixedHeight())
-      newHeight = bound_y;
-
-    pt->sm_controlPointDragEndWidth = newWidth;
-    pt->sm_controlPointDragEndHeight = newHeight;
-    this->GetEventHandler()->OnDrawOutline(dc, pt->sm_controlPointDragPosX, pt->sm_controlPointDragPosY, newWidth, newHeight);
-  }
-}
-
-void wxShape::OnSizingEndDragLeft(wxControlPoint* pt, double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  m_canvas->ReleaseMouse();
-  dc.SetLogicalFunction(wxCOPY);
-  this->Recompute();
-  this->ResetControlPoints();
-
-  this->Erase(dc);
-/*
-  if (!pt->m_eraseObject)
-    this->Show(false);
-*/
-
-  this->SetSize(pt->sm_controlPointDragEndWidth, pt->sm_controlPointDragEndHeight);
-
-  // The next operation could destroy this control point (it does for label objects,
-  // via formatting the text), so save all values we're going to use, or
-  // we'll be accessing garbage.
-  wxShape *theObject = this;
-  wxShapeCanvas *theCanvas = m_canvas;
-  bool eraseIt = pt->m_eraseObject;
-
-  if (theObject->GetCentreResize())
-    theObject->Move(dc, theObject->GetX(), theObject->GetY());
-  else
-    theObject->Move(dc, pt->sm_controlPointDragPosX, pt->sm_controlPointDragPosY);
-
-/*
-  if (!eraseIt)
-    theObject->Show(true);
-*/
-
-  // Recursively redraw links if we have a composite.
-  if (theObject->GetChildren().GetCount() > 0)
-    theObject->DrawLinks(dc, -1, true);
-
-  double width, height;
-  theObject->GetBoundingBoxMax(&width, &height);
-  theObject->GetEventHandler()->OnEndSize(width, height);
-
-  if (!theCanvas->GetQuickEditMode() && eraseIt) theCanvas->Redraw(dc);
-}
-
-
-
-// Polygon control points
-
-IMPLEMENT_DYNAMIC_CLASS(wxPolygonControlPoint, wxControlPoint)
-
-wxPolygonControlPoint::wxPolygonControlPoint(wxShapeCanvas *theCanvas, wxShape *object, double size,
-  wxRealPoint *vertex, double the_xoffset, double the_yoffset):
-  wxControlPoint(theCanvas, object, size, the_xoffset, the_yoffset, 0)
-{
-  m_polygonVertex = vertex;
-  m_originalDistance = 0.0;
-}
-
-wxPolygonControlPoint::~wxPolygonControlPoint()
-{
-}
-
-// Calculate what new size would be, at end of resize
-void wxPolygonControlPoint::CalculateNewSize(double x, double y)
-{
-  double bound_x;
-  double bound_y;
-  GetShape()->GetBoundingBoxMin(&bound_x, &bound_y);
-
-  double dist = (double)sqrt((x - m_shape->GetX())*(x - m_shape->GetX()) +
-                    (y - m_shape->GetY())*(y - m_shape->GetY()));
-
-  m_newSize.x = (double)(dist/this->m_originalDistance)*this->m_originalSize.x;
-  m_newSize.y = (double)(dist/this->m_originalDistance)*this->m_originalSize.y;
-}
-
-
-// Implement resizing polygon or moving the vertex.
-void wxPolygonControlPoint::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingDragLeft(this, draw, x, y, keys, attachment);
-}
-
-void wxPolygonControlPoint::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingBeginDragLeft(this, x, y, keys, attachment);
-}
-
-void wxPolygonControlPoint::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingEndDragLeft(this, x, y, keys, attachment);
-}
-
-// Control points ('handles') redirect control to the actual shape, to make it easier
-// to override sizing behaviour.
-void wxPolygonShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  #if 0 // keys & KEY_CTRL)
-  {
-    // TODO: mend this code. Currently we rely on altering the
-    // actual points, but we should assume we're not, as per
-    // the normal sizing case.
-    m_canvas->Snap(&x, &y);
-
-    // Move point
-    ppt->m_polygonVertex->x = x - this->GetX();
-    ppt->m_polygonVertex->y = y - this->GetY();
-    ppt->SetX(x);
-    ppt->SetY(y);
-    ((wxPolygonShape *)this)->CalculateBoundingBox();
-    ((wxPolygonShape *)this)->CalculatePolygonCentre();
-  }
-  #else
-  {
-    ppt->CalculateNewSize(x, y);
-  }
-  #endif
-
-  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
-       ppt->GetNewSize().x, ppt->GetNewSize().y);
-}
-
-void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  this->Erase(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  double bound_x;
-  double bound_y;
-  this->GetBoundingBoxMin(&bound_x, &bound_y);
-
-  double dist = (double)sqrt((x - this->GetX())*(x - this->GetX()) +
-                    (y - this->GetY())*(y - this->GetY()));
-  ppt->m_originalDistance = dist;
-  ppt->m_originalSize.x = bound_x;
-  ppt->m_originalSize.y = bound_y;
-
-  if (ppt->m_originalDistance == 0.0) ppt->m_originalDistance = (double) 0.0001;
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  #if 0 // keys & KEY_CTRL)
-  {
-    // TODO: mend this code. Currently we rely on altering the
-    // actual points, but we should assume we're not, as per
-    // the normal sizing case.
-    m_canvas->Snap(&x, &y);
-
-    // Move point
-    ppt->m_polygonVertex->x = x - this->GetX();
-    ppt->m_polygonVertex->y = y - this->GetY();
-    ppt->SetX(x);
-    ppt->SetY(y);
-    ((wxPolygonShape *)this)->CalculateBoundingBox();
-    ((wxPolygonShape *)this)->CalculatePolygonCentre();
-  }
-  #else
-  {
-    ppt->CalculateNewSize(x, y);
-  }
-  #endif
-
-  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
-       ppt->GetNewSize().x, ppt->GetNewSize().y);
-
-  m_canvas->CaptureMouse();
-}
-
-void wxPolygonShape::OnSizingEndDragLeft(wxControlPoint* pt, double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
-{
-  wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  m_canvas->ReleaseMouse();
-  dc.SetLogicalFunction(wxCOPY);
-
-  // If we're changing shape, must reset the original points
-  if (keys & KEY_CTRL)
-  {
-    ((wxPolygonShape *)this)->CalculateBoundingBox();
-    ((wxPolygonShape *)this)->UpdateOriginalPoints();
-  }
-  else
-  {
-    SetSize(ppt->GetNewSize().x, ppt->GetNewSize().y);
-  }
-
-  ((wxPolygonShape *)this)->CalculateBoundingBox();
-  ((wxPolygonShape *)this)->CalculatePolygonCentre();
-
-  this->Recompute();
-  this->ResetControlPoints();
-  this->Move(dc, this->GetX(), this->GetY());
-  if (!m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-
-/*
- * Object region
- *
- */
-IMPLEMENT_DYNAMIC_CLASS(wxShapeRegion, wxObject)
-
-wxShapeRegion::wxShapeRegion()
-{
-  m_regionText = wxEmptyString;
-  m_font = g_oglNormalFont;
-  m_minHeight = 5.0;
-  m_minWidth = 5.0;
-  m_width = 0.0;
-  m_height = 0.0;
-  m_x = 0.0;
-  m_y = 0.0;
-
-  m_regionProportionX = -1.0;
-  m_regionProportionY = -1.0;
-  m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
-  m_regionName = wxEmptyString;
-  m_textColour = wxT("BLACK");
-  m_penColour = wxT("BLACK");
-  m_penStyle = wxSOLID;
-  m_actualColourObject = wxTheColourDatabase->Find(wxT("BLACK"));
-  m_actualPenObject = NULL;
-}
-
-wxShapeRegion::wxShapeRegion(wxShapeRegion& region):wxObject()
-{
-  m_regionText = region.m_regionText;
-  m_regionName = region.m_regionName;
-  m_textColour = region.m_textColour;
-
-  m_font = region.m_font;
-  m_minHeight = region.m_minHeight;
-  m_minWidth = region.m_minWidth;
-  m_width = region.m_width;
-  m_height = region.m_height;
-  m_x = region.m_x;
-  m_y = region.m_y;
-
-  m_regionProportionX = region.m_regionProportionX;
-  m_regionProportionY = region.m_regionProportionY;
-  m_formatMode = region.m_formatMode;
-  m_actualColourObject = region.m_actualColourObject;
-  m_actualPenObject = NULL;
-  m_penStyle = region.m_penStyle;
-  m_penColour = region.m_penColour;
-
-  ClearText();
-  wxObjectList::compatibility_iterator node = region.m_formattedText.GetFirst();
-  while (node)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)node->GetData();
-    wxShapeTextLine *new_line =
-      new wxShapeTextLine(line->GetX(), line->GetY(), line->GetText());
-    m_formattedText.Append(new_line);
-    node = node->GetNext();
-  }
-}
-
-wxShapeRegion::~wxShapeRegion()
-{
-  ClearText();
-}
-
-void wxShapeRegion::ClearText()
-{
-  wxObjectList::compatibility_iterator node = m_formattedText.GetFirst();
-  while (node)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)node->GetData();
-    wxObjectList::compatibility_iterator next = node->GetNext();
-    delete line;
-    m_formattedText.Erase(node);
-    node = next;
-  }
-}
-
-void wxShapeRegion::SetFont(wxFont *f)
-{
-  m_font = f;
-}
-
-void wxShapeRegion::SetMinSize(double w, double h)
-{
-  m_minWidth = w;
-  m_minHeight = h;
-}
-
-void wxShapeRegion::SetSize(double w, double h)
-{
-  m_width = w;
-  m_height = h;
-}
-
-void wxShapeRegion::SetPosition(double xp, double yp)
-{
-  m_x = xp;
-  m_y = yp;
-}
-
-void wxShapeRegion::SetProportions(double xp, double yp)
-{
-  m_regionProportionX = xp;
-  m_regionProportionY = yp;
-}
-
-void wxShapeRegion::SetFormatMode(int mode)
-{
-  m_formatMode = mode;
-}
-
-void wxShapeRegion::SetColour(const wxString& col)
-{
-  m_textColour = col;
-  m_actualColourObject = col;
-}
-
-wxColour wxShapeRegion::GetActualColourObject()
-{
-  m_actualColourObject = wxTheColourDatabase->Find(GetColour());
-  return m_actualColourObject;
-}
-
-void wxShapeRegion::SetPenColour(const wxString& col)
-{
-  m_penColour = col;
-  m_actualPenObject = NULL;
-}
-
-// Returns NULL if the pen is invisible
-// (different to pen being transparent; indicates that
-// region boundary should not be drawn.)
-wxPen *wxShapeRegion::GetActualPen()
-{
-  if (m_actualPenObject)
-    return m_actualPenObject;
-
-  if (!m_penColour) return NULL;
-  if (m_penColour == wxT("Invisible"))
-    return NULL;
-  m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
-  return m_actualPenObject;
-}
-
-
diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
deleted file mode 100644
index 4723ca6a0e..0000000000
--- a/contrib/src/ogl/bmpshape.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bmpshape.cpp
-// Purpose:     Bitmap shape class
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-
-/*
- * Bitmap object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxRectangleShape)
-
-wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
-{
-  m_filename = wxEmptyString;
-}
-
-wxBitmapShape::~wxBitmapShape()
-{
-}
-
-void wxBitmapShape::OnDraw(wxDC& dc)
-{
-  if (!m_bitmap.Ok())
-    return;
-
-  int x, y;
-  x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
-  y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);
-  dc.DrawBitmap(m_bitmap, x, y, true);
-}
-
-void wxBitmapShape::SetSize(double w, double h, bool WXUNUSED(recursive))
-{
-  if (m_bitmap.Ok())
-  {
-    w = m_bitmap.GetWidth();
-    h = m_bitmap.GetHeight();
-  }
-
-  SetAttachmentSize(w, h);
-
-  m_width = w;
-  m_height = h;
-  SetDefaultRegionSize();
-}
-
-#if wxUSE_PROLOGIO
-void wxBitmapShape::WriteAttributes(wxExpr *clause)
-{
-  // Can't really save the bitmap; so instantiate the bitmap
-  // at a higher level in the application, from a symbol library.
-  wxRectangleShape::WriteAttributes(clause);
-  clause->AddAttributeValueString(_T("filename"), m_filename);
-}
-
-void wxBitmapShape::ReadAttributes(wxExpr *clause)
-{
-  wxRectangleShape::ReadAttributes(clause);
-  clause->GetAttributeValue(_T("filename"), m_filename);
-}
-#endif
-
-// Does the copying for this object
-void wxBitmapShape::Copy(wxShape& copy)
-{
-  wxRectangleShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxBitmapShape)) ) ;
-
-  wxBitmapShape& bitmapCopy = (wxBitmapShape&) copy;
-
-  bitmapCopy.m_bitmap = m_bitmap;
-  bitmapCopy.SetFilename(m_filename);
-}
-
-void wxBitmapShape::SetBitmap(const wxBitmap& bm)
-{
-  m_bitmap = bm;
-  if (m_bitmap.Ok())
-    SetSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
-}
-
-
diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
deleted file mode 100644
index 3d9ec3d366..0000000000
--- a/contrib/src/ogl/canvas.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        canvas.cpp
-// Purpose:     Shape canvas class
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "wx/ogl/ogl.h"
-
-#define CONTROL_POINT_SIZE       6
-
-// Control point types
-// Rectangle and most other shapes
-#define CONTROL_POINT_VERTICAL   1
-#define CONTROL_POINT_HORIZONTAL 2
-#define CONTROL_POINT_DIAGONAL   3
-
-// Line
-#define CONTROL_POINT_ENDPOINT_TO 4
-#define CONTROL_POINT_ENDPOINT_FROM 5
-#define CONTROL_POINT_LINE       6
-
-IMPLEMENT_DYNAMIC_CLASS(wxShapeCanvas, wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
-    EVT_PAINT(wxShapeCanvas::OnPaint)
-    EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
-END_EVENT_TABLE()
-
-const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");
-
-// Object canvas
-wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxString& name):
-  wxScrolledWindow(parent, id, pos, size, style, name)
-{
-  m_shapeDiagram = NULL;
-  m_dragState = NoDragging;
-  m_draggedShape = NULL;
-  m_oldDragX = 0;
-  m_oldDragY = 0;
-  m_firstDragX = 0;
-  m_firstDragY = 0;
-  m_checkTolerance = true;
-}
-
-wxShapeCanvas::~wxShapeCanvas()
-{
-}
-
-void wxShapeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-
-    PrepareDC(dc);
-
-    dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
-    dc.Clear();
-
-    if (GetDiagram())
-        GetDiagram()->Redraw(dc);
-}
-
-void wxShapeCanvas::OnMouseEvent(wxMouseEvent& event)
-{
-  wxClientDC dc(this);
-  PrepareDC(dc);
-
-  wxPoint logPos(event.GetLogicalPosition(dc));
-
-  double x, y;
-  x = (double) logPos.x;
-  y = (double) logPos.y;
-
-  int keys = 0;
-  if (event.ShiftDown())
-    keys = keys | KEY_SHIFT;
-  if (event.ControlDown())
-    keys = keys | KEY_CTRL;
-
-  bool dragging = event.Dragging();
-
-  // Check if we're within the tolerance for mouse movements.
-  // If we're very close to the position we started dragging
-  // from, this may not be an intentional drag at all.
-  if (dragging)
-  {
-    int dx = abs(dc.LogicalToDeviceX((long) (x - m_firstDragX)));
-    int dy = abs(dc.LogicalToDeviceY((long) (y - m_firstDragY)));
-    if (m_checkTolerance && (dx <= GetDiagram()->GetMouseTolerance()) && (dy <= GetDiagram()->GetMouseTolerance()))
-    {
-      return;
-    }
-    else
-      // If we've ignored the tolerance once, then ALWAYS ignore
-      // tolerance in this drag, even if we come back within
-      // the tolerance range.
-      m_checkTolerance = false;
-  }
-
-  // Dragging - note that the effect of dragging is left entirely up
-  // to the object, so no movement is done unless explicitly done by
-  // object.
-  if (dragging && m_draggedShape && m_dragState == StartDraggingLeft)
-  {
-    m_dragState = ContinueDraggingLeft;
-
-    // If the object isn't m_draggable, transfer message to canvas
-    if (m_draggedShape->Draggable())
-      m_draggedShape->GetEventHandler()->OnBeginDragLeft((double)x, (double)y, keys, m_draggedAttachment);
-    else
-    {
-      m_draggedShape = NULL;
-      OnBeginDragLeft((double)x, (double)y, keys);
-    }
-
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (dragging && m_draggedShape && m_dragState == ContinueDraggingLeft)
-  {
-    // Continue dragging
-    m_draggedShape->GetEventHandler()->OnDragLeft(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
-    m_draggedShape->GetEventHandler()->OnDragLeft(true, (double)x, (double)y, keys, m_draggedAttachment);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (event.LeftUp() && m_draggedShape && m_dragState == ContinueDraggingLeft)
-  {
-    m_dragState = NoDragging;
-    m_checkTolerance = true;
-
-    m_draggedShape->GetEventHandler()->OnDragLeft(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
-
-    m_draggedShape->GetEventHandler()->OnEndDragLeft((double)x, (double)y, keys, m_draggedAttachment);
-    m_draggedShape = NULL;
-  }
-  else if (dragging && m_draggedShape && m_dragState == StartDraggingRight)
-  {
-    m_dragState = ContinueDraggingRight;
-
-    if (m_draggedShape->Draggable())
-      m_draggedShape->GetEventHandler()->OnBeginDragRight((double)x, (double)y, keys, m_draggedAttachment);
-    else
-    {
-      m_draggedShape = NULL;
-      OnBeginDragRight((double)x, (double)y, keys);
-    }
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (dragging && m_draggedShape && m_dragState == ContinueDraggingRight)
-  {
-    // Continue dragging
-    m_draggedShape->GetEventHandler()->OnDragRight(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
-    m_draggedShape->GetEventHandler()->OnDragRight(true, (double)x, (double)y, keys, m_draggedAttachment);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (event.RightUp() && m_draggedShape && m_dragState == ContinueDraggingRight)
-  {
-    m_dragState = NoDragging;
-    m_checkTolerance = true;
-
-    m_draggedShape->GetEventHandler()->OnDragRight(false, m_oldDragX, m_oldDragY, keys, m_draggedAttachment);
-
-    m_draggedShape->GetEventHandler()->OnEndDragRight((double)x, (double)y, keys, m_draggedAttachment);
-    m_draggedShape = NULL;
-  }
-
-  // All following events sent to canvas, not object
-  else if (dragging && !m_draggedShape && m_dragState == StartDraggingLeft)
-  {
-    m_dragState = ContinueDraggingLeft;
-    OnBeginDragLeft((double)x, (double)y, keys);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingLeft)
-  {
-    // Continue dragging
-    OnDragLeft(false, m_oldDragX, m_oldDragY, keys);
-    OnDragLeft(true, (double)x, (double)y, keys);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (event.LeftUp() && !m_draggedShape && m_dragState == ContinueDraggingLeft)
-  {
-    m_dragState = NoDragging;
-    m_checkTolerance = true;
-
-    OnDragLeft(false, m_oldDragX, m_oldDragY, keys);
-    OnEndDragLeft((double)x, (double)y, keys);
-    m_draggedShape = NULL;
-  }
-  else if (dragging && !m_draggedShape && m_dragState == StartDraggingRight)
-  {
-    m_dragState = ContinueDraggingRight;
-    OnBeginDragRight((double)x, (double)y, keys);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (dragging && !m_draggedShape && m_dragState == ContinueDraggingRight)
-  {
-    // Continue dragging
-    OnDragRight(false, m_oldDragX, m_oldDragY, keys);
-    OnDragRight(true, (double)x, (double)y, keys);
-    m_oldDragX = x; m_oldDragY = y;
-  }
-  else if (event.RightUp() && !m_draggedShape && m_dragState == ContinueDraggingRight)
-  {
-    m_dragState = NoDragging;
-    m_checkTolerance = true;
-
-    OnDragRight(false, m_oldDragX, m_oldDragY, keys);
-    OnEndDragRight((double)x, (double)y, keys);
-    m_draggedShape = NULL;
-  }
-
-  // Non-dragging events
-  else if (event.IsButton())
-  {
-    m_checkTolerance = true;
-
-    // Find the nearest object
-    int attachment = 0;
-    wxShape *nearest_object = FindShape(x, y, &attachment);
-    if (nearest_object) // Object event
-    {
-      if (event.LeftDown())
-      {
-        m_draggedShape = nearest_object;
-        m_draggedAttachment = attachment;
-        m_dragState = StartDraggingLeft;
-        m_firstDragX = x;
-        m_firstDragY = y;
-      }
-      else if (event.LeftUp())
-      {
-        // N.B. Only register a click if the same object was
-        // identified for down *and* up.
-        if (nearest_object == m_draggedShape)
-          nearest_object->GetEventHandler()->OnLeftClick((double)x, (double)y, keys, attachment);
-
-        m_draggedShape = NULL;
-        m_dragState = NoDragging;
-      }
-      else if (event.LeftDClick())
-      {
-        nearest_object->GetEventHandler()->OnLeftDoubleClick((double)x, (double)y, keys, attachment);
-
-        m_draggedShape = NULL;
-        m_dragState = NoDragging;
-      }
-      else if (event.RightDown())
-      {
-        m_draggedShape = nearest_object;
-        m_draggedAttachment = attachment;
-        m_dragState = StartDraggingRight;
-        m_firstDragX = x;
-        m_firstDragY = y;
-      }
-      else if (event.RightUp())
-      {
-        if (nearest_object == m_draggedShape)
-          nearest_object->GetEventHandler()->OnRightClick((double)x, (double)y, keys, attachment);
-
-        m_draggedShape = NULL;
-        m_dragState = NoDragging;
-      }
-    }
-    else // Canvas event (no nearest object)
-    {
-      if (event.LeftDown())
-      {
-        m_draggedShape = NULL;
-        m_dragState = StartDraggingLeft;
-        m_firstDragX = x;
-        m_firstDragY = y;
-      }
-      else if (event.LeftUp())
-      {
-        OnLeftClick((double)x, (double)y, keys);
-
-        m_draggedShape = NULL;
-        m_dragState = NoDragging;
-      }
-      else if (event.RightDown())
-      {
-        m_draggedShape = NULL;
-        m_dragState = StartDraggingRight;
-        m_firstDragX = x;
-        m_firstDragY = y;
-      }
-      else if (event.RightUp())
-      {
-        OnRightClick((double)x, (double)y, keys);
-
-        m_draggedShape = NULL;
-        m_dragState = NoDragging;
-      }
-    }
-  }
-}
-
-/*
- * Try to find a sensitive object, working up the hierarchy of composites.
- *
- */
-wxShape *wxShapeCanvas::FindFirstSensitiveShape(double x, double y, int *new_attachment, int op)
-{
-  wxShape *image = FindShape(x, y, new_attachment);
-  if (!image) return NULL;
-
-  wxShape *actualImage = FindFirstSensitiveShape1(image, op);
-  if (actualImage)
-  {
-    double dist;
-    // Find actual attachment
-    actualImage->HitTest(x, y, new_attachment, &dist);
-  }
-  return actualImage;
-}
-
-wxShape *wxShapeCanvas::FindFirstSensitiveShape1(wxShape *image, int op)
-{
-  if (image->GetSensitivityFilter() & op)
-    return image;
-  if (image->GetParent())
-    return FindFirstSensitiveShape1(image->GetParent(), op);
-  return NULL;
-}
-
-// Helper function: true if 'contains' wholly contains 'contained'.
-static bool WhollyContains(wxShape *contains, wxShape *contained)
-{
-  double xp1, yp1, xp2, yp2;
-  double w1, h1, w2, h2;
-  double left1, top1, right1, bottom1, left2, top2, right2, bottom2;
-
-  xp1 = contains->GetX(); yp1 = contains->GetY(); xp2 = contained->GetX(); yp2 = contained->GetY();
-  contains->GetBoundingBoxMax(&w1, &h1);
-  contained->GetBoundingBoxMax(&w2, &h2);
-
-  left1 = (double)(xp1 - (w1 / 2.0));
-  top1 = (double)(yp1 - (h1 / 2.0));
-  right1 = (double)(xp1 + (w1 / 2.0));
-  bottom1 = (double)(yp1 + (h1 / 2.0));
-
-  left2 = (double)(xp2 - (w2 / 2.0));
-  top2 = (double)(yp2 - (h2 / 2.0));
-  right2 = (double)(xp2 + (w2 / 2.0));
-  bottom2 = (double)(yp2 + (h2 / 2.0));
-
-  return ((left1 <= left2) && (top1 <= top2) && (right1 >= right2) && (bottom1 >= bottom2));
-}
-
-wxShape *wxShapeCanvas::FindShape(double x, double y, int *attachment, wxClassInfo *info, wxShape *notObject)
-{
-  double nearest = 100000.0;
-  int nearest_attachment = 0;
-  wxShape *nearest_object = NULL;
-
-  // Go backward through the object list, since we want:
-  // (a) to have the control points drawn LAST to overlay
-  //     the other objects
-  // (b) to find the control points FIRST if they exist
-
-  wxObjectList::compatibility_iterator current = GetDiagram()->GetShapeList()->GetLast();
-  while (current)
-  {
-    wxShape *object = (wxShape *)current->GetData();
-
-    double dist;
-    int temp_attachment;
-
-    // First pass for lines, which might be inside a container, so we
-    // want lines to take priority over containers. This first loop
-    // could fail if we clickout side a line, so then we'll
-    // try other shapes.
-    if (object->IsShown() &&
-        object->IsKindOf(CLASSINFO(wxLineShape)) &&
-        object->HitTest(x, y, &temp_attachment, &dist) &&
-        ((info == NULL) || object->IsKindOf(info)) &&
-        (!notObject || !notObject->HasDescendant(object)))
-    {
-      // A line is trickier to spot than a normal object.
-      // For a line, since it's the diagonal of the box
-      // we use for the hit test, we may have several
-      // lines in the box and therefore we need to be able
-      // to specify the nearest point to the centre of the line
-      // as our hit criterion, to give the user some room for
-      // manouevre.
-      if (dist < nearest)
-      {
-        nearest = dist;
-        nearest_object = object;
-        nearest_attachment = temp_attachment;
-      }
-    }
-    if (current)
-      current = current->GetPrevious();
-  }
-
-  current = GetDiagram()->GetShapeList()->GetLast();
-  while (current)
-  {
-    wxShape *object = (wxShape *)current->GetData();
-    double dist;
-    int temp_attachment;
-
-    // On second pass, only ever consider non-composites or divisions. If children want to pass
-    // up control to the composite, that's up to them.
-    if (object->IsShown() && (object->IsKindOf(CLASSINFO(wxDivisionShape)) || !object->IsKindOf(CLASSINFO(wxCompositeShape)))
-        && object->HitTest(x, y, &temp_attachment, &dist) && ((info == NULL) || object->IsKindOf(info)) &&
-        (!notObject || !notObject->HasDescendant(object)))
-    {
-      if (!object->IsKindOf(CLASSINFO(wxLineShape)))
-      {
-        // If we've hit a container, and we have already found a line in the
-        // first pass, then ignore the container in case the line is in the container.
-        // Check for division in case line straddles divisions (i.e. is not wholly contained).
-        if (!nearest_object || !(object->IsKindOf(CLASSINFO(wxDivisionShape)) || WhollyContains(object, nearest_object)))
-        {
-          nearest_object = object;
-          nearest_attachment = temp_attachment;
-          current = GetDiagram()->GetShapeList()->GetFirst()->GetPrevious(); // finish loop
-        }
-      }
-    }
-    if (current)
-      current = current->GetPrevious();
-  }
-
-  *attachment = nearest_attachment;
-  return nearest_object;
-}
-
-/*
- * Higher-level events called by OnEvent
- *
- */
-
-void wxShapeCanvas::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnRightClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnDragRight(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnBeginDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::OnEndDragRight(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys))
-{
-}
-
-void wxShapeCanvas::AddShape(wxShape *object, wxShape *addAfter)
- { GetDiagram()->AddShape(object, addAfter); }
-void wxShapeCanvas::InsertShape(wxShape *object)
- { GetDiagram()->InsertShape(object); }
-void wxShapeCanvas::RemoveShape(wxShape *object)
- { GetDiagram()->RemoveShape(object); }
-bool wxShapeCanvas::GetQuickEditMode()
- { return GetDiagram()->GetQuickEditMode(); }
-void wxShapeCanvas::Redraw(wxDC& dc)
- { GetDiagram()->Redraw(dc); }
-void wxShapeCanvas::Snap(double *x, double *y)
- { GetDiagram()->Snap(x, y); }
diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
deleted file mode 100644
index 088b90199a..0000000000
--- a/contrib/src/ogl/composit.cpp
+++ /dev/null
@@ -1,1774 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        composit.cpp
-// Purpose:     Composite OGL class
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-
-#if wxUSE_PROLOGIO
-// Sometimes, objects need to access the whole database to
-// construct themselves.
-wxExprDatabase *GlobalwxExprDatabase = NULL;
-#endif
-
-/*
- * Division control point
- */
-
-class wxDivisionControlPoint: public wxControlPoint
-{
- DECLARE_DYNAMIC_CLASS(wxDivisionControlPoint)
- public:
-  wxDivisionControlPoint() {}
-  wxDivisionControlPoint(wxShapeCanvas *the_canvas, wxShape *object, double size, double the_xoffset, double the_yoffset, int the_type);
-  ~wxDivisionControlPoint();
-
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDivisionControlPoint, wxControlPoint)
-
-/*
- * Composite object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxCompositeShape, wxRectangleShape)
-
-wxCompositeShape::wxCompositeShape(): wxRectangleShape(10.0, 10.0)
-{
-//  selectable = false;
-  m_oldX = m_xpos;
-  m_oldY = m_ypos;
-}
-
-wxCompositeShape::~wxCompositeShape()
-{
-  wxNode *node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    delete constraint;
-    node = node->GetNext();
-  }
-  node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    wxNode *next = node->GetNext();
-    object->Unlink();
-    delete object;
-    node = next;
-  }
-}
-
-void wxCompositeShape::OnDraw(wxDC& dc)
-{
-  double x1 = (double)(m_xpos - m_width/2.0);
-  double y1 = (double)(m_ypos - m_height/2.0);
-
-  if (m_shadowMode != SHADOW_NONE)
-  {
-    if (m_shadowBrush)
-      dc.SetBrush(* m_shadowBrush);
-    dc.SetPen(* g_oglTransparentPen);
-
-    if (m_cornerRadius != 0.0)
-      dc.DrawRoundedRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY),
-                               WXROUND(m_width), WXROUND(m_height), m_cornerRadius);
-    else
-      dc.DrawRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY), WXROUND(m_width), WXROUND(m_height));
-  }
-}
-
-void wxCompositeShape::OnDrawContents(wxDC& dc)
-{
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->Draw(dc);
-    object->DrawLinks(dc);
-    node = node->GetNext();
-  }
-  wxShape::OnDrawContents(dc);
-}
-
-bool wxCompositeShape::OnMovePre(wxDC& dc, double x, double y, double oldx, double oldy, bool display)
-{
-  double diffX = x - oldx;
-  double diffY = y - oldy;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-
-    object->Erase(dc);
-    object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
-
-    node = node->GetNext();
-  }
-  return true;
-}
-
-void wxCompositeShape::OnErase(wxDC& dc)
-{
-  wxRectangleShape::OnErase(dc);
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->Erase(dc);
-    node = node->GetNext();
-  }
-}
-
-static double objectStartX = 0.0;
-static double objectStartY = 0.0;
-
-void wxCompositeShape::OnDragLeft(bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  double xx = x;
-  double yy = y;
-  m_canvas->Snap(&xx, &yy);
-  double offsetX = xx - objectStartX;
-  double offsetY = yy - objectStartY;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  GetEventHandler()->OnDrawOutline(dc, GetX() + offsetX, GetY() + offsetY, GetWidth(), GetHeight());
-//  wxShape::OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxCompositeShape::OnBeginDragLeft(double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  objectStartX = x;
-  objectStartY = y;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  Erase(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-  m_canvas->CaptureMouse();
-
-  double xx = x;
-  double yy = y;
-  m_canvas->Snap(&xx, &yy);
-  double offsetX = xx - objectStartX;
-  double offsetY = yy - objectStartY;
-
-  GetEventHandler()->OnDrawOutline(dc, GetX() + offsetX, GetY() + offsetY, GetWidth(), GetHeight());
-
-//  wxShape::OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxCompositeShape::OnEndDragLeft(double x, double y, int keys, int WXUNUSED(attachment))
-{
-//  wxShape::OnEndDragLeft(x, y, keys, attachment);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  m_canvas->ReleaseMouse();
-
-  if (!m_draggable)
-  {
-    if (m_parent) m_parent->GetEventHandler()->OnEndDragLeft(x, y, keys, 0);
-    return;
-  }
-
-  dc.SetLogicalFunction(wxCOPY);
-  double xx = x;
-  double yy = y;
-  m_canvas->Snap(&xx, &yy);
-  double offsetX = xx - objectStartX;
-  double offsetY = yy - objectStartY;
-
-  Move(dc, GetX() + offsetX, GetY() + offsetY);
-
-  if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-
-void wxCompositeShape::OnRightClick(double x, double y, int keys, int WXUNUSED(attachment))
-{
-  // If we get a ctrl-right click, this means send the message to
-  // the division, so we can invoke a user interface for dealing with regions.
-  if (keys & KEY_CTRL)
-  {
-    wxNode *node = m_divisions.GetFirst();
-    while (node)
-    {
-      wxDivisionShape *division = (wxDivisionShape *)node->GetData();
-      wxNode *next = node->GetNext();
-      int attach = 0;
-      double dist = 0.0;
-      if (division->HitTest(x, y, &attach, &dist))
-      {
-        division->GetEventHandler()->OnRightClick(x, y, keys, attach);
-        node = NULL;
-      }
-      if (node)
-        node = next;
-    }
-  }
-}
-
-void wxCompositeShape::SetSize(double w, double h, bool recursive)
-{
-  SetAttachmentSize(w, h);
-
-  double xScale = (double)(w/(wxMax(1.0, GetWidth())));
-  double yScale = (double)(h/(wxMax(1.0, GetHeight())));
-
-  m_width = w;
-  m_height = h;
-
-  if (!recursive) return;
-
-  wxNode *node = m_children.GetFirst();
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  double xBound, yBound;
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-
-    // Scale the position first
-    double newX = (double)(((object->GetX() - GetX())*xScale) + GetX());
-    double newY = (double)(((object->GetY() - GetY())*yScale) + GetY());
-    object->Show(false);
-    object->Move(dc, newX, newY);
-    object->Show(true);
-
-    // Now set the scaled size
-    object->GetBoundingBoxMin(&xBound, &yBound);
-    object->SetSize(object->GetFixedWidth() ? xBound : xScale*xBound,
-                    object->GetFixedHeight() ? yBound : yScale*yBound);
-
-    node = node->GetNext();
-  }
-  SetDefaultRegionSize();
-}
-
-void wxCompositeShape::AddChild(wxShape *child, wxShape *addAfter)
-{
-  m_children.Append(child);
-  child->SetParent(this);
-  if (m_canvas)
-  {
-    // Ensure we add at the right position
-    if (addAfter)
-      child->RemoveFromCanvas(m_canvas);
-    child->AddToCanvas(m_canvas, addAfter);
-  }
-}
-
-void wxCompositeShape::RemoveChild(wxShape *child)
-{
-  m_children.DeleteObject(child);
-  m_divisions.DeleteObject(child);
-  RemoveChildFromConstraints(child);
-  child->SetParent(NULL);
-}
-
-void wxCompositeShape::DeleteConstraintsInvolvingChild(wxShape *child)
-{
-  wxNode *node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    wxNode *nextNode = node->GetNext();
-
-    if ((constraint->m_constrainingObject == child) ||
-        constraint->m_constrainedObjects.Member(child))
-    {
-      delete constraint;
-      delete node;
-    }
-    node = nextNode;
-  }
-}
-
-void wxCompositeShape::RemoveChildFromConstraints(wxShape *child)
-{
-  wxNode *node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    wxNode *nextNode = node->GetNext();
-
-    if (constraint->m_constrainedObjects.Member(child))
-      constraint->m_constrainedObjects.DeleteObject(child);
-    if (constraint->m_constrainingObject == child)
-      constraint->m_constrainingObject = NULL;
-
-    // Delete the constraint if no participants left
-    if (!constraint->m_constrainingObject)
-    {
-      delete constraint;
-      delete node;
-    }
-
-    node = nextNode;
-  }
-}
-
-void wxCompositeShape::Copy(wxShape& copy)
-{
-  wxRectangleShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxCompositeShape)) ) ;
-
-  wxCompositeShape& compositeCopy = (wxCompositeShape&) copy;
-
-  // Associate old and new copies for compositeCopying constraints and division geometry
-  oglObjectCopyMapping.Append((long)this, &compositeCopy);
-
-  // Copy the children
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    wxShape *newObject = object->CreateNewCopy(false, false);
-    if (newObject->GetId() == 0)
-      newObject->SetId(wxNewId());
-
-    newObject->SetParent(&compositeCopy);
-    compositeCopy.m_children.Append(newObject);
-
-    // Some m_children may be divisions
-    if (m_divisions.Member(object))
-      compositeCopy.m_divisions.Append(newObject);
-
-    oglObjectCopyMapping.Append((long)object, newObject);
-
-    node = node->GetNext();
-  }
-
-  // Copy the constraints
-  node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-
-    wxShape *newConstraining = (wxShape *)(oglObjectCopyMapping.Find((long)constraint->m_constrainingObject)->GetData());
-
-    wxList newConstrainedList;
-    wxNode *node2 = constraint->m_constrainedObjects.GetFirst();
-    while (node2)
-    {
-      wxShape *constrainedObject = (wxShape *)node2->GetData();
-      wxShape *newConstrained = (wxShape *)(oglObjectCopyMapping.Find((long)constrainedObject)->GetData());
-      newConstrainedList.Append(newConstrained);
-      node2 = node2->GetNext();
-    }
-
-    wxOGLConstraint *newConstraint = new wxOGLConstraint(constraint->m_constraintType, newConstraining,
-                                            newConstrainedList);
-    newConstraint->m_constraintId = constraint->m_constraintId;
-    if (constraint->m_constraintName)
-    {
-      newConstraint->m_constraintName = constraint->m_constraintName;
-    }
-    newConstraint->SetSpacing(constraint->m_xSpacing, constraint->m_ySpacing);
-    compositeCopy.m_constraints.Append(newConstraint);
-
-    node = node->GetNext();
-  }
-
-  // Now compositeCopy the division geometry
-  node = m_divisions.GetFirst();
-  while (node)
-  {
-    wxDivisionShape *division = (wxDivisionShape *)node->GetData();
-    wxNode *node1 = oglObjectCopyMapping.Find((long)division);
-    wxNode *leftNode = NULL;
-    wxNode *topNode = NULL;
-    wxNode *rightNode = NULL;
-    wxNode *bottomNode = NULL;
-    if (division->GetLeftSide())
-      leftNode = oglObjectCopyMapping.Find((long)division->GetLeftSide());
-    if (division->GetTopSide())
-      topNode = oglObjectCopyMapping.Find((long)division->GetTopSide());
-    if (division->GetRightSide())
-      rightNode = oglObjectCopyMapping.Find((long)division->GetRightSide());
-    if (division->GetBottomSide())
-      bottomNode = oglObjectCopyMapping.Find((long)division->GetBottomSide());
-    if (node1)
-    {
-      wxDivisionShape *newDivision = (wxDivisionShape *)node1->GetData();
-      if (leftNode)
-        newDivision->SetLeftSide((wxDivisionShape *)leftNode->GetData());
-      if (topNode)
-        newDivision->SetTopSide((wxDivisionShape *)topNode->GetData());
-      if (rightNode)
-        newDivision->SetRightSide((wxDivisionShape *)rightNode->GetData());
-      if (bottomNode)
-        newDivision->SetBottomSide((wxDivisionShape *)bottomNode->GetData());
-    }
-    node = node->GetNext();
-  }
-}
-
-wxOGLConstraint *wxCompositeShape::AddConstraint(wxOGLConstraint *constraint)
-{
-  m_constraints.Append(constraint);
-  if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = wxNewId();
-  return constraint;
-}
-
-wxOGLConstraint *wxCompositeShape::AddConstraint(int type, wxShape *constraining, wxList& constrained)
-{
-  wxOGLConstraint *constraint = new wxOGLConstraint(type, constraining, constrained);
-  if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = wxNewId();
-  m_constraints.Append(constraint);
-  return constraint;
-}
-
-wxOGLConstraint *wxCompositeShape::AddConstraint(int type, wxShape *constraining, wxShape *constrained)
-{
-  wxList l;
-  l.Append(constrained);
-  wxOGLConstraint *constraint = new wxOGLConstraint(type, constraining, l);
-  if (constraint->m_constraintId == 0)
-    constraint->m_constraintId = wxNewId();
-  m_constraints.Append(constraint);
-  return constraint;
-}
-
-wxOGLConstraint *wxCompositeShape::FindConstraint(long cId, wxCompositeShape **actualComposite)
-{
-  wxNode *node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    if (constraint->m_constraintId == cId)
-    {
-      if (actualComposite)
-        *actualComposite = this;
-      return constraint;
-    }
-    node = node->GetNext();
-  }
-  // If not found, try children.
-  node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
-    {
-      wxOGLConstraint *constraint = ((wxCompositeShape *)child)->FindConstraint(cId, actualComposite);
-      if (constraint)
-      {
-        if (actualComposite)
-          *actualComposite = (wxCompositeShape *)child;
-        return constraint;
-      }
-    }
-    node = node->GetNext();
-  }
-  return NULL;
-}
-
-void wxCompositeShape::DeleteConstraint(wxOGLConstraint *constraint)
-{
-  m_constraints.DeleteObject(constraint);
-  delete constraint;
-}
-
-void wxCompositeShape::CalculateSize()
-{
-  double maxX = (double) -999999.9;
-  double maxY = (double) -999999.9;
-  double minX = (double)  999999.9;
-  double minY = (double)  999999.9;
-
-  double w, h;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-
-    // Recalculate size of composite objects because may not conform
-    // to size it was set to - depends on the children.
-    object->CalculateSize();
-
-    object->GetBoundingBoxMax(&w, &h);
-    if ((object->GetX() + (w/2.0)) > maxX)
-      maxX = (double)(object->GetX() + (w/2.0));
-    if ((object->GetX() - (w/2.0)) < minX)
-      minX = (double)(object->GetX() - (w/2.0));
-    if ((object->GetY() + (h/2.0)) > maxY)
-      maxY = (double)(object->GetY() + (h/2.0));
-    if ((object->GetY() - (h/2.0)) < minY)
-      minY = (double)(object->GetY() - (h/2.0));
-
-    node = node->GetNext();
-  }
-  m_width = maxX - minX;
-  m_height = maxY - minY;
-  m_xpos = (double)(m_width/2.0 + minX);
-  m_ypos = (double)(m_height/2.0 + minY);
-}
-
-bool wxCompositeShape::Recompute()
-{
-  int noIterations = 0;
-  bool changed = true;
-  while (changed && (noIterations < 500))
-  {
-    changed = Constrain();
-    noIterations ++;
-  }
-/*
-#ifdef wx_x
-  if (changed)
-    cerr << "Warning: constraint algorithm failed after 500 iterations.\n";
-#endif
-*/
-  return (!changed);
-}
-
-bool wxCompositeShape::Constrain()
-{
-  CalculateSize();
-
-  bool changed = false;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    if (object->Constrain())
-      changed = true;
-    node = node->GetNext();
-  }
-
-  node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    if (constraint->Evaluate()) changed = true;
-    node = node->GetNext();
-  }
-  return changed;
-}
-
-#if wxUSE_PROLOGIO
-void wxCompositeShape::WriteAttributes(wxExpr *clause)
-{
-  wxRectangleShape::WriteAttributes(clause);
-
-//  clause->AddAttributeValue("selectable", (long)selectable);
-
-  // Output constraints as constraint1 = (...), constraint2 = (...), etc.
-  int constraintNo = 1;
-  wxChar m_constraintNameBuf[20];
-  wxNode *node = m_constraints.GetFirst();
-  while (node)
-  {
-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
-    wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo);
-
-    // Each constraint is stored in the form
-    // (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList)
-    wxExpr *constraintExpr = new wxExpr(wxExprList);
-    constraintExpr->Append(new wxExpr((long)constraint->m_constraintType));
-    constraintExpr->Append(new wxExpr(wxExprString, constraint->m_constraintName));
-    constraintExpr->Append(new wxExpr(constraint->m_constraintId));
-    constraintExpr->Append(new wxExpr(constraint->m_xSpacing));
-    constraintExpr->Append(new wxExpr(constraint->m_ySpacing));
-    constraintExpr->Append(new wxExpr(constraint->m_constrainingObject->GetId()));
-
-    wxExpr *objectList = new wxExpr(wxExprList);
-    wxNode *node1 = constraint->m_constrainedObjects.GetFirst();
-    while (node1)
-    {
-      wxShape *obj = (wxShape *)node1->GetData();
-      objectList->Append(new wxExpr(obj->GetId()));
-      node1 = node1->GetNext();
-    }
-    constraintExpr->Append(objectList);
-
-    clause->AddAttributeValue(m_constraintNameBuf, constraintExpr);
-
-    node = node->GetNext();
-    constraintNo ++;
-  }
-
-  // Write the ids of all the child images
-  wxExpr *childrenExpr = new wxExpr(wxExprList);
-  node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    childrenExpr->Append(new wxExpr(child->GetId()));
-    node = node->GetNext();
-  }
-  clause->AddAttributeValue(_T("children"), childrenExpr);
-
-  // Write the ids of all the division images
-  if (m_divisions.GetCount() > 0)
-  {
-    wxExpr *divisionsExpr = new wxExpr(wxExprList);
-    node = m_divisions.GetFirst();
-    while (node)
-    {
-      wxShape *child = (wxShape *)node->GetData();
-      divisionsExpr->Append(new wxExpr(child->GetId()));
-      node = node->GetNext();
-    }
-    clause->AddAttributeValue(_T("divisions"), divisionsExpr);
-  }
-}
-
-// Problem. Child images are always written AFTER the parent
-// so as to be able to link up to parent. So we may not be able
-// to find the constraint participants until we've read everything
-// in. Need to have another pass for composites.
-void wxCompositeShape::ReadAttributes(wxExpr *clause)
-{
-  wxRectangleShape::ReadAttributes(clause);
-
-//  clause->GetAttributeValue("selectable", selectable);
-}
-
-void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
-{
-  // Constraints are output as constraint1 = (...), constraint2 = (...), etc.
-  int constraintNo = 1;
-  wxChar m_constraintNameBuf[20];
-  bool haveConstraints = true;
-
-  while (haveConstraints)
-  {
-    wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo);
-    wxExpr *constraintExpr = NULL;
-    clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr);
-    if (!constraintExpr)
-    {
-      haveConstraints = false;
-      break;
-    }
-    wxString cName = wxEmptyString;
-    wxShape *m_constrainingObject = NULL;
-    wxList m_constrainedObjects;
-
-    // Each constraint is stored in the form
-    // (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList)
-
-    wxExpr *typeExpr = constraintExpr->Nth(0);
-    wxExpr *nameExpr = constraintExpr->Nth(1);
-    wxExpr *idExpr = constraintExpr->Nth(2);
-    wxExpr *xExpr = constraintExpr->Nth(3);
-    wxExpr *yExpr = constraintExpr->Nth(4);
-    wxExpr *constrainingExpr = constraintExpr->Nth(5);
-    wxExpr *constrainedExpr = constraintExpr->Nth(6);
-
-    int cType = (int)typeExpr->IntegerValue();
-    double cXSpacing = xExpr->RealValue();
-    double cYSpacing = yExpr->RealValue();
-    cName = nameExpr->StringValue();
-    long cId = idExpr->IntegerValue();
-
-    wxExpr *objExpr1 = database->HashFind(_T("node_image"), constrainingExpr->IntegerValue());
-    if (objExpr1 && objExpr1->GetClientData())
-      m_constrainingObject = (wxShape *)objExpr1->GetClientData();
-    else
-      wxLogFatalError(wxT("Object graphics error: Couldn't find constraining image of composite."));
-
-    int i = 0;
-    wxExpr *currentIdExpr = constrainedExpr->Nth(i);
-    while (currentIdExpr)
-    {
-      long currentId = currentIdExpr->IntegerValue();
-      wxExpr *objExpr2 = database->HashFind(_T("node_image"), currentId);
-      if (objExpr2 && objExpr2->GetClientData())
-      {
-        m_constrainedObjects.Append((wxShape *)objExpr2->GetClientData());
-      }
-      else
-      {
-        wxLogFatalError(wxT("Object graphics error: Couldn't find constrained image of composite."));
-      }
-
-      i ++;
-      currentIdExpr = constrainedExpr->Nth(i);
-    }
-    wxOGLConstraint *newConstraint = AddConstraint(cType, m_constrainingObject, m_constrainedObjects);
-    newConstraint->SetSpacing(cXSpacing, cYSpacing);
-    newConstraint->m_constraintId = cId;
-    newConstraint->m_constraintName = cName;
-    constraintNo ++;
-  }
-}
-#endif
-
-// Make this composite into a container by creating one wxDivisionShape
-void wxCompositeShape::MakeContainer()
-{
-  wxDivisionShape *division = OnCreateDivision();
-  m_divisions.Append(division);
-  AddChild(division);
-
-  division->SetSize(m_width, m_height);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  division->Move(dc, GetX(), GetY());
-  Recompute();
-  division->Show(true);
-}
-
-wxDivisionShape *wxCompositeShape::OnCreateDivision()
-{
-  return new wxDivisionShape;
-}
-
-wxShape *wxCompositeShape::FindContainerImage()
-{
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    if (!m_divisions.Member(child))
-      return child;
-    node = node->GetNext();
-  }
-  return NULL;
-}
-
-// Returns true if division is a descendant of this container
-bool wxCompositeShape::ContainsDivision(wxDivisionShape *division)
-{
-  if (m_divisions.Member(division))
-    return true;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *child = (wxShape *)node->GetData();
-    if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
-    {
-      bool ans = ((wxCompositeShape *)child)->ContainsDivision(division);
-      if (ans)
-        return true;
-    }
-    node = node->GetNext();
-  }
-  return false;
-}
-
-/*
- * Division object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxDivisionShape, wxCompositeShape)
-
-wxDivisionShape::wxDivisionShape()
-{
-  SetSensitivityFilter(OP_CLICK_LEFT | OP_CLICK_RIGHT | OP_DRAG_RIGHT);
-  SetCentreResize(false);
-  SetAttachmentMode(true);
-  m_leftSide = NULL;
-  m_rightSide = NULL;
-  m_topSide = NULL;
-  m_bottomSide = NULL;
-  m_handleSide = DIVISION_SIDE_NONE;
-  m_leftSidePen = wxBLACK_PEN;
-  m_topSidePen = wxBLACK_PEN;
-  m_leftSideColour = wxT("BLACK");
-  m_topSideColour = wxT("BLACK");
-  m_leftSideStyle = wxT("Solid");
-  m_topSideStyle = wxT("Solid");
-  ClearRegions();
-}
-
-wxDivisionShape::~wxDivisionShape()
-{
-}
-
-void wxDivisionShape::OnDraw(wxDC& dc)
-{
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-    dc.SetBackgroundMode(wxTRANSPARENT);
-
-    double x1 = (double)(GetX() - (GetWidth()/2.0));
-    double y1 = (double)(GetY() - (GetHeight()/2.0));
-    double x2 = (double)(GetX() + (GetWidth()/2.0));
-    double y2 = (double)(GetY() + (GetHeight()/2.0));
-
-    // Should subtract 1 pixel if drawing under Windows
-#ifdef __WXMSW__
-    y2 -= (double)1.0;
-#endif
-
-    if (m_leftSide)
-    {
-      dc.SetPen(* m_leftSidePen);
-      dc.DrawLine(WXROUND(x1), WXROUND(y2), WXROUND(x1), WXROUND(y1));
-    }
-    if (m_topSide)
-    {
-      dc.SetPen(* m_topSidePen);
-      dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y1));
-    }
-
-    // For testing purposes, draw a rectangle so we know
-    // how big the division is.
-//    SetBrush(* wxCYAN_BRUSH);
-//    wxRectangleShape::OnDraw(dc);
-}
-
-void wxDivisionShape::OnDrawContents(wxDC& dc)
-{
-  wxCompositeShape::OnDrawContents(dc);
-}
-
-bool wxDivisionShape::OnMovePre(wxDC& dc, double x, double y, double oldx, double oldy, bool display)
-{
-  double diffX = x - oldx;
-  double diffY = y - oldy;
-  wxNode *node = m_children.GetFirst();
-  while (node)
-  {
-    wxShape *object = (wxShape *)node->GetData();
-    object->Erase(dc);
-    object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
-    node = node->GetNext();
-  }
-  return true;
-}
-
-void wxDivisionShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnDragLeft(draw, x, y, keys, attachment);
-    }
-    return;
-  }
-  wxShape::OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxDivisionShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnBeginDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxShape::OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxDivisionShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  m_canvas->ReleaseMouse();
-  if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnEndDragLeft(x, y, keys, attachment);
-    }
-    return;
-  }
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(wxCOPY);
-
-  m_canvas->Snap(&m_xpos, &m_ypos);
-  GetEventHandler()->OnMovePre(dc, x, y, m_oldX, m_oldY);
-
-  ResetControlPoints();
-  Draw(dc);
-  MoveLinks(dc);
-  GetEventHandler()->OnDrawControlPoints(dc);
-
-  if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-
-void wxDivisionShape::SetSize(double w, double h, bool recursive)
-{
-  m_width = w;
-  m_height = h;
-  wxRectangleShape::SetSize(w, h, recursive);
-}
-
-void wxDivisionShape::CalculateSize()
-{
-}
-
-void wxDivisionShape::Copy(wxShape& copy)
-{
-  wxCompositeShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxDivisionShape)) ) ;
-
-  wxDivisionShape& divisionCopy = (wxDivisionShape&) copy;
-
-  divisionCopy.m_leftSideStyle = m_leftSideStyle;
-  divisionCopy.m_topSideStyle = m_topSideStyle;
-  divisionCopy.m_leftSideColour = m_leftSideColour;
-  divisionCopy.m_topSideColour = m_topSideColour;
-
-  divisionCopy.m_leftSidePen = m_leftSidePen;
-  divisionCopy.m_topSidePen = m_topSidePen;
-  divisionCopy.m_handleSide = m_handleSide;
-
-  // Division geometry copying is handled at the wxCompositeShape level.
-}
-
-#if wxUSE_PROLOGIO
-void wxDivisionShape::WriteAttributes(wxExpr *clause)
-{
-  wxCompositeShape::WriteAttributes(clause);
-
-  if (m_leftSide)
-    clause->AddAttributeValue(_T("left_side"), (long)m_leftSide->GetId());
-  if (m_topSide)
-    clause->AddAttributeValue(_T("top_side"), (long)m_topSide->GetId());
-  if (m_rightSide)
-    clause->AddAttributeValue(_T("right_side"), (long)m_rightSide->GetId());
-  if (m_bottomSide)
-    clause->AddAttributeValue(_T("bottom_side"), (long)m_bottomSide->GetId());
-
-  clause->AddAttributeValue(_T("handle_side"), (long)m_handleSide);
-  clause->AddAttributeValueString(_T("left_colour"), m_leftSideColour);
-  clause->AddAttributeValueString(_T("top_colour"), m_topSideColour);
-  clause->AddAttributeValueString(_T("left_style"), m_leftSideStyle);
-  clause->AddAttributeValueString(_T("top_style"), m_topSideStyle);
-}
-
-void wxDivisionShape::ReadAttributes(wxExpr *clause)
-{
-  wxCompositeShape::ReadAttributes(clause);
-
-  clause->GetAttributeValue(_T("handle_side"), m_handleSide);
-  clause->GetAttributeValue(_T("left_colour"), m_leftSideColour);
-  clause->GetAttributeValue(_T("top_colour"), m_topSideColour);
-  clause->GetAttributeValue(_T("left_style"), m_leftSideStyle);
-  clause->GetAttributeValue(_T("top_style"), m_topSideStyle);
-}
-#endif
-
-// Experimental
-void wxDivisionShape::OnRightClick(double x, double y, int keys, int attachment)
-{
-  if (keys & KEY_CTRL)
-  {
-    PopupMenu(x, y);
-  }
-/*
-  else if (keys & KEY_SHIFT)
-  {
-    if (m_leftSide || m_topSide || m_rightSide || m_bottomSide)
-    {
-      if (Selected())
-      {
-        Select(false);
-        GetParent()->Draw(dc);
-      }
-      else
-        Select(true);
-    }
-  }
-*/
-  else
-  {
-    attachment = 0;
-    double dist;
-    if (m_parent)
-    {
-      m_parent->HitTest(x, y, &attachment, &dist);
-      m_parent->GetEventHandler()->OnRightClick(x, y, keys, attachment);
-    }
-    return;
-  }
-}
-
-
-// Divide wxHORIZONTALly or wxVERTICALly
-bool wxDivisionShape::Divide(int direction)
-{
-  // Calculate existing top-left, bottom-right
-  double x1 = (double)(GetX() - (GetWidth()/2.0));
-  double y1 = (double)(GetY() - (GetHeight()/2.0));
-  wxCompositeShape *compositeParent = (wxCompositeShape *)GetParent();
-  double oldWidth = GetWidth();
-  double oldHeight = GetHeight();
-  if (Selected())
-    Select(false);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  if (direction == wxVERTICAL)
-  {
-    // Dividing vertically means notionally putting a horizontal line through it.
-    // Break existing piece into two.
-    double newXPos1 = GetX();
-    double newYPos1 = (double)(y1 + (GetHeight()/4.0));
-    double newXPos2 = GetX();
-    double newYPos2 = (double)(y1 + (3.0*GetHeight()/4.0));
-    wxDivisionShape *newDivision = compositeParent->OnCreateDivision();
-    newDivision->Show(true);
-
-    Erase(dc);
-
-    // Anything adjoining the bottom of this division now adjoins the
-    // bottom of the new division.
-    wxNode *node = compositeParent->GetDivisions().GetFirst();
-    while (node)
-    {
-      wxDivisionShape *obj = (wxDivisionShape *)node->GetData();
-      if (obj->GetTopSide() == this)
-        obj->SetTopSide(newDivision);
-      node = node->GetNext();
-    }
-    newDivision->SetTopSide(this);
-    newDivision->SetBottomSide(m_bottomSide);
-    newDivision->SetLeftSide(m_leftSide);
-    newDivision->SetRightSide(m_rightSide);
-    m_bottomSide = newDivision;
-
-    compositeParent->GetDivisions().Append(newDivision);
-
-    // CHANGE: Need to insert this division at start of divisions in the object
-    // list, because e.g.:
-    // 1) Add division
-    // 2) Add contained object
-    // 3) Add division
-    // Division is now receiving mouse events _before_ the contained object,
-    // because it was added last (on top of all others)
-
-    // Add after the image that visualizes the container
-    compositeParent->AddChild(newDivision, compositeParent->FindContainerImage());
-
-    m_handleSide = DIVISION_SIDE_BOTTOM;
-    newDivision->SetHandleSide(DIVISION_SIDE_TOP);
-
-    SetSize(oldWidth, (double)(oldHeight/2.0));
-    Move(dc, newXPos1, newYPos1);
-
-    newDivision->SetSize(oldWidth, (double)(oldHeight/2.0));
-    newDivision->Move(dc, newXPos2, newYPos2);
-  }
-  else
-  {
-    // Dividing horizontally means notionally putting a vertical line through it.
-    // Break existing piece into two.
-    double newXPos1 = (double)(x1 + (GetWidth()/4.0));
-    double newYPos1 = GetY();
-    double newXPos2 = (double)(x1 + (3.0*GetWidth()/4.0));
-    double newYPos2 = GetY();
-    wxDivisionShape *newDivision = compositeParent->OnCreateDivision();
-    newDivision->Show(true);
-
-    Erase(dc);
-
-    // Anything adjoining the left of this division now adjoins the
-    // left of the new division.
-    wxNode *node = compositeParent->GetDivisions().GetFirst();
-    while (node)
-    {
-      wxDivisionShape *obj = (wxDivisionShape *)node->GetData();
-      if (obj->GetLeftSide() == this)
-        obj->SetLeftSide(newDivision);
-      node = node->GetNext();
-    }
-    newDivision->SetTopSide(m_topSide);
-    newDivision->SetBottomSide(m_bottomSide);
-    newDivision->SetLeftSide(this);
-    newDivision->SetRightSide(m_rightSide);
-    m_rightSide = newDivision;
-
-    compositeParent->GetDivisions().Append(newDivision);
-    compositeParent->AddChild(newDivision, compositeParent->FindContainerImage());
-
-    m_handleSide = DIVISION_SIDE_RIGHT;
-    newDivision->SetHandleSide(DIVISION_SIDE_LEFT);
-
-    SetSize((double)(oldWidth/2.0), oldHeight);
-    Move(dc, newXPos1, newYPos1);
-
-    newDivision->SetSize((double)(oldWidth/2.0), oldHeight);
-    newDivision->Move(dc, newXPos2, newYPos2);
-  }
-  if (compositeParent->Selected())
-  {
-    compositeParent->DeleteControlPoints(& dc);
-    compositeParent->MakeControlPoints();
-    compositeParent->MakeMandatoryControlPoints();
-  }
-  compositeParent->Draw(dc);
-  return true;
-}
-
-// Make one control point for every visible line
-void wxDivisionShape::MakeControlPoints()
-{
-  MakeMandatoryControlPoints();
-}
-
-void wxDivisionShape::MakeMandatoryControlPoints()
-{
-  double maxX, maxY;
-
-  GetBoundingBoxMax(&maxX, &maxY);
-  double x = 0.0 , y = 0.0;
-  int direction = 0;
-/*
-  if (m_leftSide)
-  {
-    x = (double)(-maxX/2.0);
-    y = 0.0;
-    wxDivisionControlPoint *control = new wxDivisionControlPoint(m_canvas, this, CONTROL_POINT_SIZE, x, y,
-                                             CONTROL_POINT_HORIZONTAL);
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-  }
-  if (m_topSide)
-  {
-    x = 0.0;
-    y = (double)(-maxY/2.0);
-    wxDivisionControlPoint *control = new wxDivisionControlPoint(m_canvas, this, CONTROL_POINT_SIZE, x, y,
-                                             CONTROL_POINT_VERTICAL);
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-  }
-*/
-  switch (m_handleSide)
-  {
-    case DIVISION_SIDE_LEFT:
-    {
-      x = (double)(-maxX/2.0);
-      y = 0.0;
-      direction = CONTROL_POINT_HORIZONTAL;
-      break;
-    }
-    case DIVISION_SIDE_TOP:
-    {
-      x = 0.0;
-      y = (double)(-maxY/2.0);
-      direction = CONTROL_POINT_VERTICAL;
-      break;
-    }
-    case DIVISION_SIDE_RIGHT:
-    {
-      x = (double)(maxX/2.0);
-      y = 0.0;
-      direction = CONTROL_POINT_HORIZONTAL;
-      break;
-    }
-    case DIVISION_SIDE_BOTTOM:
-    {
-      x = 0.0;
-      y = (double)(maxY/2.0);
-      direction = CONTROL_POINT_VERTICAL;
-      break;
-    }
-    default:
-      break;
-  }
-  if (m_handleSide != DIVISION_SIDE_NONE)
-  {
-    wxDivisionControlPoint *control = new wxDivisionControlPoint(m_canvas, this, CONTROL_POINT_SIZE, x, y,
-                                             direction);
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-  }
-}
-
-void wxDivisionShape::ResetControlPoints()
-{
-  ResetMandatoryControlPoints();
-}
-
-void wxDivisionShape::ResetMandatoryControlPoints()
-{
-  if (m_controlPoints.GetCount() < 1)
-    return;
-
-  double maxX, maxY;
-
-  GetBoundingBoxMax(&maxX, &maxY);
-/*
-  wxNode *node = m_controlPoints.GetFirst();
-  while (node)
-  {
-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();
-    if (control->type == CONTROL_POINT_HORIZONTAL)
-    {
-      control->xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;
-    }
-    else if (control->type == CONTROL_POINT_VERTICAL)
-    {
-      control->xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
-    }
-    node = node->GetNext();
-  }
-*/
-  wxNode *node = m_controlPoints.GetFirst();
-  if ((m_handleSide == DIVISION_SIDE_LEFT) && node)
-  {
-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();
-    control->m_xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;
-  }
-
-  if ((m_handleSide == DIVISION_SIDE_TOP) && node)
-  {
-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();
-    control->m_xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
-  }
-
-  if ((m_handleSide == DIVISION_SIDE_RIGHT) && node)
-  {
-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();
-    control->m_xoffset = (double)(maxX/2.0); control->m_yoffset = 0.0;
-  }
-
-  if ((m_handleSide == DIVISION_SIDE_BOTTOM) && node)
-  {
-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();
-    control->m_xoffset = 0.0; control->m_yoffset = (double)(maxY/2.0);
-  }
-}
-
-// Adjust a side, returning false if it's not physically possible.
-bool wxDivisionShape::AdjustLeft(double left, bool test)
-{
-  double x2 = (double)(GetX() + (GetWidth()/2.0));
-
-  if (left >= x2)
-    return false;
-  if (test)
-    return true;
-
-  double newW = x2 - left;
-  double newX = (double)(left + newW/2.0);
-  SetSize(newW, GetHeight());
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  Move(dc, newX, GetY());
-
-  return true;
-}
-
-bool wxDivisionShape::AdjustTop(double top, bool test)
-{
-  double y2 = (double)(GetY() + (GetHeight()/2.0));
-
-  if (top >= y2)
-    return false;
-  if (test)
-    return true;
-
-  double newH = y2 - top;
-  double newY = (double)(top + newH/2.0);
-  SetSize(GetWidth(), newH);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  Move(dc, GetX(), newY);
-
-  return true;
-}
-
-bool wxDivisionShape::AdjustRight(double right, bool test)
-{
-  double x1 = (double)(GetX() - (GetWidth()/2.0));
-
-  if (right <= x1)
-    return false;
-  if (test)
-    return true;
-
-  double newW = right - x1;
-  double newX = (double)(x1 + newW/2.0);
-  SetSize(newW, GetHeight());
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  Move(dc, newX, GetY());
-
-  return true;
-}
-
-bool wxDivisionShape::AdjustBottom(double bottom, bool test)
-{
-  double y1 = (double)(GetY() - (GetHeight()/2.0));
-
-  if (bottom <= y1)
-    return false;
-  if (test)
-    return true;
-
-  double newH = bottom - y1;
-  double newY = (double)(y1 + newH/2.0);
-  SetSize(GetWidth(), newH);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  Move(dc, GetX(), newY);
-
-  return true;
-}
-
-wxDivisionControlPoint::wxDivisionControlPoint(wxShapeCanvas *the_canvas, wxShape *object, double size, double the_xoffset, double the_yoffset, int the_type):
-  wxControlPoint(the_canvas, object, size, the_xoffset, the_yoffset, the_type)
-{
-  SetEraseObject(false);
-}
-
-wxDivisionControlPoint::~wxDivisionControlPoint()
-{
-}
-
-static double originalX = 0.0;
-static double originalY = 0.0;
-static double originalW = 0.0;
-static double originalH = 0.0;
-
-// Implement resizing of canvas object
-void wxDivisionControlPoint::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  wxControlPoint::OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxDivisionControlPoint::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  wxDivisionShape *division = (wxDivisionShape *)m_shape;
-  originalX = division->GetX();
-  originalY = division->GetY();
-  originalW = division->GetWidth();
-  originalH = division->GetHeight();
-
-  wxControlPoint::OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxDivisionControlPoint::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  wxControlPoint::OnEndDragLeft(x, y, keys, attachment);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  wxDivisionShape *division = (wxDivisionShape *)m_shape;
-  wxCompositeShape *divisionParent = (wxCompositeShape *)division->GetParent();
-
-  // Need to check it's within the bounds of the parent composite.
-  double x1 = (double)(divisionParent->GetX() - (divisionParent->GetWidth()/2.0));
-  double y1 = (double)(divisionParent->GetY() - (divisionParent->GetHeight()/2.0));
-  double x2 = (double)(divisionParent->GetX() + (divisionParent->GetWidth()/2.0));
-  double y2 = (double)(divisionParent->GetY() + (divisionParent->GetHeight()/2.0));
-
-  // Need to check it has not made the division zero or negative width/height
-  double dx1 = (double)(division->GetX() - (division->GetWidth()/2.0));
-  double dy1 = (double)(division->GetY() - (division->GetHeight()/2.0));
-  double dx2 = (double)(division->GetX() + (division->GetWidth()/2.0));
-  double dy2 = (double)(division->GetY() + (division->GetHeight()/2.0));
-
-  bool success = true;
-  switch (division->GetHandleSide())
-  {
-    case DIVISION_SIDE_LEFT:
-    {
-      if ((x <= x1) || (x >= x2) || (x >= dx2))
-        success = false;
-      // Try it out first...
-      else if (!division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, true))
-        success = false;
-      else
-        division->ResizeAdjoining(DIVISION_SIDE_LEFT, x, false);
-
-      break;
-    }
-    case DIVISION_SIDE_TOP:
-    {
-      if ((y <= y1) || (y >= y2) || (y >= dy2))
-        success = false;
-      else if (!division->ResizeAdjoining(DIVISION_SIDE_TOP, y, true))
-        success = false;
-      else
-        division->ResizeAdjoining(DIVISION_SIDE_TOP, y, false);
-
-      break;
-    }
-    case DIVISION_SIDE_RIGHT:
-    {
-      if ((x <= x1) || (x >= x2) || (x <= dx1))
-        success = false;
-      else if (!division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, true))
-        success = false;
-      else
-        division->ResizeAdjoining(DIVISION_SIDE_RIGHT, x, false);
-
-      break;
-    }
-    case DIVISION_SIDE_BOTTOM:
-    {
-      if ((y <= y1) || (y >= y2) || (y <= dy1))
-        success = false;
-      else if (!division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, true))
-        success = false;
-      else
-        division->ResizeAdjoining(DIVISION_SIDE_BOTTOM, y, false);
-
-      break;
-    }
-  }
-  if (!success)
-  {
-    division->SetSize(originalW, originalH);
-    division->Move(dc, originalX, originalY);
-  }
-  divisionParent->Draw(dc);
-  division->GetEventHandler()->OnDrawControlPoints(dc);
-}
-
-/* Resize adjoining divisions.
- *
-   Behaviour should be as follows:
-   If right edge moves, find all objects whose left edge
-   adjoins this object, and move left edge accordingly.
-   If left..., move ... right.
-   If top..., move ... bottom.
-   If bottom..., move top.
-   If size goes to zero or end position is other side of start position,
-   resize to original size and return.
- */
-bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
-{
-  wxCompositeShape *divisionParent = (wxCompositeShape *)GetParent();
-  wxNode *node = divisionParent->GetDivisions().GetFirst();
-  while (node)
-  {
-    wxDivisionShape *division = (wxDivisionShape *)node->GetData();
-    switch (side)
-    {
-      case DIVISION_SIDE_LEFT:
-      {
-        if (division->m_rightSide == this)
-        {
-          bool success = division->AdjustRight(newPos, test);
-          if (!success && test)
-            return false;
-        }
-        break;
-      }
-      case DIVISION_SIDE_TOP:
-      {
-        if (division->m_bottomSide == this)
-        {
-          bool success = division->AdjustBottom(newPos, test);
-          if (!success && test)
-            return false;
-        }
-        break;
-      }
-      case DIVISION_SIDE_RIGHT:
-      {
-        if (division->m_leftSide == this)
-        {
-          bool success = division->AdjustLeft(newPos, test);
-          if (!success && test)
-            return false;
-        }
-        break;
-      }
-      case DIVISION_SIDE_BOTTOM:
-      {
-        if (division->m_topSide == this)
-        {
-          bool success = division->AdjustTop(newPos, test);
-          if (!success && test)
-            return false;
-        }
-        break;
-      }
-      default:
-        break;
-    }
-    node = node->GetNext();
-  }
-
-  return true;
-}
-
-/*
- * Popup menu for editing divisions
- *
- */
-class OGLPopupDivisionMenu : public wxMenu {
-public:
-    OGLPopupDivisionMenu() : wxMenu() {
-        Append(DIVISION_MENU_SPLIT_HORIZONTALLY, wxT("Split horizontally"));
-        Append(DIVISION_MENU_SPLIT_VERTICALLY, wxT("Split vertically"));
-        AppendSeparator();
-        Append(DIVISION_MENU_EDIT_LEFT_EDGE, wxT("Edit left edge"));
-        Append(DIVISION_MENU_EDIT_TOP_EDGE, wxT("Edit top edge"));
-    }
-
-    void OnMenu(wxCommandEvent& event);
-
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(OGLPopupDivisionMenu, wxMenu)
-    EVT_MENU_RANGE(DIVISION_MENU_SPLIT_HORIZONTALLY,
-                     DIVISION_MENU_EDIT_BOTTOM_EDGE,
-                     OGLPopupDivisionMenu::OnMenu)
-END_EVENT_TABLE()
-
-
-void OGLPopupDivisionMenu::OnMenu(wxCommandEvent& event)
-{
-  wxDivisionShape *division = (wxDivisionShape *)GetClientData();
-  switch (event.GetInt())
-  {
-    case DIVISION_MENU_SPLIT_HORIZONTALLY:
-    {
-      division->Divide(wxHORIZONTAL);
-      break;
-    }
-    case DIVISION_MENU_SPLIT_VERTICALLY:
-    {
-      division->Divide(wxVERTICAL);
-      break;
-    }
-    case DIVISION_MENU_EDIT_LEFT_EDGE:
-    {
-      division->EditEdge(DIVISION_SIDE_LEFT);
-      break;
-    }
-    case DIVISION_MENU_EDIT_TOP_EDGE:
-    {
-      division->EditEdge(DIVISION_SIDE_TOP);
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void wxDivisionShape::EditEdge(int WXUNUSED(side))
-{
-  wxMessageBox(wxT("EditEdge() not implemented"), wxT("OGL"), wxOK);
-
-#if 0
-  wxBeginBusyCursor();
-
-  wxPen *currentPen = NULL;
-  char **pColour = NULL;
-  char **pStyle = NULL;
-  if (side == DIVISION_SIDE_LEFT)
-  {
-    currentPen = m_leftSidePen;
-    pColour = &m_leftSideColour;
-    pStyle = &m_leftSideStyle;
-  }
-  else
-  {
-    currentPen = m_topSidePen;
-    pColour = &m_topSideColour;
-    pStyle = &m_topSideStyle;
-  }
-
-  GraphicsForm *form = new GraphicsForm("Containers");
-  int lineWidth = currentPen->GetWidth();
-
-  form->Add(wxMakeFormShort("Width", &lineWidth, wxFORM_DEFAULT, NULL, NULL, wxVERTICAL,
-               150));
-  form->Add(wxMakeFormString("Colour", pColour, wxFORM_CHOICE,
-            new wxList(wxMakeConstraintStrings(
-  "BLACK"            ,
-  "BLUE"             ,
-  "BROWN"            ,
-  "CORAL"            ,
-  "CYAN"             ,
-  "DARK GREY"        ,
-  "DARK GREEN"       ,
-  "DIM GREY"         ,
-  "GREY"             ,
-  "GREEN"            ,
-  "LIGHT BLUE"       ,
-  "LIGHT GREY"       ,
-  "MAGENTA"          ,
-  "MAROON"           ,
-  "NAVY"             ,
-  "ORANGE"           ,
-  "PURPLE"           ,
-  "RED"              ,
-  "TURQUOISE"        ,
-  "VIOLET"           ,
-  "WHITE"            ,
-  "YELLOW"           ,
-  NULL),
-  NULL), NULL, wxVERTICAL, 150));
-  form->Add(wxMakeFormString("Style", pStyle, wxFORM_CHOICE,
-            new wxList(wxMakeConstraintStrings(
-  "Solid"            ,
-  "Short Dash"       ,
-  "Long Dash"        ,
-  "Dot"              ,
-  "Dot Dash"         ,
-  NULL),
-  NULL), NULL, wxVERTICAL, 100));
-
-  wxDialogBox *dialog = new wxDialogBox(m_canvas->GetParent(), "Division properties", 10, 10, 500, 500);
-  if (GraphicsLabelFont)
-    dialog->SetLabelFont(GraphicsLabelFont);
-  if (GraphicsButtonFont)
-    dialog->SetButtonFont(GraphicsButtonFont);
-
-  form->AssociatePanel(dialog);
-  form->dialog = dialog;
-
-  dialog->Fit();
-  dialog->Centre(wxBOTH);
-
-  wxEndBusyCursor();
-  dialog->Show(true);
-
-  int lineStyle = wxSOLID;
-  if (*pStyle)
-  {
-    if (strcmp(*pStyle, "Solid") == 0)
-      lineStyle = wxSOLID;
-    else if (strcmp(*pStyle, "Dot") == 0)
-      lineStyle = wxDOT;
-    else if (strcmp(*pStyle, "Short Dash") == 0)
-      lineStyle = wxSHORT_DASH;
-    else if (strcmp(*pStyle, "Long Dash") == 0)
-      lineStyle = wxLONG_DASH;
-    else if (strcmp(*pStyle, "Dot Dash") == 0)
-      lineStyle = wxDOT_DASH;
-  }
-
-  wxPen *newPen = wxThePenList->FindOrCreatePen(*pColour, lineWidth, lineStyle);
-  if (!pen)
-    pen = wxBLACK_PEN;
-  if (side == DIVISION_SIDE_LEFT)
-    m_leftSidePen = newPen;
-  else
-    m_topSidePen = newPen;
-
-  // Need to draw whole image again
-  wxCompositeShape *compositeParent = (wxCompositeShape *)GetParent();
-  compositeParent->Draw(dc);
-#endif
-}
-
-// Popup menu
-void wxDivisionShape::PopupMenu(double x, double y)
-{
-  wxMenu* oglPopupDivisionMenu = new OGLPopupDivisionMenu;
-
-  oglPopupDivisionMenu->SetClientData((void *)this);
-  if (m_leftSide)
-    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, true);
-  else
-    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, false);
-  if (m_topSide)
-    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, true);
-  else
-    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, false);
-
-  int x1, y1;
-  m_canvas->GetViewStart(&x1, &y1);
-
-  int unit_x, unit_y;
-  m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  int mouse_x = (int)(dc.LogicalToDeviceX((long)(x - x1*unit_x)));
-  int mouse_y = (int)(dc.LogicalToDeviceY((long)(y - y1*unit_y)));
-
-  m_canvas->PopupMenu(oglPopupDivisionMenu, mouse_x, mouse_y);
-  delete oglPopupDivisionMenu;
-}
-
-void wxDivisionShape::SetLeftSideColour(const wxString& colour)
-{
-  m_leftSideColour = colour;
-}
-
-void wxDivisionShape::SetTopSideColour(const wxString& colour)
-{
-  m_topSideColour = colour;
-}
-
-void wxDivisionShape::SetLeftSideStyle(const wxString& style)
-{
-  m_leftSideStyle = style;
-}
-
-void wxDivisionShape::SetTopSideStyle(const wxString& style)
-{
-  m_topSideStyle = style;
-}
-
diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
deleted file mode 100644
index 0e1a104447..0000000000
--- a/contrib/src/ogl/constrnt.cpp
+++ /dev/null
@@ -1,620 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        constrnt.cpp
-// Purpose:     OGL Constraint classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-
-wxList *wxOGLConstraintTypes = NULL;
-
-/*
- * Constraint type
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxOGLConstraintType, wxObject)
-
-wxOGLConstraintType::wxOGLConstraintType(int theType, const wxString& theName, const wxString& thePhrase)
-{
-  m_type = theType;
-  m_name = theName;
-  m_phrase = thePhrase;
-}
-
-wxOGLConstraintType::~wxOGLConstraintType()
-{
-}
-
-void OGLInitializeConstraintTypes()
-{
-    if (!wxOGLConstraintTypes)
-        return;
-
-    wxOGLConstraintTypes = new wxList(wxKEY_INTEGER);
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_VERTICALLY,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_VERTICALLY, wxT("Centre vertically"), wxT("centred vertically w.r.t.")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_HORIZONTALLY,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_HORIZONTALLY, wxT("Centre horizontally"), wxT("centred horizontally w.r.t.")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_BOTH,
-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_BOTH, wxT("Centre"), wxT("centred w.r.t.")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_LEFT_OF,
-        new wxOGLConstraintType(gyCONSTRAINT_LEFT_OF, wxT("Left of"), wxT("left of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_RIGHT_OF,
-        new wxOGLConstraintType(gyCONSTRAINT_RIGHT_OF, wxT("Right of"), wxT("right of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_ABOVE,
-        new wxOGLConstraintType(gyCONSTRAINT_ABOVE, wxT("Above"), wxT("above")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_BELOW,
-        new wxOGLConstraintType(gyCONSTRAINT_BELOW, wxT("Below"), wxT("below")));
-
-    // Alignment
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_TOP,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_TOP, wxT("Top-aligned"), wxT("aligned to the top of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_BOTTOM,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_BOTTOM, wxT("Bottom-aligned"), wxT("aligned to the bottom of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_LEFT,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_LEFT, wxT("Left-aligned"), wxT("aligned to the left of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_RIGHT,
-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_RIGHT, wxT("Right-aligned"), wxT("aligned to the right of")));
-
-    // Mid-alignment
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_TOP,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_TOP, wxT("Top-midaligned"), wxT("centred on the top of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_BOTTOM,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_BOTTOM, wxT("Bottom-midaligned"), wxT("centred on the bottom of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_LEFT,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_LEFT, wxT("Left-midaligned"), wxT("centred on the left of")));
-
-    wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_RIGHT,
-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_RIGHT, wxT("Right-midaligned"), wxT("centred on the right of")));
-}
-
-void OGLCleanUpConstraintTypes()
-{
-    if (!wxOGLConstraintTypes)
-        return;
-
-    wxNode* node = wxOGLConstraintTypes->GetFirst();
-    while (node)
-    {
-        wxOGLConstraintType* ct = (wxOGLConstraintType*) node->GetData();
-        delete ct;
-        node = node->GetNext();
-    }
-    delete wxOGLConstraintTypes;
-    wxOGLConstraintTypes = NULL;
-}
-
-/*
- * Constraint Stuff
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxOGLConstraint, wxObject)
-
-wxOGLConstraint::wxOGLConstraint(int type, wxShape *constraining, wxList& constrained)
-{
-  m_xSpacing = 0.0;
-  m_ySpacing = 0.0;
-
-  m_constraintType = type;
-  m_constrainingObject = constraining;
-
-  m_constraintId = 0;
-  m_constraintName = wxT("noname");
-
-  wxNode *node = constrained.GetFirst();
-  while (node)
-  {
-    m_constrainedObjects.Append(node->GetData());
-    node = node->GetNext();
-  }
-}
-
-wxOGLConstraint::~wxOGLConstraint()
-{
-}
-
-bool wxOGLConstraint::Equals(double a, double b)
-{
-  double marg = 0.5;
-
-  bool eq = ((b <= a + marg) && (b >= a - marg));
-  return eq;
-}
-
-// Return true if anything changed
-bool wxOGLConstraint::Evaluate()
-{
-  double maxWidth, maxHeight, minWidth, minHeight, x, y;
-  m_constrainingObject->GetBoundingBoxMax(&maxWidth, &maxHeight);
-  m_constrainingObject->GetBoundingBoxMin(&minWidth, &minHeight);
-  x = m_constrainingObject->GetX();
-  y = m_constrainingObject->GetY();
-
-  wxClientDC dc(m_constrainingObject->GetCanvas());
-  m_constrainingObject->GetCanvas()->PrepareDC(dc);
-
-  switch (m_constraintType)
-  {
-    case gyCONSTRAINT_CENTRED_VERTICALLY:
-    {
-      int n = m_constrainedObjects.GetCount();
-      double totalObjectHeight = 0.0;
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        totalObjectHeight += height2;
-        node = node->GetNext();
-      }
-      double startY;
-      double spacingY;
-      // Check if within the constraining object...
-      if ((totalObjectHeight + (n + 1)*m_ySpacing) <= minHeight)
-      {
-        spacingY = (double)((minHeight - totalObjectHeight)/(n + 1));
-        startY = (double)(y - (minHeight/2.0));
-      }
-      // Otherwise, use default spacing
-      else
-      {
-        spacingY = m_ySpacing;
-        startY = (double)(y - ((totalObjectHeight + (n+1)*spacingY)/2.0));
-      }
-
-      // Now position the objects
-      bool changed = false;
-      node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        startY += (double)(spacingY + (height2/2.0));
-        if (!Equals(startY, constrainedObject->GetY()))
-        {
-          constrainedObject->Move(dc, constrainedObject->GetX(), startY, false);
-          changed = true;
-        }
-        startY += (double)(height2/2.0);
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_CENTRED_HORIZONTALLY:
-    {
-      int n = m_constrainedObjects.GetCount();
-      double totalObjectWidth = 0.0;
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        totalObjectWidth += width2;
-        node = node->GetNext();
-      }
-      double startX;
-      double spacingX;
-      // Check if within the constraining object...
-      if ((totalObjectWidth + (n + 1)*m_xSpacing) <= minWidth)
-      {
-        spacingX = (double)((minWidth - totalObjectWidth)/(n + 1));
-        startX = (double)(x - (minWidth/2.0));
-      }
-      // Otherwise, use default spacing
-      else
-      {
-        spacingX = m_xSpacing;
-        startX = (double)(x - ((totalObjectWidth + (n+1)*spacingX)/2.0));
-      }
-
-      // Now position the objects
-      bool changed = false;
-      node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        startX += (double)(spacingX + (width2/2.0));
-        if (!Equals(startX, constrainedObject->GetX()))
-        {
-          constrainedObject->Move(dc, startX, constrainedObject->GetY(), false);
-          changed = true;
-        }
-        startX += (double)(width2/2.0);
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_CENTRED_BOTH:
-    {
-      int n = m_constrainedObjects.GetCount();
-      double totalObjectWidth = 0.0;
-      double totalObjectHeight = 0.0;
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        totalObjectWidth += width2;
-        totalObjectHeight += height2;
-        node = node->GetNext();
-      }
-      double startX;
-      double spacingX;
-      double startY;
-      double spacingY;
-
-      // Check if within the constraining object...
-      if ((totalObjectWidth + (n + 1)*m_xSpacing) <= minWidth)
-      {
-        spacingX = (double)((minWidth - totalObjectWidth)/(n + 1));
-        startX = (double)(x - (minWidth/2.0));
-      }
-      // Otherwise, use default spacing
-      else
-      {
-        spacingX = m_xSpacing;
-        startX = (double)(x - ((totalObjectWidth + (n+1)*spacingX)/2.0));
-      }
-
-      // Check if within the constraining object...
-      if ((totalObjectHeight + (n + 1)*m_ySpacing) <= minHeight)
-      {
-        spacingY = (double)((minHeight - totalObjectHeight)/(n + 1));
-        startY = (double)(y - (minHeight/2.0));
-      }
-      // Otherwise, use default spacing
-      else
-      {
-        spacingY = m_ySpacing;
-        startY = (double)(y - ((totalObjectHeight + (n+1)*spacingY)/2.0));
-      }
-
-      // Now position the objects
-      bool changed = false;
-      node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-        startX += (double)(spacingX + (width2/2.0));
-        startY += (double)(spacingY + (height2/2.0));
-
-        if ((!Equals(startX, constrainedObject->GetX())) || (!Equals(startY, constrainedObject->GetY())))
-        {
-          constrainedObject->Move(dc, startX, startY, false);
-          changed = true;
-        }
-
-        startX += (double)(width2/2.0);
-        startY += (double)(height2/2.0);
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_LEFT_OF:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double x3 = (double)(x - (minWidth/2.0) - (width2/2.0) - m_xSpacing);
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_RIGHT_OF:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double x3 = (double)(x + (minWidth/2.0) + (width2/2.0) + m_xSpacing);
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_ABOVE:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double y3 = (double)(y - (minHeight/2.0) - (height2/2.0) - m_ySpacing);
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_BELOW:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double y3 = (double)(y + (minHeight/2.0) + (height2/2.0) + m_ySpacing);
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_ALIGNED_LEFT:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double x3 = (double)(x - (minWidth/2.0) + (width2/2.0) + m_xSpacing);
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_ALIGNED_RIGHT:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double x3 = (double)(x + (minWidth/2.0) - (width2/2.0) - m_xSpacing);
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-      #if 0
-      // two returned values ?
-      return false;
-      #endif
-    }
-    case gyCONSTRAINT_ALIGNED_TOP:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double y3 = (double)(y - (minHeight/2.0) + (height2/2.0) + m_ySpacing);
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_ALIGNED_BOTTOM:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double width2, height2;
-        constrainedObject->GetBoundingBoxMax(&width2, &height2);
-
-        double y3 = (double)(y + (minHeight/2.0) - (height2/2.0) - m_ySpacing);
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_MIDALIGNED_LEFT:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double x3 = (double)(x - (minWidth/2.0));
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_MIDALIGNED_RIGHT:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double x3 = (double)(x + (minWidth/2.0));
-        if (!Equals(x3, constrainedObject->GetX()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-      #if 0
-      // two returned values ?
-      return false;
-      #endif
-    }
-    case gyCONSTRAINT_MIDALIGNED_TOP:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double y3 = (double)(y - (minHeight/2.0));
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    case gyCONSTRAINT_MIDALIGNED_BOTTOM:
-    {
-      bool changed = false;
-
-      wxNode *node = m_constrainedObjects.GetFirst();
-      while (node)
-      {
-        wxShape *constrainedObject = (wxShape *)node->GetData();
-
-        double y3 = (double)(y + (minHeight/2.0));
-        if (!Equals(y3, constrainedObject->GetY()))
-        {
-          changed = true;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
-        }
-
-        node = node->GetNext();
-      }
-      return changed;
-    }
-    #if 0
-    // default value handled in main function body
-    default:
-      return false;
-    #endif
-  }
-  return false;
-}
-
diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp
deleted file mode 100644
index a84d56973e..0000000000
--- a/contrib/src/ogl/divided.cpp
+++ /dev/null
@@ -1,701 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        divided.cpp
-// Purpose:     wxDividedShape class
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-
-class wxDividedShapeControlPoint: public wxControlPoint
-{
- DECLARE_DYNAMIC_CLASS(wxDividedShapeControlPoint)
- private:
-  int regionId;
- public:
-  wxDividedShapeControlPoint() { regionId = 0; }
-  wxDividedShapeControlPoint(wxShapeCanvas *the_canvas, wxShape *object, int region,
-                            double size, double the_xoffset, double the_yoffset, int the_type);
-  ~wxDividedShapeControlPoint();
-
-  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDividedShapeControlPoint, wxControlPoint)
-
-/*
- * Divided object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxDividedShape, wxRectangleShape)
-
-wxDividedShape::wxDividedShape(double w, double h): wxRectangleShape(w, h)
-{
-  ClearRegions();
-}
-
-wxDividedShape::~wxDividedShape()
-{
-}
-
-void wxDividedShape::OnDraw(wxDC& dc)
-{
-  wxRectangleShape::OnDraw(dc);
-}
-
-void wxDividedShape::OnDrawContents(wxDC& dc)
-{
-  double defaultProportion = (double)(GetRegions().GetCount() > 0 ? (1.0/((double)(GetRegions().GetCount()))) : 0.0);
-  double currentY = (double)(m_ypos - (m_height / 2.0));
-  double maxY = (double)(m_ypos + (m_height / 2.0));
-
-  double leftX = (double)(m_xpos - (m_width / 2.0));
-  double rightX = (double)(m_xpos + (m_width / 2.0));
-
-  if (m_pen) dc.SetPen(* m_pen);
-
-  dc.SetTextForeground(m_textColour);
-
-#ifdef __WXMSW__
-  // For efficiency, don't do this under X - doesn't make
-  // any visible difference for our purposes.
-  if (m_brush)
-    dc.SetTextBackground(m_brush->GetColour());
-#endif
-/*
-  if (!formatted)
-  {
-    FormatRegionText();
-    formatted = true;
-  }
-*/
-  if (GetDisableLabel()) return;
-
-  double xMargin = 2;
-  double yMargin = 2;
-  dc.SetBackgroundMode(wxTRANSPARENT);
-
-  wxObjectList::compatibility_iterator node = GetRegions().GetFirst();
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    dc.SetFont(* region->GetFont());
-    dc.SetTextForeground(region->GetActualColourObject());
-
-    double proportion =
-      region->m_regionProportionY < 0.0 ? defaultProportion : region->m_regionProportionY;
-
-    double y = currentY + m_height*proportion;
-    double actualY = maxY < y ? maxY : y;
-
-    double centreX = m_xpos;
-    double centreY = (double)(currentY + (actualY - currentY)/2.0);
-
-    oglDrawFormattedText(dc, &region->m_formattedText,
-             (double)(centreX), (double)(centreY), (double)(m_width-2*xMargin), (double)(actualY - currentY - 2*yMargin),
-             region->m_formatMode);
-    if ((y <= maxY) && (node->GetNext()))
-    {
-      wxPen *regionPen = region->GetActualPen();
-      if (regionPen)
-      {
-        dc.SetPen(* regionPen);
-        dc.DrawLine(WXROUND(leftX), WXROUND(y), WXROUND(rightX), WXROUND(y));
-      }
-    }
-
-    currentY = actualY;
-
-    node = node->GetNext();
-  }
-}
-
-void wxDividedShape::SetSize(double w, double h, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(w, h);
-  m_width = w;
-  m_height = h;
-  SetRegionSizes();
-}
-
-void wxDividedShape::SetRegionSizes()
-{
-  if (GetRegions().GetCount() == 0)
-    return;
-
-  double defaultProportion = (double)(GetRegions().GetCount() > 0 ? (1.0/((double)(GetRegions().GetCount()))) : 0.0);
-  double currentY = (double)(m_ypos - (m_height / 2.0));
-  double maxY = (double)(m_ypos + (m_height / 2.0));
-
-//  double leftX = (double)(m_xpos - (m_width / 2.0));
-//  double rightX = (double)(m_xpos + (m_width / 2.0));
-
-  wxObjectList::compatibility_iterator node = GetRegions().GetFirst();
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    double proportion =
-      region->m_regionProportionY <= 0.0 ? defaultProportion : region->m_regionProportionY;
-
-    double sizeY = (double)proportion*m_height;
-    double y = currentY + sizeY;
-    double actualY = maxY < y ? maxY : y;
-
-    double centreY = (double)(currentY + (actualY - currentY)/2.0);
-
-    region->SetSize(m_width, sizeY);
-    region->SetPosition(0.0, (double)(centreY - m_ypos));
-    currentY = actualY;
-    node = node->GetNext();
-  }
-}
-
-// Attachment points correspond to regions in the divided box
-bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y, int nth, int no_arcs,
-  wxLineShape *line)
-{
-  int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
-  if ((GetAttachmentMode() == ATTACHMENT_MODE_NONE) || (attachment >= totalNumberAttachments))
-  {
-    return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs);
-  }
-
-  int n = GetRegions().GetCount();
-  bool isEnd = (line && line->IsEnd(this));
-
-  double left = (double)(m_xpos - m_width/2.0);
-  double right = (double)(m_xpos + m_width/2.0);
-  double top = (double)(m_ypos - m_height/2.0);
-  double bottom = (double)(m_ypos + m_height/2.0);
-
-  // Zero is top, n+1 is bottom.
-  if (attachment == 0)
-  {
-    *y = top;
-    if (m_spaceAttachments)
-    {
-      if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
-      {
-        // Align line according to the next handle along
-        wxRealPoint *point = line->GetNextControlPoint(this);
-        if (point->x < left)
-          *x = left;
-        else if (point->x > right)
-          *x = right;
-        else
-          *x = point->x;
-      }
-      else
-        *x = left + (nth + 1)*m_width/(no_arcs + 1);
-    }
-    else
-      *x = m_xpos;
-  }
-  else if (attachment == (n+1))
-  {
-    *y = bottom;
-    if (m_spaceAttachments)
-    {
-      if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
-      {
-        // Align line according to the next handle along
-        wxRealPoint *point = line->GetNextControlPoint(this);
-        if (point->x < left)
-          *x = left;
-        else if (point->x > right)
-          *x = right;
-        else
-          *x = point->x;
-      }
-      else
-        *x = left + (nth + 1)*m_width/(no_arcs + 1);
-    }
-    else
-      *x = m_xpos;
-  }
-  // Left or right.
-  else
-  {
-    bool isLeft = !(attachment < (n+1));
-    int i = (isLeft) ? (totalNumberAttachments - attachment - 1) : (attachment-1);
-    wxObjectList::compatibility_iterator node = GetRegions().Item(i);
-    if (node)
-    {
-      wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-
-      if (isLeft)
-        *x = left;
-      else
-        *x = right;
-
-      // Calculate top and bottom of region
-      top = (double)((m_ypos + region->m_y) - (region->m_height/2.0));
-      bottom = (double)((m_ypos + region->m_y) + (region->m_height/2.0));
-
-      // Assuming we can trust the absolute size and
-      // position of these regions...
-      if (m_spaceAttachments)
-      {
-        if (line && (line->GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE))
-        {
-          // Align line according to the next handle along
-          wxRealPoint *point = line->GetNextControlPoint(this);
-          if (point->y < bottom)
-            *y = bottom;
-          else if (point->y > top)
-            *y = top;
-          else
-            *y = point->y;
-        }
-        else
-//          *y = (double)(((m_ypos + region->m_y) - (region->m_height/2.0)) + (nth + 1)*region->m_height/(no_arcs+1));
-          *y = (double)(top + (nth + 1)*region->m_height/(no_arcs+1));
-      }
-      else
-        *y = (double)(m_ypos + region->m_y);
-    }
-    else
-    {
-      *x = m_xpos;
-      *y = m_ypos;
-      return false;
-    }
-  }
-  return true;
-}
-
-int wxDividedShape::GetNumberOfAttachments() const
-{
-  // There are two attachments for each region (left and right),
-  // plus one on the top and one on the bottom.
-  int n = (GetRegions().GetCount() * 2) + 2;
-
-  int maxN = n - 1;
-  wxObjectList::compatibility_iterator node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    if (point->m_id > maxN)
-      maxN = point->m_id;
-    node = node->GetNext();
-  }
-  return maxN + 1;
-}
-
-bool wxDividedShape::AttachmentIsValid(int attachment) const
-{
-  int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
-  if (attachment >= totalNumberAttachments)
-  {
-    return wxShape::AttachmentIsValid(attachment);
-  }
-  else if (attachment >= 0)
-    return true;
-  else
-    return false;
-}
-
-void wxDividedShape::Copy(wxShape& copy)
-{
-  wxRectangleShape::Copy(copy);
-}
-
-// Region operations
-
-void wxDividedShape::MakeControlPoints()
-{
-  wxRectangleShape::MakeControlPoints();
-
-  MakeMandatoryControlPoints();
-}
-
-void wxDividedShape::MakeMandatoryControlPoints()
-{
-  double currentY = (double)(GetY() - (m_height / 2.0));
-  double maxY = (double)(GetY() + (m_height / 2.0));
-
-  wxObjectList::compatibility_iterator node = GetRegions().GetFirst();
-  int i = 0;
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-
-    double proportion = region->m_regionProportionY;
-
-    double y = currentY + m_height*proportion;
-    double actualY = (double)(maxY < y ? maxY : y);
-
-    if (node->GetNext())
-    {
-      wxDividedShapeControlPoint *controlPoint =
-        new wxDividedShapeControlPoint(m_canvas, this, i, CONTROL_POINT_SIZE, 0.0, (double)(actualY - GetY()), 0);
-      m_canvas->AddShape(controlPoint);
-      m_controlPoints.Append(controlPoint);
-    }
-    currentY = actualY;
-    i ++;
-    node = node->GetNext();
-  }
-}
-
-void wxDividedShape::ResetControlPoints()
-{
-  // May only have the region handles, (n - 1) of them.
-  if (m_controlPoints.GetCount() > (GetRegions().GetCount() - 1))
-    wxRectangleShape::ResetControlPoints();
-
-  ResetMandatoryControlPoints();
-}
-
-void wxDividedShape::ResetMandatoryControlPoints()
-{
-  double currentY = (double)(GetY() - (m_height / 2.0));
-  double maxY = (double)(GetY() + (m_height / 2.0));
-
-  wxObjectList::compatibility_iterator node = m_controlPoints.GetFirst();
-  int i = 0;
-  while (node)
-  {
-    wxControlPoint *controlPoint = (wxControlPoint *)node->GetData();
-    if (controlPoint->IsKindOf(CLASSINFO(wxDividedShapeControlPoint)))
-    {
-      wxObjectList::compatibility_iterator node1 = GetRegions().Item(i);
-      wxShapeRegion *region = (wxShapeRegion *)node1->GetData();
-
-      double proportion = region->m_regionProportionY;
-
-      double y = currentY + m_height*proportion;
-      double actualY = (double)(maxY < y ? maxY : y);
-
-      controlPoint->m_xoffset = 0.0;
-      controlPoint->m_yoffset = (double)(actualY - GetY());
-      currentY = actualY;
-      i ++;
-    }
-    node = node->GetNext();
-  }
-}
-
-#if wxUSE_PROLOGIO
-void wxDividedShape::WriteAttributes(wxExpr *clause)
-{
-  wxRectangleShape::WriteAttributes(clause);
-}
-
-void wxDividedShape::ReadAttributes(wxExpr *clause)
-{
-  wxRectangleShape::ReadAttributes(clause);
-}
-#endif
-
-/*
- * Edit the division colour/style
- *
- */
-
-void wxDividedShape::EditRegions()
-{
-  wxMessageBox(wxT("EditRegions() is unimplemented."), wxT("OGL"), wxOK);
-
-  // TODO
-#if 0
-  if (GetRegions().GetCount() < 2)
-    return;
-
-  wxBeginBusyCursor();
-
-  GraphicsForm *form = new GraphicsForm("Divided nodes");
-  // Need an array to store all the style strings,
-  // since they need to be converted to integers
-  char **styleStrings = new char *[GetRegions().GetCount()];
-  for (int j = 0; j < GetRegions().GetCount(); j++)
-    styleStrings[j] = NULL;
-
-  int i = 0;
-  wxNode *node = GetRegions().GetFirst();
-  while (node && node->GetNext())
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-    char buf[50];
-    sprintf(buf, "Region %d", (i+1));
-    form->Add(wxMakeFormMessage(buf));
-    form->Add(wxMakeFormNewLine());
-
-    form->Add(wxMakeFormString("Colour", &region->penColour, wxFORM_CHOICE,
-              new wxList(wxMakeConstraintStrings(
-    "Invisible"        ,
-    "BLACK"            ,
-    "BLUE"             ,
-    "BROWN"            ,
-    "CORAL"            ,
-    "CYAN"             ,
-    "DARK GREY"        ,
-    "DARK GREEN"       ,
-    "DIM GREY"         ,
-    "GREY"             ,
-    "GREEN"            ,
-    "LIGHT BLUE"       ,
-    "LIGHT GREY"       ,
-    "MAGENTA"          ,
-    "MAROON"           ,
-    "NAVY"             ,
-    "ORANGE"           ,
-    "PURPLE"           ,
-    "RED"              ,
-    "TURQUOISE"        ,
-    "VIOLET"           ,
-    "WHITE"            ,
-    "YELLOW"           ,
-    NULL),
-    NULL), NULL, wxVERTICAL, 150));
-
-    char *styleString = NULL;
-    switch (region->penStyle)
-    {
-      case wxSHORT_DASH:
-        styleString = "Short Dash";
-        break;
-      case wxLONG_DASH:
-        styleString = "Long Dash";
-        break;
-      case wxDOT:
-        styleString = "Dot";
-        break;
-      case wxDOT_DASH:
-        styleString = "Dot Dash";
-        break;
-      case wxSOLID:
-      default:
-        styleString = "Solid";
-        break;
-    }
-    styleStrings[i] = copystring(styleString);
-    form->Add(wxMakeFormString("Style", &(styleStrings[i]), wxFORM_CHOICE,
-              new wxList(wxMakeConstraintStrings(
-    "Solid"            ,
-    "Short Dash"       ,
-    "Long Dash"        ,
-    "Dot"              ,
-    "Dot Dash"         ,
-    NULL),
-    NULL), NULL, wxVERTICAL, 100));
-    node = node->GetNext();
-    i ++;
-    if (node && node->GetNext())
-      form->Add(wxMakeFormNewLine());
-  }
-  wxDialogBox *dialog = new wxDialogBox(m_canvas->GetParent(), "Divided object properties", 10, 10, 500, 500);
-  if (GraphicsLabelFont)
-    dialog->SetLabelFont(GraphicsLabelFont);
-  if (GraphicsButtonFont)
-    dialog->SetButtonFont(GraphicsButtonFont);
-  form->AssociatePanel(dialog);
-  form->dialog = dialog;
-
-  dialog->Fit();
-  dialog->Centre(wxBOTH);
-
-  wxEndBusyCursor();
-
-  dialog->Show(true);
-
-  node = GetRegions().GetFirst();
-  i = 0;
-  while (node)
-  {
-    wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-
-    if (styleStrings[i])
-    {
-      if (strcmp(styleStrings[i], "Solid") == 0)
-        region->penStyle = wxSOLID;
-      else if (strcmp(styleStrings[i], "Dot") == 0)
-        region->penStyle = wxDOT;
-      else if (strcmp(styleStrings[i], "Short Dash") == 0)
-        region->penStyle = wxSHORT_DASH;
-      else if (strcmp(styleStrings[i], "Long Dash") == 0)
-        region->penStyle = wxLONG_DASH;
-      else if (strcmp(styleStrings[i], "Dot Dash") == 0)
-        region->penStyle = wxDOT_DASH;
-      delete[] styleStrings[i];
-    }
-    region->m_actualPenObject = NULL;
-    node = node->GetNext();
-    i ++;
-  }
-  delete[] styleStrings;
-  Draw(dc);
-#endif
-}
-
-void wxDividedShape::OnRightClick(double x, double y, int keys, int attachment)
-{
-  if (keys & KEY_CTRL)
-  {
-    EditRegions();
-  }
-  else
-  {
-    wxRectangleShape::OnRightClick(x, y, keys, attachment);
-  }
-}
-
-wxDividedShapeControlPoint::wxDividedShapeControlPoint(wxShapeCanvas *the_canvas, wxShape *object,
-  int region, double size, double the_m_xoffset, double the_m_yoffset, int the_type):
-    wxControlPoint(the_canvas, object, size, the_m_xoffset, the_m_yoffset, the_type)
-{
-  regionId = region;
-}
-
-wxDividedShapeControlPoint::~wxDividedShapeControlPoint()
-{
-}
-
-// Implement resizing of divided object division
-void wxDividedShapeControlPoint::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-    wxClientDC dc(GetCanvas());
-    GetCanvas()->PrepareDC(dc);
-
-    dc.SetLogicalFunction(OGLRBLF);
-    wxPen dottedPen(*wxBLACK, 1, wxDOT);
-    dc.SetPen(dottedPen);
-    dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-    wxDividedShape *dividedObject = (wxDividedShape *)m_shape;
-    double x1 = (double)(dividedObject->GetX() - (dividedObject->GetWidth()/2.0));
-    double y1 = y;
-    double x2 = (double)(dividedObject->GetX() + (dividedObject->GetWidth()/2.0));
-    double y2 = y;
-    dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y2));
-}
-
-void wxDividedShapeControlPoint::OnBeginDragLeft(double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-    wxClientDC dc(GetCanvas());
-    GetCanvas()->PrepareDC(dc);
-
-    wxDividedShape *dividedObject = (wxDividedShape *)m_shape;
-    dc.SetLogicalFunction(OGLRBLF);
-    wxPen dottedPen(*wxBLACK, 1, wxDOT);
-    dc.SetPen(dottedPen);
-    dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-    double x1 = (double)(dividedObject->GetX() - (dividedObject->GetWidth()/2.0));
-    double y1 = y;
-    double x2 = (double)(dividedObject->GetX() + (dividedObject->GetWidth()/2.0));
-    double y2 = y;
-    dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y2));
-    m_canvas->CaptureMouse();
-}
-
-void wxDividedShapeControlPoint::OnEndDragLeft(double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-    wxClientDC dc(GetCanvas());
-    GetCanvas()->PrepareDC(dc);
-
-    wxDividedShape *dividedObject = (wxDividedShape *)m_shape;
-    wxObjectList::compatibility_iterator node = dividedObject->GetRegions().Item(regionId);
-    if (!node)
-    return;
-
-    wxShapeRegion *thisRegion = (wxShapeRegion *)node->GetData();
-    wxShapeRegion *nextRegion = NULL; // Region below this one
-
-    dc.SetLogicalFunction(wxCOPY);
-
-    m_canvas->ReleaseMouse();
-
-    // Find the old top and bottom of this region,
-    // and calculate the new proportion for this region
-    // if legal.
-
-    double currentY = (double)(dividedObject->GetY() - (dividedObject->GetHeight() / 2.0));
-    double maxY = (double)(dividedObject->GetY() + (dividedObject->GetHeight() / 2.0));
-
-    // Save values
-    double thisRegionTop = 0.0;
-    double nextRegionBottom = 0.0;
-
-    node = dividedObject->GetRegions().GetFirst();
-    while (node)
-    {
-      wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-
-      double proportion = region->m_regionProportionY;
-      double yy = currentY + (dividedObject->GetHeight()*proportion);
-      double actualY = (double)(maxY < yy ? maxY : yy);
-
-      if (region == thisRegion)
-      {
-        thisRegionTop = currentY;
-        if (node->GetNext())
-          nextRegion = (wxShapeRegion *)node->GetNext()->GetData();
-      }
-      if (region == nextRegion)
-      {
-        nextRegionBottom = actualY;
-      }
-
-      currentY = actualY;
-      node = node->GetNext();
-    }
-    if (!nextRegion)
-      return;
-
-    // Check that we haven't gone above this region or below
-    // next region.
-    if ((y <= thisRegionTop) || (y >= nextRegionBottom))
-    return;
-
-    dividedObject->EraseLinks(dc);
-
-    // Now calculate the new proportions of this region and the next region.
-    double thisProportion = (double)((y - thisRegionTop)/dividedObject->GetHeight());
-    double nextProportion = (double)((nextRegionBottom - y)/dividedObject->GetHeight());
-    thisRegion->SetProportions(0.0, thisProportion);
-    nextRegion->SetProportions(0.0, nextProportion);
-    m_yoffset = (double)(y - dividedObject->GetY());
-
-    // Now reformat text
-    int i = 0;
-    node = dividedObject->GetRegions().GetFirst();
-    while (node)
-    {
-        wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-        if (region->GetText())
-        {
-        wxString s(region->GetText());
-        dividedObject->FormatText(dc, s.c_str(), i);
-        }
-        node = node->GetNext();
-        i++;
-    }
-    dividedObject->SetRegionSizes();
-    dividedObject->Draw(dc);
-    dividedObject->GetEventHandler()->OnMoveLinks(dc);
-}
-
diff --git a/contrib/src/ogl/drawn.cpp b/contrib/src/ogl/drawn.cpp
deleted file mode 100644
index 5fac9c84ad..0000000000
--- a/contrib/src/ogl/drawn.cpp
+++ /dev/null
@@ -1,2486 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        drawn.cpp
-// Purpose:     wxDrawnShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/ogl/ogl.h"
-
-#if wxUSE_PROLOGIO
-static void IntToHex(unsigned int dec, wxChar *buf);
-static unsigned long HexToInt(wxChar *buf);
-#endif
-
-extern wxChar *oglBuffer;
-
-#define gyTYPE_PEN   40
-#define gyTYPE_BRUSH 41
-#define gyTYPE_FONT  42
-
-/*
- * Drawn object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxDrawnShape, wxRectangleShape)
-
-wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
-{
-  m_saveToFile = true;
-  m_currentAngle = oglDRAWN_ANGLE_0;
-}
-
-wxDrawnShape::~wxDrawnShape()
-{
-}
-
-void wxDrawnShape::OnDraw(wxDC& dc)
-{
-  // Pass pen and brush in case we have force outline
-  // and fill colours
-  if (m_shadowMode != SHADOW_NONE)
-  {
-    if (m_shadowBrush)
-      m_metafiles[m_currentAngle].m_fillBrush = m_shadowBrush;
-    m_metafiles[m_currentAngle].m_outlinePen = g_oglTransparentPen;
-    m_metafiles[m_currentAngle].Draw(dc, m_xpos + m_shadowOffsetX, m_ypos + m_shadowOffsetY);
-  }
-
-  m_metafiles[m_currentAngle].m_outlinePen = m_pen;
-  m_metafiles[m_currentAngle].m_fillBrush = m_brush;
-  m_metafiles[m_currentAngle].Draw(dc, m_xpos, m_ypos);
-}
-
-void wxDrawnShape::SetSize(double w, double h, bool WXUNUSED(recursive))
-{
-  SetAttachmentSize(w, h);
-
-  double scaleX;
-  double scaleY;
-  if (GetWidth() == 0.0)
-    scaleX = 1.0;
-  else scaleX = w/GetWidth();
-  if (GetHeight() == 0.0)
-    scaleY = 1.0;
-  else scaleY = h/GetHeight();
-
-  for (int i = 0; i < 4; i++)
-  {
-    if (m_metafiles[i].IsValid())
-        m_metafiles[i].Scale(scaleX, scaleY);
-  }
-  m_width = w;
-  m_height = h;
-  SetDefaultRegionSize();
-}
-
-void wxDrawnShape::Scale(double sx, double sy)
-{
-    int i;
-    for (i = 0; i < 4; i++)
-    {
-        if (m_metafiles[i].IsValid())
-        {
-            m_metafiles[i].Scale(sx, sy);
-            m_metafiles[i].CalculateSize(this);
-        }
-    }
-}
-
-void wxDrawnShape::Translate(double x, double y)
-{
-    int i;
-    for (i = 0; i < 4; i++)
-    {
-        if (m_metafiles[i].IsValid())
-        {
-            m_metafiles[i].Translate(x, y);
-            m_metafiles[i].CalculateSize(this);
-        }
-    }
-}
-
-// theta is absolute rotation from the zero position
-void wxDrawnShape::Rotate(double x, double y, double theta)
-{
-  m_currentAngle = DetermineMetaFile(theta);
-
-  if (m_currentAngle == 0)
-  {
-    // Rotate metafile
-    if (!m_metafiles[0].GetRotateable())
-      return;
-
-    m_metafiles[0].Rotate(x, y, theta);
-  }
-
-  double actualTheta = theta-m_rotation;
-
-  // Rotate attachment points
-  double sinTheta = (double)sin(actualTheta);
-  double cosTheta = (double)cos(actualTheta);
-  wxNode *node = m_attachmentPoints.GetFirst();
-  while (node)
-  {
-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
-    double x1 = point->m_x;
-    double y1 = point->m_y;
-    point->m_x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-    point->m_y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-    node = node->GetNext();
-  }
-  m_rotation = theta;
-
-  m_metafiles[m_currentAngle].CalculateSize(this);
-}
-
-// Which metafile do we use now? Based on current rotation and validity
-// of metafiles.
-
-int wxDrawnShape::DetermineMetaFile(double rotation)
-{
-    double tolerance = 0.0001;
-    const double pi = M_PI ;
-    double angle1 = 0.0;
-    double angle2 = pi/2.0;
-    double angle3 = pi;
-    double angle4 = 3.0*pi/2.0;
-
-    int whichMetafile = 0;
-
-    if (oglRoughlyEqual(rotation, angle1, tolerance))
-    {
-        whichMetafile = 0;
-    }
-    else if (oglRoughlyEqual(rotation, angle2, tolerance))
-    {
-        whichMetafile = 1;
-    }
-    else if (oglRoughlyEqual(rotation, angle3, tolerance))
-    {
-        whichMetafile = 2;
-    }
-    else if (oglRoughlyEqual(rotation, angle4, tolerance))
-    {
-        whichMetafile = 3;
-    }
-
-    if ((whichMetafile > 0) && !m_metafiles[whichMetafile].IsValid())
-        whichMetafile = 0;
-
-    return whichMetafile;
-}
-
-void wxDrawnShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
-{
-    if (m_metafiles[m_currentAngle].GetOutlineOp() != -1)
-    {
-        wxNode* node = m_metafiles[m_currentAngle].GetOps().Item(m_metafiles[m_currentAngle].GetOutlineOp());
-        wxASSERT (node != NULL);
-        wxDrawOp* op = (wxDrawOp*) node->GetData();
-
-        if (op->OnDrawOutline(dc, x, y, w, h, m_width, m_height))
-            return;
-    }
-
-    // Default... just use a rectangle
-    wxRectangleShape::OnDrawOutline(dc, x, y, w, h);
-}
-
-// Get the perimeter point using the special outline op, if there is one,
-// otherwise use default wxRectangleShape scheme
-bool wxDrawnShape::GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3)
-{
-    if (m_metafiles[m_currentAngle].GetOutlineOp() != -1)
-    {
-        wxNode* node = m_metafiles[m_currentAngle].GetOps().Item(m_metafiles[m_currentAngle].GetOutlineOp());
-        wxASSERT (node != NULL);
-        wxDrawOp* op = (wxDrawOp*) node->GetData();
-
-        if (op->GetPerimeterPoint(x1, y1, x2, y2, x3, y3, GetX(), GetY(), GetAttachmentMode()))
-            return true;
-    }
-
-    // Default... just use a rectangle
-    return wxRectangleShape::GetPerimeterPoint(x1, y1, x2, y2, x3, y3);
-}
-
-#if wxUSE_PROLOGIO
-void wxDrawnShape::WriteAttributes(wxExpr *clause)
-{
-  wxRectangleShape::WriteAttributes(clause);
-
-  clause->AddAttributeValue(_T("current_angle"), (long)m_currentAngle);
-  clause->AddAttributeValue(_T("save_metafile"), (long)m_saveToFile);
-  if (m_saveToFile)
-  {
-    for (int i = 0; i < 4; i++)
-    {
-        if (m_metafiles[i].IsValid())
-            m_metafiles[i].WriteAttributes(clause, i);
-    }
-  }
-}
-
-void wxDrawnShape::ReadAttributes(wxExpr *clause)
-{
-  wxRectangleShape::ReadAttributes(clause);
-
-  int iVal = (int) m_saveToFile;
-  clause->GetAttributeValue(_T("save_metafile"), iVal);
-  clause->GetAttributeValue(_T("current_angle"), m_currentAngle);
-  m_saveToFile = (iVal != 0);
-
-  if (m_saveToFile)
-  {
-    for (int i = 0; i < 4; i++)
-    {
-      m_metafiles[i].ReadAttributes(clause, i);
-    }
-  }
-}
-#endif
-
-// Does the copying for this object
-void wxDrawnShape::Copy(wxShape& copy)
-{
-  wxRectangleShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxDrawnShape)) ) ;
-
-  wxDrawnShape& drawnCopy = (wxDrawnShape&) copy;
-
-  for (int i = 0; i < 4; i++)
-  {
-    m_metafiles[i].Copy(drawnCopy.m_metafiles[i]);
-  }
-  drawnCopy.m_saveToFile = m_saveToFile;
-  drawnCopy.m_currentAngle = m_currentAngle;
-}
-
-bool wxDrawnShape::LoadFromMetaFile(const wxString& filename)
-{
-  return m_metafiles[0].LoadFromMetaFile(filename, &m_width, &m_height);
-}
-
-// Set of functions for drawing into a pseudo metafile.
-// They use integers, but doubles are used internally for accuracy
-// when scaling.
-
-void wxDrawnShape::DrawLine(const wxPoint& pt1, const wxPoint& pt2)
-{
-    m_metafiles[m_currentAngle].DrawLine(pt1, pt2);
-}
-
-void wxDrawnShape::DrawRectangle(const wxRect& rect)
-{
-    m_metafiles[m_currentAngle].DrawRectangle(rect);
-}
-
-void wxDrawnShape::DrawRoundedRectangle(const wxRect& rect, double radius)
-{
-    m_metafiles[m_currentAngle].DrawRoundedRectangle(rect, radius);
-}
-
-void wxDrawnShape::DrawEllipse(const wxRect& rect)
-{
-    m_metafiles[m_currentAngle].DrawEllipse(rect);
-}
-
-void wxDrawnShape::DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt)
-{
-    m_metafiles[m_currentAngle].DrawArc(centrePt, startPt, endPt);
-}
-
-void wxDrawnShape::DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle)
-{
-    m_metafiles[m_currentAngle].DrawEllipticArc(rect, startAngle, endAngle);
-}
-
-void wxDrawnShape::DrawPoint(const wxPoint& pt)
-{
-    m_metafiles[m_currentAngle].DrawPoint(pt);
-}
-
-void wxDrawnShape::DrawText(const wxString& text, const wxPoint& pt)
-{
-    m_metafiles[m_currentAngle].DrawText(text, pt);
-}
-
-void wxDrawnShape::DrawLines(int n, wxPoint pts[])
-{
-    m_metafiles[m_currentAngle].DrawLines(n, pts);
-}
-
-void wxDrawnShape::DrawPolygon(int n, wxPoint pts[], int flags)
-{
-    if (flags & oglMETAFLAGS_ATTACHMENTS)
-    {
-        ClearAttachments();
-        int i;
-        for (i = 0; i < n; i++)
-            m_attachmentPoints.Append(new wxAttachmentPoint(i, pts[i].x, pts[i].y));
-    }
-    m_metafiles[m_currentAngle].DrawPolygon(n, pts, flags);
-}
-
-void wxDrawnShape::DrawSpline(int n, wxPoint pts[])
-{
-    m_metafiles[m_currentAngle].DrawSpline(n, pts);
-}
-
-void wxDrawnShape::SetClippingRect(const wxRect& rect)
-{
-    m_metafiles[m_currentAngle].SetClippingRect(rect);
-}
-
-void wxDrawnShape::DestroyClippingRect()
-{
-    m_metafiles[m_currentAngle].DestroyClippingRect();
-}
-
-void wxDrawnShape::SetDrawnPen(const wxPen* pen, bool isOutline)
-{
-    m_metafiles[m_currentAngle].SetPen(pen, isOutline);
-}
-
-void wxDrawnShape::SetDrawnBrush(const wxBrush* brush, bool isFill)
-{
-    m_metafiles[m_currentAngle].SetBrush(brush, isFill);
-}
-
-void wxDrawnShape::SetDrawnFont(wxFont* font)
-{
-    m_metafiles[m_currentAngle].SetFont(font);
-}
-
-void wxDrawnShape::SetDrawnTextColour(const wxColour& colour)
-{
-    m_metafiles[m_currentAngle].SetTextColour(colour);
-}
-
-void wxDrawnShape::SetDrawnBackgroundColour(const wxColour& colour)
-{
-    m_metafiles[m_currentAngle].SetBackgroundColour(colour);
-}
-
-void wxDrawnShape::SetDrawnBackgroundMode(int mode)
-{
-    m_metafiles[m_currentAngle].SetBackgroundMode(mode);
-}
-
-
-/*
- * Individual operations
- *
- */
-
-/*
- * Set font, brush, text colour
- *
- */
-
-wxOpSetGDI::wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode):
-  wxDrawOp(theOp)
-{
-  m_gdiIndex = theGdiIndex;
-  m_image = theImage;
-  m_mode = theMode;
-}
-
-void wxOpSetGDI::Do(wxDC& dc, double WXUNUSED(xoffset), double WXUNUSED(yoffset))
-{
-  switch (m_op)
-  {
-    case DRAWOP_SET_PEN:
-    {
-      // Check for overriding this operation for outline
-      // colour
-      if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
-      {
-        if (m_image->m_outlinePen)
-          dc.SetPen(* m_image->m_outlinePen);
-      }
-      else
-      {
-        wxNode *node = m_image->m_gdiObjects.Item(m_gdiIndex);
-        if (node)
-        {
-          wxPen *pen = (wxPen *)node->GetData();
-          if (pen)
-            dc.SetPen(* pen);
-        }
-      }
-      break;
-    }
-    case DRAWOP_SET_BRUSH:
-    {
-      // Check for overriding this operation for outline or fill
-      // colour
-      if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
-      {
-        // Need to construct a brush to match the outline pen's colour
-        if (m_image->m_outlinePen)
-        {
-          wxBrush *br = wxTheBrushList->FindOrCreateBrush(m_image->m_outlinePen->GetColour(), wxSOLID);
-          if (br)
-            dc.SetBrush(* br);
-        }
-      }
-      else if (m_image->m_fillColours.Member((wxObject *)m_gdiIndex))
-      {
-        if (m_image->m_fillBrush)
-        {
-          dc.SetBrush(* m_image->m_fillBrush);
-        }
-      }
-      else
-      {
-        wxNode *node = m_image->m_gdiObjects.Item(m_gdiIndex);
-        if (node)
-        {
-          wxBrush *brush = (wxBrush *)node->GetData();
-          if (brush)
-            dc.SetBrush(* brush);
-        }
-      }
-      break;
-    }
-    case DRAWOP_SET_FONT:
-    {
-      wxNode *node = m_image->m_gdiObjects.Item(m_gdiIndex);
-      if (node)
-      {
-        wxFont *font = (wxFont *)node->GetData();
-        if (font)
-          dc.SetFont(* font);
-      }
-      break;
-    }
-    case DRAWOP_SET_TEXT_COLOUR:
-    {
-      wxColour col(m_r,m_g,m_b);
-      dc.SetTextForeground(col);
-      break;
-    }
-    case DRAWOP_SET_BK_COLOUR:
-    {
-      wxColour col(m_r,m_g,m_b);
-      dc.SetTextBackground(col);
-      break;
-    }
-    case DRAWOP_SET_BK_MODE:
-    {
-      dc.SetBackgroundMode(m_mode);
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-wxDrawOp *wxOpSetGDI::Copy(wxPseudoMetaFile *newImage)
-{
-  wxOpSetGDI *newOp = new wxOpSetGDI(m_op, newImage, m_gdiIndex, m_mode);
-  newOp->m_r = m_r;
-  newOp->m_g = m_g;
-  newOp->m_b = m_b;
-  return newOp;
-}
-
-#if wxUSE_PROLOGIO
-wxExpr *wxOpSetGDI::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))
-{
-  wxExpr *expr = new wxExpr(wxExprList);
-  expr->Append(new wxExpr((long)m_op));
-  switch (m_op)
-  {
-    case DRAWOP_SET_PEN:
-    case DRAWOP_SET_BRUSH:
-    case DRAWOP_SET_FONT:
-    {
-      expr->Append(new wxExpr((long)m_gdiIndex));
-      break;
-    }
-    case DRAWOP_SET_TEXT_COLOUR:
-    case DRAWOP_SET_BK_COLOUR:
-    {
-      expr->Append(new wxExpr((long)m_r));
-      expr->Append(new wxExpr((long)m_g));
-      expr->Append(new wxExpr((long)m_b));
-      break;
-    }
-    case DRAWOP_SET_BK_MODE:
-    {
-      expr->Append(new wxExpr((long)m_mode));
-      break;
-    }
-    default:
-      break;
-  }
-  return expr;
-}
-
-void wxOpSetGDI::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
-{
-  switch (m_op)
-  {
-    case DRAWOP_SET_PEN:
-    case DRAWOP_SET_BRUSH:
-    case DRAWOP_SET_FONT:
-    {
-      m_gdiIndex = (int)expr->Nth(1)->IntegerValue();
-      break;
-    }
-    case DRAWOP_SET_TEXT_COLOUR:
-    case DRAWOP_SET_BK_COLOUR:
-    {
-      m_r = (unsigned char)expr->Nth(1)->IntegerValue();
-      m_g = (unsigned char)expr->Nth(2)->IntegerValue();
-      m_b = (unsigned char)expr->Nth(3)->IntegerValue();
-      break;
-    }
-    case DRAWOP_SET_BK_MODE:
-    {
-      m_mode = (int)expr->Nth(1)->IntegerValue();
-      break;
-    }
-    default:
-      break;
-  }
-}
-#endif
-
-/*
- * Set/destroy clipping
- *
- */
-
-wxOpSetClipping::wxOpSetClipping(int theOp, double theX1, double theY1,
-    double theX2, double theY2):wxDrawOp(theOp)
-{
-  m_x1 = theX1;
-  m_y1 = theY1;
-  m_x2 = theX2;
-  m_y2 = theY2;
-}
-
-wxDrawOp *wxOpSetClipping::Copy(wxPseudoMetaFile *WXUNUSED(newImage))
-{
-  wxOpSetClipping *newOp = new wxOpSetClipping(m_op, m_x1, m_y1, m_x2, m_y2);
-  return newOp;
-}
-
-void wxOpSetClipping::Do(wxDC& dc, double xoffset, double yoffset)
-{
-  switch (m_op)
-  {
-    case DRAWOP_SET_CLIPPING_RECT:
-    {
-      dc.SetClippingRegion((long)(m_x1 + xoffset), (long)(m_y1 + yoffset), (long)(m_x2 + xoffset), (long)(m_y2 + yoffset));
-      break;
-    }
-    case DRAWOP_DESTROY_CLIPPING_RECT:
-    {
-      dc.DestroyClippingRegion();
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void wxOpSetClipping::Scale(double xScale, double yScale)
-{
-  m_x1 *= xScale;
-  m_y1 *= yScale;
-  m_x2 *= xScale;
-  m_y2 *= yScale;
-}
-
-void wxOpSetClipping::Translate(double x, double y)
-{
-  m_x1 += x;
-  m_y1 += y;
-}
-
-#if wxUSE_PROLOGIO
-wxExpr *wxOpSetClipping::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))
-{
-  wxExpr *expr = new wxExpr(wxExprList);
-  expr->Append(new wxExpr((long)m_op));
-  switch (m_op)
-  {
-    case DRAWOP_SET_CLIPPING_RECT:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      expr->Append(new wxExpr(m_x2));
-      expr->Append(new wxExpr(m_y2));
-      break;
-    }
-    default:
-      break;
-  }
-  return expr;
-}
-
-void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
-{
-  switch (m_op)
-  {
-    case DRAWOP_SET_CLIPPING_RECT:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      m_x2 = expr->Nth(3)->RealValue();
-      m_y2 = expr->Nth(4)->RealValue();
-      break;
-    }
-    default:
-      break;
-  }
-}
-#endif
-
-/*
- * Draw line, rectangle, rounded rectangle, ellipse, point, arc, text
- *
- */
-
-wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double theRadius, const wxString& s) : wxDrawOp(theOp)
-{
-  m_x1 = theX1;
-  m_y1 = theY1;
-  m_x2 = theX2;
-  m_y2 = theY2;
-  m_x3 = 0.0;
-  m_y3 = 0.0;
-  m_radius = theRadius;
-  m_textString = s;
-}
-
-wxOpDraw::~wxOpDraw()
-{
-}
-
-wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))
-{
-  wxOpDraw *newOp = new wxOpDraw(m_op, m_x1, m_y1, m_x2, m_y2, m_radius, m_textString);
-  newOp->m_x3 = m_x3;
-  newOp->m_y3 = m_y3;
-  return newOp;
-}
-
-void wxOpDraw::Do(wxDC& dc, double xoffset, double yoffset)
-{
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_LINE:
-    {
-      dc.DrawLine(WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset), WXROUND(m_x2+xoffset), WXROUND(m_y2+yoffset));
-      break;
-    }
-    case DRAWOP_DRAW_RECT:
-    {
-      dc.DrawRectangle(WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset), WXROUND(m_x2), WXROUND(m_y2));
-      break;
-    }
-    case DRAWOP_DRAW_ROUNDED_RECT:
-    {
-      dc.DrawRoundedRectangle(WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset), WXROUND(m_x2), WXROUND(m_y2), m_radius);
-      break;
-    }
-    case DRAWOP_DRAW_ELLIPSE:
-    {
-      dc.DrawEllipse(WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset), WXROUND(m_x2), WXROUND(m_y2));
-      break;
-    }
-    case DRAWOP_DRAW_ARC:
-    {
-      dc.DrawArc(WXROUND(m_x2+xoffset), WXROUND(m_y2+yoffset),
-                 WXROUND(m_x3+xoffset), WXROUND(m_y3+yoffset),
-                 WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset));
-      break;
-    }
-    case DRAWOP_DRAW_ELLIPTIC_ARC:
-    {
-      const double pi = M_PI ;
-
-      // Convert back to degrees
-      dc.DrawEllipticArc(
-                 WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset),
-                 WXROUND(m_x2), WXROUND(m_y2),
-                 WXROUND(m_x3*(360.0/(2.0*pi))), WXROUND(m_y3*(360.0/(2.0*pi))));
-      break;
-    }
-    case DRAWOP_DRAW_POINT:
-    {
-      dc.DrawPoint(WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset));
-      break;
-    }
-    case DRAWOP_DRAW_TEXT:
-    {
-      dc.DrawText(m_textString, WXROUND(m_x1+xoffset), WXROUND(m_y1+yoffset));
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void wxOpDraw::Scale(double scaleX, double scaleY)
-{
-  m_x1 *= scaleX;
-  m_y1 *= scaleY;
-  m_x2 *= scaleX;
-  m_y2 *= scaleY;
-
-  if (m_op != DRAWOP_DRAW_ELLIPTIC_ARC)
-  {
-    m_x3 *= scaleX;
-    m_y3 *= scaleY;
-  }
-
-  m_radius *= scaleX;
-}
-
-void wxOpDraw::Translate(double x, double y)
-{
-  m_x1 += x;
-  m_y1 += y;
-
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_LINE:
-    {
-      m_x2 += x;
-      m_y2 += y;
-      break;
-    }
-    case DRAWOP_DRAW_ARC:
-    {
-      m_x2 += x;
-      m_y2 += y;
-      m_x3 += x;
-      m_y3 += y;
-      break;
-    }
-    case DRAWOP_DRAW_ELLIPTIC_ARC:
-    {
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void wxOpDraw::Rotate(double x, double y, double theta, double sinTheta, double cosTheta)
-{
-  double newX1 = m_x1*cosTheta - m_y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-  double newY1 = m_x1*sinTheta + m_y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_LINE:
-    {
-      double newX2 = m_x2*cosTheta - m_y2*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-      double newY2 = m_x2*sinTheta + m_y2*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-
-      m_x1 = newX1;
-      m_y1 = newY1;
-      m_x2 = newX2;
-      m_y2 = newY2;
-      break;
-    }
-    case DRAWOP_DRAW_RECT:
-    case DRAWOP_DRAW_ROUNDED_RECT:
-    case DRAWOP_DRAW_ELLIPTIC_ARC:
-    {
-      // Assume only 0, 90, 180, 270 degree rotations.
-      // oldX1, oldY1 represents the top left corner. Find the
-      // bottom right, and rotate that. Then the width/height is the difference
-      // between x/y values.
-      double oldBottomRightX = m_x1 + m_x2;
-      double oldBottomRightY = m_y1 + m_y2;
-      double newBottomRightX = oldBottomRightX*cosTheta - oldBottomRightY*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-      double newBottomRightY = oldBottomRightX*sinTheta + oldBottomRightY*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-
-      // Now find the new top-left, bottom-right coordinates.
-      double minX = wxMin(newX1, newBottomRightX);
-      double minY = wxMin(newY1, newBottomRightY);
-      double maxX = wxMax(newX1, newBottomRightX);
-      double maxY = wxMax(newY1, newBottomRightY);
-
-      m_x1 = minX;
-      m_y1 = minY;
-      m_x2 = maxX - minX; // width
-      m_y2 = maxY - minY; // height
-
-      if (m_op == DRAWOP_DRAW_ELLIPTIC_ARC)
-      {
-        // Add rotation to angles
-        m_x3 += theta;
-        m_y3 += theta;
-      }
-
-      break;
-    }
-    case DRAWOP_DRAW_ARC:
-    {
-      double newX2 = m_x2*cosTheta - m_y2*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-      double newY2 = m_x2*sinTheta + m_y2*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-      double newX3 = m_x3*cosTheta - m_y3*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-      double newY3 = m_x3*sinTheta + m_y3*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-
-      m_x1 = newX1;
-      m_y1 = newY1;
-      m_x2 = newX2;
-      m_y2 = newY2;
-      m_x3 = newX3;
-      m_y3 = newY3;
-
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-#if wxUSE_PROLOGIO
-wxExpr *wxOpDraw::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))
-{
-  wxExpr *expr = new wxExpr(wxExprList);
-  expr->Append(new wxExpr((long)m_op));
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_LINE:
-    case DRAWOP_DRAW_RECT:
-    case DRAWOP_DRAW_ELLIPSE:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      expr->Append(new wxExpr(m_x2));
-      expr->Append(new wxExpr(m_y2));
-      break;
-    }
-    case DRAWOP_DRAW_ROUNDED_RECT:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      expr->Append(new wxExpr(m_x2));
-      expr->Append(new wxExpr(m_y2));
-      expr->Append(new wxExpr(m_radius));
-      break;
-    }
-    case DRAWOP_DRAW_POINT:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      break;
-    }
-    case DRAWOP_DRAW_TEXT:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      expr->Append(new wxExpr(wxExprString, m_textString));
-      break;
-    }
-    case DRAWOP_DRAW_ARC:
-    case DRAWOP_DRAW_ELLIPTIC_ARC:
-    {
-      expr->Append(new wxExpr(m_x1));
-      expr->Append(new wxExpr(m_y1));
-      expr->Append(new wxExpr(m_x2));
-      expr->Append(new wxExpr(m_y2));
-      expr->Append(new wxExpr(m_x3));
-      expr->Append(new wxExpr(m_y3));
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-  return expr;
-}
-
-void wxOpDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
-{
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_LINE:
-    case DRAWOP_DRAW_RECT:
-    case DRAWOP_DRAW_ELLIPSE:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      m_x2 = expr->Nth(3)->RealValue();
-      m_y2 = expr->Nth(4)->RealValue();
-      break;
-    }
-    case DRAWOP_DRAW_ROUNDED_RECT:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      m_x2 = expr->Nth(3)->RealValue();
-      m_y2 = expr->Nth(4)->RealValue();
-      m_radius = expr->Nth(5)->RealValue();
-      break;
-    }
-    case DRAWOP_DRAW_POINT:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      break;
-    }
-    case DRAWOP_DRAW_TEXT:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      m_textString = wxString(expr->Nth(3)->StringValue());
-      break;
-    }
-    case DRAWOP_DRAW_ARC:
-    case DRAWOP_DRAW_ELLIPTIC_ARC:
-    {
-      m_x1 = expr->Nth(1)->RealValue();
-      m_y1 = expr->Nth(2)->RealValue();
-      m_x2 = expr->Nth(3)->RealValue();
-      m_y2 = expr->Nth(4)->RealValue();
-      m_x3 = expr->Nth(5)->RealValue();
-      m_y3 = expr->Nth(6)->RealValue();
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-}
-#endif
-
-/*
- * Draw polygon, polyline, spline
- *
- */
-
-wxOpPolyDraw::wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints):wxDrawOp(theOp)
-{
-  m_noPoints = n;
-  m_points = thePoints;
-}
-
-wxOpPolyDraw::~wxOpPolyDraw()
-{
-  delete[] m_points;
-}
-
-wxDrawOp *wxOpPolyDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))
-{
-  wxRealPoint *newPoints = new wxRealPoint[m_noPoints];
-  for (int i = 0; i < m_noPoints; i++)
-  {
-    newPoints[i].x = m_points[i].x;
-    newPoints[i].y = m_points[i].y;
-  }
-  wxOpPolyDraw *newOp = new wxOpPolyDraw(m_op, m_noPoints, newPoints);
-  return newOp;
-}
-
-void wxOpPolyDraw::Do(wxDC& dc, double xoffset, double yoffset)
-{
-  switch (m_op)
-  {
-    case DRAWOP_DRAW_POLYLINE:
-    {
-        wxPoint *actualPoints = new wxPoint[m_noPoints];
-        int i;
-        for (i = 0; i < m_noPoints; i++)
-        {
-            actualPoints[i].x = WXROUND(m_points[i].x);
-            actualPoints[i].y = WXROUND(m_points[i].y);
-        }
-
-        dc.DrawLines(m_noPoints, actualPoints, WXROUND(xoffset), WXROUND(yoffset));
-
-        delete[] actualPoints;
-        break;
-    }
-    case DRAWOP_DRAW_POLYGON:
-    {
-        wxPoint *actualPoints = new wxPoint[m_noPoints];
-        int i;
-        for (i = 0; i < m_noPoints; i++)
-        {
-            actualPoints[i].x = WXROUND(m_points[i].x);
-            actualPoints[i].y = WXROUND(m_points[i].y);
-        }
-
-        dc.DrawPolygon(m_noPoints, actualPoints, WXROUND(xoffset), WXROUND(yoffset));
-
-        delete[] actualPoints;
-        break;
-    }
-    case DRAWOP_DRAW_SPLINE:
-    {
-        wxPoint *actualPoints = new wxPoint[m_noPoints];
-        int i;
-        for (i = 0; i < m_noPoints; i++)
-        {
-            actualPoints[i].x = WXROUND(m_points[i].x);
-            actualPoints[i].y = WXROUND(m_points[i].y);
-        }
-
-        dc.DrawSpline(m_noPoints, actualPoints); // no offsets in DrawSpline // , xoffset, yoffset);
-
-        delete[] actualPoints;
-        break;
-    }
-    default:
-      break;
-  }
-}
-
-void wxOpPolyDraw::Scale(double scaleX, double scaleY)
-{
-  for (int i = 0; i < m_noPoints; i++)
-  {
-    m_points[i].x *= scaleX;
-    m_points[i].y *= scaleY;
-  }
-}
-
-void wxOpPolyDraw::Translate(double x, double y)
-{
-  for (int i = 0; i < m_noPoints; i++)
-  {
-    m_points[i].x += x;
-    m_points[i].y += y;
-  }
-}
-
-void wxOpPolyDraw::Rotate(double x, double y, double WXUNUSED(theta), double sinTheta, double cosTheta)
-{
-  for (int i = 0; i < m_noPoints; i++)
-  {
-    double x1 = m_points[i].x;
-    double y1 = m_points[i].y;
-    m_points[i].x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
-    m_points[i].y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
-  }
-}
-
-#if wxUSE_PROLOGIO
-wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))
-{
-  wxExpr *expr = new wxExpr(wxExprList);
-  expr->Append(new wxExpr((long)m_op));
-  expr->Append(new wxExpr((long)m_noPoints));
-
-//  char buf1[9];
-  wxChar buf2[5];
-  wxChar buf3[5];
-
-  oglBuffer[0] = 0;
-
-  /*
-   * Store each coordinate pair in a hex string to save space.
-   * E.g. "1B9080CD". 4 hex digits per coordinate pair.
-   *
-   */
-
-  for (int i = 0; i < m_noPoints; i++)
-  {
-    long signedX = (long)(m_points[i].x*100.0);
-    long signedY = (long)(m_points[i].y*100.0);
-
-    // Scale to 0 -> 64K
-    unsigned int unSignedX = (unsigned int)(signedX + 32767.0);
-    unsigned int unSignedY = (unsigned int)(signedY + 32767.0);
-
-    IntToHex(unSignedX, buf2);
-    IntToHex(unSignedY, buf3);
-
-    // Don't overrun the buffer
-    if ((i*8) < 3000)
-    {
-      wxStrcat(oglBuffer, buf2);
-      wxStrcat(oglBuffer, buf3);
-    }
-  }
-  expr->Append(new wxExpr(wxExprString, oglBuffer));
-  return expr;
-}
-
-void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
-{
-  m_noPoints = (int)expr->Nth(1)->IntegerValue();
-
-  wxChar buf1[5];
-  wxChar buf2[5];
-
-  m_points = new wxRealPoint[m_noPoints];
-  int i = 0;
-  int bufPtr = 0;
-  wxString hexString = expr->Nth(2)->StringValue();
-  while (i < m_noPoints)
-  {
-    buf1[0] = hexString[(size_t)bufPtr];
-    buf1[1] = hexString[(size_t)(bufPtr + 1)];
-    buf1[2] = hexString[(size_t)(bufPtr + 2)];
-    buf1[3] = hexString[(size_t)(bufPtr + 3)];
-    buf1[4] = 0;
-
-    buf2[0] = hexString[(size_t)(bufPtr + 4)];
-    buf2[1] = hexString[(size_t)(bufPtr + 5)];
-    buf2[2] = hexString[(size_t)(bufPtr + 6)];
-    buf2[3] = hexString[(size_t)(bufPtr + 7)];
-    buf2[4] = 0;
-
-    bufPtr += 8;
-
-//    int signedX = (signed int)HexToInt(buf1);
-//    int signedY = (signed int)HexToInt(buf2);
-    long unSignedX = HexToInt(buf1);
-    long unSignedY = HexToInt(buf2);
-    // Scale -32K -> +32K
-    long signedX = unSignedX - 32767;
-    long signedY = unSignedY - 32767;
-#if defined(__WXMSW__) && 0
-    int testX = (signed int)unSignedX;
-    int testY = (signed int)unSignedY;
-#endif
-
-    m_points[i].x = (double)(signedX / 100.0);
-    m_points[i].y = (double)(signedY / 100.0);
-
-    i ++;
-  }
-}
-#endif
-
-// Draw an outline using the current operation.
-bool wxOpPolyDraw::OnDrawOutline(wxDC& dc, double x, double y, double w, double h, double oldW, double oldH)
-{
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    // Multiply all points by proportion of new size to old size
-    double x_proportion = (double)(fabs(w/oldW));
-    double y_proportion = (double)(fabs(h/oldH));
-
-    int n = m_noPoints;
-    wxPoint *intPoints = new wxPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        intPoints[i].x = WXROUND (x_proportion * m_points[i].x);
-        intPoints[i].y = WXROUND (y_proportion * m_points[i].y);
-    }
-    dc.DrawPolygon(n, intPoints, (long) x, (long) y);
-    delete[] intPoints;
-    return true;
-}
-
-// Assume (x1, y1) is centre of box (most generally, line end at box)
-bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3,
-                                     double xOffset, double yOffset,
-                                     int attachmentMode)
-{
-  int n = m_noPoints;
-
-  // First check for situation where the line is vertical,
-  // and we would want to connect to a point on that vertical --
-  // oglFindEndForPolyline can't cope with this (the arrow
-  // gets drawn to the wrong place).
-  if ((attachmentMode == ATTACHMENT_MODE_NONE) && (x1 == x2))
-  {
-    // Look for the point we'd be connecting to. This is
-    // a heuristic...
-    int i;
-    for (i = 0; i < n; i++)
-    {
-      wxRealPoint *point = & (m_points[i]);
-      if (point->x == 0.0)
-      {
-        if ((y2 > y1) && (point->y > 0.0))
-        {
-          *x3 = point->x + xOffset;
-          *y3 = point->y + yOffset;
-          return true;
-        }
-        else if ((y2 < y1) && (point->y < 0.0))
-        {
-          *x3 = point->x + xOffset;
-          *y3 = point->y + yOffset;
-          return true;
-        }
-      }
-    }
-  }
-
-  double *xpoints = new double[n];
-  double *ypoints = new double[n];
-
-  for (int i = 0; i < n; i++)
-  {
-    wxRealPoint *point = & (m_points[i]);
-    xpoints[i] = point->x + xOffset;
-    ypoints[i] = point->y + yOffset;
-  }
-
-  oglFindEndForPolyline(n, xpoints, ypoints,
-                        x1, y1, x2, y2, x3, y3);
-
-  delete[] xpoints;
-  delete[] ypoints;
-
-  return true;
-}
-
-
-/*
- * Utilities
- *
- */
-
-#if wxUSE_PROLOGIO
-
-static char hexArray[] = {
-    _T('0'), _T('1'), _T('2'), _T('3'), _T('4'), _T('5'), _T('6'), _T('7'),
-    _T('8'), _T('9'), _T('A'), _T('B'), _T('C'), _T('D'), _T('E'), _T('F') };
-
-// Convert unsigned 16-bit integer to 4-character hex string
-static void IntToHex(unsigned int dec, wxChar *buf)
-{
-  int digit1 = (int)(dec/4096);
-  int digit2 = (int)((dec - (digit1*4096))/256);
-  int digit3 = (int)((dec - (digit1*4096) - (digit2*256))/16);
-  int digit4 = dec - (digit1*4096 + digit2*256 + digit3*16);
-
-  buf[0] = hexArray[digit1];
-  buf[1] = hexArray[digit2];
-  buf[2] = hexArray[digit3];
-  buf[3] = hexArray[digit4];
-  buf[4] = 0;
-}
-
-// One hex digit to decimal number
-static int HexToInt1(wxChar hex)
-{
-  switch (hex)
-  {
-    case _T('0'):
-      return 0;
-    case _T('1'):
-      return 1;
-    case _T('2'):
-      return 2;
-    case _T('3'):
-      return 3;
-    case _T('4'):
-      return 4;
-    case _T('5'):
-      return 5;
-    case _T('6'):
-      return 6;
-    case _T('7'):
-      return 7;
-    case _T('8'):
-      return 8;
-    case _T('9'):
-      return 9;
-    case _T('A'):
-      return 10;
-    case _T('B'):
-      return 11;
-    case _T('C'):
-      return 12;
-    case _T('D'):
-      return 13;
-    case _T('E'):
-      return 14;
-    case _T('F'):
-      return 15;
-  }
-
-  return 0;
-}
-
-// 4-digit hex string to unsigned integer
-static unsigned long HexToInt(wxChar *buf)
-{
-  long d1 = (long)(HexToInt1(buf[0])*4096.0) ;
-  long d2 = (long)(HexToInt1(buf[1])*256.0) ;
-  long d3 = (long)(HexToInt1(buf[2])*16.0) ;
-  long d4 = (long)(HexToInt1(buf[3])) ;
-  unsigned long n = (long)(d1 + d2 + d3 + d4) ;
-  return n;
-}
-
-#endif // wxUSE_PROLOGIO
-
-/*
- * wxPseudo meta-file
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPseudoMetaFile, wxObject)
-
-wxPseudoMetaFile::wxPseudoMetaFile()
-{
-  m_currentRotation = 0;
-  m_rotateable = true;
-  m_width = 0.0;
-  m_height = 0.0;
-  m_outlinePen = NULL;
-  m_fillBrush = NULL;
-  m_outlineOp = -1;
-}
-
-wxPseudoMetaFile::wxPseudoMetaFile(wxPseudoMetaFile& mf):wxObject()
-{
-  mf.Copy(*this);
-}
-
-wxPseudoMetaFile::~wxPseudoMetaFile()
-{
-  Clear();
-}
-
-void wxPseudoMetaFile::Clear()
-{
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    delete op;
-    node = node->GetNext();
-  }
-  m_ops.Clear();
-  m_gdiObjects.Clear();
-  m_outlineColours.Clear();
-  m_fillColours.Clear();
-  m_outlineOp = -1;
-}
-
-void wxPseudoMetaFile::Draw(wxDC& dc, double xoffset, double yoffset)
-{
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    op->Do(dc, xoffset, yoffset);
-    node = node->GetNext();
-  }
-}
-
-void wxPseudoMetaFile::Scale(double sx, double sy)
-{
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    op->Scale(sx, sy);
-    node = node->GetNext();
-  }
-  m_width *= sx;
-  m_height *= sy;
-}
-
-void wxPseudoMetaFile::Translate(double x, double y)
-{
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    op->Translate(x, y);
-    node = node->GetNext();
-  }
-}
-
-void wxPseudoMetaFile::Rotate(double x, double y, double theta)
-{
-  double theta1 = theta-m_currentRotation;
-  if (theta1 == 0.0) return;
-  double cosTheta = (double)cos(theta1);
-  double sinTheta = (double)sin(theta1);
-
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    op->Rotate(x, y, theta, sinTheta, cosTheta);
-    node = node->GetNext();
-  }
-  m_currentRotation = theta;
-}
-
-#if wxUSE_PROLOGIO
-void wxPseudoMetaFile::WriteAttributes(wxExpr *clause, int whichAngle)
-{
-  wxString widthStr;
-  widthStr.Printf(wxT("meta_width%d"), whichAngle);
-
-  wxString heightStr;
-  heightStr.Printf(wxT("meta_height%d"), whichAngle);
-
-  wxString outlineStr;
-  outlineStr.Printf(wxT("outline_op%d"), whichAngle);
-
-  wxString rotateableStr;
-  rotateableStr.Printf(wxT("meta_rotateable%d"), whichAngle);
-
-  // Write width and height
-  clause->AddAttributeValue(widthStr, m_width);
-  clause->AddAttributeValue(heightStr, m_height);
-  clause->AddAttributeValue(rotateableStr, (long)m_rotateable);
-  clause->AddAttributeValue(outlineStr, (long)m_outlineOp);
-
-  // Write GDI objects
-  wxChar buf[50];
-  int i = 1;
-  wxNode *node = m_gdiObjects.GetFirst();
-  while (node)
-  {
-    wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i);
-    wxObject *obj = (wxObject *)node->GetData();
-    wxExpr *expr = NULL;
-    if (obj)
-    {
-      if (obj->IsKindOf(CLASSINFO(wxPen)))
-      {
-        wxPen *thePen = (wxPen *)obj;
-        expr = new wxExpr(wxExprList);
-        expr->Append(new wxExpr((long)gyTYPE_PEN));
-        expr->Append(new wxExpr((long)thePen->GetWidth()));
-        expr->Append(new wxExpr((long)thePen->GetStyle()));
-        expr->Append(new wxExpr((long)thePen->GetColour().Red()));
-        expr->Append(new wxExpr((long)thePen->GetColour().Green()));
-        expr->Append(new wxExpr((long)thePen->GetColour().Blue()));
-      }
-      else if (obj->IsKindOf(CLASSINFO(wxBrush)))
-      {
-        wxBrush *theBrush = (wxBrush *)obj;
-        expr = new wxExpr(wxExprList);
-        expr->Append(new wxExpr((long)gyTYPE_BRUSH));
-        expr->Append(new wxExpr((long)theBrush->GetStyle()));
-        expr->Append(new wxExpr((long)theBrush->GetColour().Red()));
-        expr->Append(new wxExpr((long)theBrush->GetColour().Green()));
-        expr->Append(new wxExpr((long)theBrush->GetColour().Blue()));
-      }
-      else if (obj->IsKindOf(CLASSINFO(wxFont)))
-      {
-        wxFont *theFont = (wxFont *)obj;
-        expr = new wxExpr(wxExprList);
-        expr->Append(new wxExpr((long)gyTYPE_FONT));
-        expr->Append(new wxExpr((long)theFont->GetPointSize()));
-        expr->Append(new wxExpr((long)theFont->GetFamily()));
-        expr->Append(new wxExpr((long)theFont->GetStyle()));
-        expr->Append(new wxExpr((long)theFont->GetWeight()));
-        expr->Append(new wxExpr((long)theFont->GetUnderlined()));
-      }
-    }
-    else
-    {
-      // If no recognised GDI object, append a place holder anyway.
-      expr = new wxExpr(wxExprList);
-      expr->Append(new wxExpr((long)0));
-    }
-
-    if (expr)
-    {
-      clause->AddAttributeValue(buf, expr);
-      i ++;
-    }
-    node = node->GetNext();
-  }
-
-  // Write drawing operations
-  i = 1;
-  node = m_ops.GetFirst();
-  while (node)
-  {
-    wxSprintf(buf, _T("op%d_%d"), whichAngle, i);
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    wxExpr *expr = op->WriteExpr(this);
-    if (expr)
-    {
-      clause->AddAttributeValue(buf, expr);
-      i ++;
-    }
-    node = node->GetNext();
-  }
-
-  // Write outline and fill GDI op lists (if any)
-  if (m_outlineColours.GetCount() > 0)
-  {
-    wxExpr *outlineExpr = new wxExpr(wxExprList);
-    node = m_outlineColours.GetFirst();
-    while (node)
-    {
-      outlineExpr->Append(new wxExpr((long)node->GetData()));
-      node = node->GetNext();
-    }
-    wxString outlineObjectsStr;
-    outlineObjectsStr.Printf(wxT("outline_objects%d"), whichAngle);
-
-    clause->AddAttributeValue(outlineObjectsStr, outlineExpr);
-  }
-  if (m_fillColours.GetCount() > 0)
-  {
-    wxExpr *fillExpr = new wxExpr(wxExprList);
-    node = m_fillColours.GetFirst();
-    while (node)
-    {
-      fillExpr->Append(new wxExpr((long)node->GetData()));
-      node = node->GetNext();
-    }
-    wxString fillObjectsStr;
-    fillObjectsStr.Printf(wxT("fill_objects%d"), whichAngle);
-
-    clause->AddAttributeValue(fillObjectsStr, fillExpr);
-  }
-
-}
-
-void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
-{
-  wxString widthStr;
-  widthStr.Printf(wxT("meta_width%d"), whichAngle);
-
-  wxString heightStr;
-  heightStr.Printf(wxT("meta_height%d"), whichAngle);
-
-  wxString outlineStr;
-  outlineStr.Printf(wxT("outline_op%d"), whichAngle);
-
-  wxString rotateableStr;
-  rotateableStr.Printf(wxT("meta_rotateable%d"), whichAngle);
-
-  clause->GetAttributeValue(widthStr, m_width);
-  clause->GetAttributeValue(heightStr, m_height);
-  clause->GetAttributeValue(outlineStr, m_outlineOp);
-
-  int iVal = (int) m_rotateable;
-  clause->GetAttributeValue(rotateableStr, iVal);
-  m_rotateable = (iVal != 0);
-
-  // Read GDI objects
-  wxChar buf[50];
-  int i = 1;
-  bool keepGoing = true;
-  while (keepGoing)
-  {
-    wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i);
-    wxExpr *expr = NULL;
-    clause->GetAttributeValue(buf, &expr);
-    if (!expr)
-    {
-      keepGoing = false;
-    }
-    else
-    {
-      wxExpr *idExpr = expr->Nth(0);
-      switch (idExpr->IntegerValue())
-      {
-        case gyTYPE_PEN:
-        {
-          int penWidth = (int)expr->Nth(1)->IntegerValue();
-          int penStyle = (int)expr->Nth(2)->IntegerValue();
-          unsigned char penRed = (unsigned char)expr->Nth(3)->IntegerValue();
-          unsigned char penGreen = (unsigned char)expr->Nth(4)->IntegerValue();
-          unsigned char penBlue = (unsigned char)expr->Nth(5)->IntegerValue();
-          wxColour col(penRed, penGreen, penBlue);
-          wxPen *p = wxThePenList->FindOrCreatePen(col, penWidth, penStyle);
-          if (!p)
-            p = wxBLACK_PEN;
-          m_gdiObjects.Append(p);
-          break;
-        }
-        case gyTYPE_BRUSH:
-        {
-          int brushStyle = (int)expr->Nth(1)->IntegerValue();
-          unsigned char brushRed = (unsigned char)expr->Nth(2)->IntegerValue();
-          unsigned char brushGreen = (unsigned char)expr->Nth(3)->IntegerValue();
-          unsigned char brushBlue = (unsigned char)expr->Nth(4)->IntegerValue();
-          wxColour col(brushRed, brushGreen, brushBlue);
-          wxBrush *b = wxTheBrushList->FindOrCreateBrush(col, brushStyle);
-          if (!b)
-            b = wxWHITE_BRUSH;
-          m_gdiObjects.Append(b);
-          break;
-        }
-        case gyTYPE_FONT:
-        {
-          int fontPointSize = (int)expr->Nth(1)->IntegerValue();
-          int fontFamily = (int)expr->Nth(2)->IntegerValue();
-          int fontStyle = (int)expr->Nth(3)->IntegerValue();
-          int fontWeight = (int)expr->Nth(4)->IntegerValue();
-          int fontUnderlined = (int)expr->Nth(5)->IntegerValue();
-          m_gdiObjects.Append(wxTheFontList->FindOrCreateFont(fontPointSize,
-                           fontFamily, fontStyle, fontWeight, (fontUnderlined != 0)));
-          break;
-        }
-        default:
-        {
-          // Place holder
-          m_gdiObjects.Append(NULL);
-          break;
-        }
-      }
-      i ++;
-    }
-  }
-
-  // Now read in the operations
-  keepGoing = true;
-  i = 1;
-  while (keepGoing)
-  {
-    wxSprintf(buf, _T("op%d_%d"), whichAngle, i);
-    wxExpr *expr = NULL;
-    clause->GetAttributeValue(buf, &expr);
-    if (!expr)
-    {
-      keepGoing = false;
-    }
-    else
-    {
-      wxExpr *idExpr = expr->Nth(0);
-      int opId = (int)idExpr->IntegerValue();
-      switch (opId)
-      {
-        case DRAWOP_SET_PEN:
-        case DRAWOP_SET_BRUSH:
-        case DRAWOP_SET_FONT:
-        case DRAWOP_SET_TEXT_COLOUR:
-        case DRAWOP_SET_BK_COLOUR:
-        case DRAWOP_SET_BK_MODE:
-        {
-          wxOpSetGDI *theOp = new wxOpSetGDI(opId, this, 0);
-          theOp->ReadExpr(this, expr);
-          m_ops.Append(theOp);
-          break;
-        }
-
-        case DRAWOP_SET_CLIPPING_RECT:
-        case DRAWOP_DESTROY_CLIPPING_RECT:
-        {
-          wxOpSetClipping *theOp = new wxOpSetClipping(opId, 0.0, 0.0, 0.0, 0.0);
-          theOp->ReadExpr(this, expr);
-          m_ops.Append(theOp);
-          break;
-        }
-
-        case DRAWOP_DRAW_LINE:
-        case DRAWOP_DRAW_RECT:
-        case DRAWOP_DRAW_ROUNDED_RECT:
-        case DRAWOP_DRAW_ELLIPSE:
-        case DRAWOP_DRAW_POINT:
-        case DRAWOP_DRAW_ARC:
-        case DRAWOP_DRAW_TEXT:
-        {
-          wxOpDraw *theOp = new wxOpDraw(opId, 0.0, 0.0, 0.0, 0.0);
-          theOp->ReadExpr(this, expr);
-          m_ops.Append(theOp);
-          break;
-        }
-        case DRAWOP_DRAW_SPLINE:
-        case DRAWOP_DRAW_POLYLINE:
-        case DRAWOP_DRAW_POLYGON:
-        {
-          wxOpPolyDraw *theOp = new wxOpPolyDraw(opId, 0, NULL);
-          theOp->ReadExpr(this, expr);
-          m_ops.Append(theOp);
-          break;
-        }
-        default:
-          break;
-      }
-    }
-    i ++;
-  }
-
-  wxString outlineObjectsStr;
-  outlineObjectsStr.Printf(wxT("outline_objects%d"), whichAngle);
-
-  // Now read in the list of outline and fill operations, if any
-  wxExpr *expr1 = clause->AttributeValue(outlineObjectsStr);
-  if (expr1)
-  {
-    wxExpr *eachExpr = expr1->GetFirst();
-    while (eachExpr)
-    {
-      m_outlineColours.Append((wxObject *)eachExpr->IntegerValue());
-      eachExpr = eachExpr->GetNext();
-    }
-  }
-
-  wxString fillObjectsStr;
-  fillObjectsStr.Printf(wxT("fill_objects%d"), whichAngle);
-
-  expr1 = clause->AttributeValue(fillObjectsStr);
-  if (expr1)
-  {
-    wxExpr *eachExpr = expr1->GetFirst();
-    while (eachExpr)
-    {
-      m_fillColours.Append((wxObject *)eachExpr->IntegerValue());
-      eachExpr = eachExpr->GetNext();
-    }
-  }
-}
-#endif
-
-// Does the copying for this object
-void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
-{
-  copy.Clear();
-
-  copy.m_currentRotation = m_currentRotation;
-  copy.m_width = m_width;
-  copy.m_height = m_height;
-  copy.m_rotateable = m_rotateable;
-  copy.m_fillBrush = m_fillBrush;
-  copy.m_outlinePen = m_outlinePen;
-  copy.m_outlineOp = m_outlineOp;
-
-  // Copy the GDI objects
-  wxNode *node = m_gdiObjects.GetFirst();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->GetData();
-    copy.m_gdiObjects.Append(obj);
-    node = node->GetNext();
-  }
-
-  // Copy the operations
-  node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    copy.m_ops.Append(op->Copy(&copy));
-    node = node->GetNext();
-  }
-
-  // Copy the outline/fill operations
-  node = m_outlineColours.GetFirst();
-  while (node)
-  {
-    copy.m_outlineColours.Append((wxObject *)node->GetData());
-    node = node->GetNext();
-  }
-  node = m_fillColours.GetFirst();
-  while (node)
-  {
-    copy.m_fillColours.Append((wxObject *)node->GetData());
-    node = node->GetNext();
-  }
-}
-
-/*
- * Pass size of existing image; scale height to
- * fit width and return new width and height.
- *
- */
-
-bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight)
-{
-  if (!wxFileExists(filename))
-    return false;
-
-  wxXMetaFile *metaFile = new wxXMetaFile;
-
-  if (!metaFile->ReadFile(filename))
-  {
-    delete metaFile;
-    return false;
-  }
-
-  double lastX = 0.0;
-  double lastY = 0.0;
-
-  // Convert from metafile records to wxDrawnShape records
-  wxNode *node = metaFile->metaRecords.GetFirst();
-  while (node)
-  {
-    wxMetaRecord *record = (wxMetaRecord *)node->GetData();
-    switch (record->metaFunction)
-    {
-      case META_SETBKCOLOR:
-      {
-        wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_BK_COLOUR, this, 0);
-        op->m_r = (unsigned char)record->param1;
-        op->m_g = (unsigned char)record->param2;
-        op->m_b = (unsigned char)record->param3;
-        m_ops.Append(op);
-        break;
-      }
-      case META_SETBKMODE:
-      {
-        wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_BK_MODE, this, 0, (int)record->param1);
-        m_ops.Append(op);
-        break;
-      }
-      case META_SETMAPMODE:
-      {
-        break;
-      }
-//      case META_SETROP2:
-//      case META_SETRELABS:
-//      case META_SETPOLYFILLMODE:
-//      case META_SETSTRETCHBLTMODE:
-//      case META_SETTEXTCHAREXTRA:
-      case META_SETTEXTCOLOR:
-      {
-        wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_TEXT_COLOUR, this, 0);
-        op->m_r = (unsigned char)record->param1;
-        op->m_g = (unsigned char)record->param2;
-        op->m_b = (unsigned char)record->param3;
-        m_ops.Append(op);
-        break;
-      }
-//      case META_SETTEXTJUSTIFICATION:
-//      case META_SETWINDOWORG:
-//      case META_SETWINDOWEXT:
-//      case META_SETVIEWPORTORG:
-//      case META_SETVIEWPORTEXT:
-//      case META_OFFSETWINDOWORG:
-//      case META_SCALEWINDOWEXT:
-//      case META_OFFSETVIEWPORTORG:
-//      case META_SCALEVIEWPORTEXT:
-      case META_LINETO:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_LINE, (double)lastX, (double)lastY,
-                               (double)record->param1, (double)record->param2);
-        m_ops.Append(op);
-        break;
-      }
-      case META_MOVETO:
-      {
-        lastX = (double)record->param1;
-        lastY = (double)record->param2;
-        break;
-      }
-      case META_EXCLUDECLIPRECT:
-      {
-/*
-        wxMetaRecord *rec = new wxMetaRecord(META_EXCLUDECLIPRECT);
-        rec->param4 = getshort(handle); // m_y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-*/
-        break;
-      }
-      case META_INTERSECTCLIPRECT:
-      {
-/*
-        rec->param4 = getshort(handle); // m_y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-*/
-        break;
-      }
-//      case META_ARC: // DO!!!
-      case META_ELLIPSE:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_ELLIPSE,
-                               (double)record->param1, (double)record->param2,
-                               (double)(record->param3 - record->param1),
-                               (double)(record->param4 - record->param2));
-        m_ops.Append(op);
-        break;
-      }
-//      case META_FLOODFILL:
-//      case META_PIE: // DO!!!
-      case META_RECTANGLE:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_RECT,
-                               (double)record->param1, (double)record->param2,
-                               (double)(record->param3 - record->param1),
-                               (double)(record->param4 - record->param2));
-        m_ops.Append(op);
-        break;
-      }
-      case META_ROUNDRECT:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_ROUNDED_RECT,
-              (double)record->param1, (double)record->param2,
-              (double)(record->param3 - record->param1),
-              (double)(record->param4 - record->param2), (double)record->param5);
-        m_ops.Append(op);
-        break;
-      }
-//      case META_PATBLT:
-//      case META_SAVEDC:
-      case META_SETPIXEL:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_POINT,
-              (double)record->param1, (double)record->param2,
-              0.0, 0.0);
-
-//        SHOULD SET THE COLOUR - SET PEN?
-//        rec->param3 = getint(handle);   // COLORREF
-        m_ops.Append(op);
-        break;
-      }
-//      case META_OFFSETCLIPRGN:
-      case META_TEXTOUT:
-      {
-        wxOpDraw *op = new wxOpDraw(DRAWOP_DRAW_TEXT,
-              (double)record->param1, (double)record->param2,
-              0.0, 0.0, 0.0, record->stringParam);
-        m_ops.Append(op);
-        break;
-      }
-//      case META_BITBLT:
-//      case META_STRETCHBLT:
-      case META_POLYGON:
-      {
-        int n = (int)record->param1;
-        wxRealPoint *newPoints = new wxRealPoint[n];
-        for (int i = 0; i < n; i++)
-        {
-          newPoints[i].x = record->points[i].x;
-          newPoints[i].y = record->points[i].y;
-        }
-
-        wxOpPolyDraw *op = new wxOpPolyDraw(DRAWOP_DRAW_POLYGON, n, newPoints);
-        m_ops.Append(op);
-        break;
-      }
-      case META_POLYLINE:
-      {
-        int n = (int)record->param1;
-        wxRealPoint *newPoints = new wxRealPoint[n];
-        for (int i = 0; i < n; i++)
-        {
-          newPoints[i].x = record->points[i].x;
-          newPoints[i].y = record->points[i].y;
-        }
-
-        wxOpPolyDraw *op = new wxOpPolyDraw(DRAWOP_DRAW_POLYLINE, n, newPoints);
-        m_ops.Append(op);
-        break;
-      }
-//      case META_ESCAPE:
-//      case META_RESTOREDC:
-//      case META_FILLREGION:
-//      case META_FRAMEREGION:
-//      case META_INVERTREGION:
-//      case META_PAINTREGION:
-//      case META_SELECTCLIPREGION: // DO THIS!
-      case META_SELECTOBJECT:
-      {
-        // The pen, brush etc. has already been created when the metafile
-        // was read in, so we don't create it - we set it.
-        wxNode *recNode = metaFile->gdiObjects.Item((int)record->param2);
-        if (recNode)
-        {
-          wxMetaRecord *gdiRec = (wxMetaRecord *)recNode->GetData();
-          if (gdiRec && (gdiRec->param1 != 0))
-          {
-            wxObject *obj = (wxObject *)gdiRec->param1;
-            if (obj->IsKindOf(CLASSINFO(wxPen)))
-            {
-              wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_PEN, this, (int)record->param2);
-              m_ops.Append(op);
-            }
-            else if (obj->IsKindOf(CLASSINFO(wxBrush)))
-            {
-              wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_BRUSH, this, (int)record->param2);
-              m_ops.Append(op);
-            }
-            else if (obj->IsKindOf(CLASSINFO(wxFont)))
-            {
-              wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_FONT, this, (int)record->param2);
-              m_ops.Append(op);
-            }
-          }
-        }
-        break;
-      }
-//      case META_SETTEXTALIGN:
-//      case META_DRAWTEXT:
-//      case META_CHORD:
-//      case META_SETMAPPERFLAGS:
-//      case META_EXTTEXTOUT:
-//      case META_SETDIBTODEV:
-//      case META_SELECTPALETTE:
-//      case META_REALIZEPALETTE:
-//      case META_ANIMATEPALETTE:
-//      case META_SETPALENTRIES:
-//      case META_POLYPOLYGON:
-//      case META_RESIZEPALETTE:
-//      case META_DIBBITBLT:
-//      case META_DIBSTRETCHBLT:
-      case META_DIBCREATEPATTERNBRUSH:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-//      case META_STRETCHDIB:
-//      case META_EXTFLOODFILL:
-//      case META_RESETDC:
-//      case META_STARTDOC:
-//      case META_STARTPAGE:
-//      case META_ENDPAGE:
-//      case META_ABORTDOC:
-//      case META_ENDDOC:
-//      case META_DELETEOBJECT: // DO!!
-      case META_CREATEPALETTE:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      case META_CREATEBRUSH:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      case META_CREATEPATTERNBRUSH:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      case META_CREATEPENINDIRECT:
-      {
-        // The pen is created when the metafile is read in.
-        // We keep track of all the GDI objects needed for this
-        // image so when reading the wxDrawnShape from file,
-        // we can read in all the GDI objects, then refer
-        // to them by an index starting from zero thereafter.
-        m_gdiObjects.Append((wxObject *)record->param1);
-        break;
-      }
-      case META_CREATEFONTINDIRECT:
-      {
-        m_gdiObjects.Append((wxObject *)record->param1);
-        break;
-      }
-      case META_CREATEBRUSHINDIRECT:
-      {
-        // Don't have to do anything here: the pen is created
-        // when the metafile is read in.
-        m_gdiObjects.Append((wxObject *)record->param1);
-        break;
-      }
-      case META_CREATEBITMAPINDIRECT:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      case META_CREATEBITMAP:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      case META_CREATEREGION:
-      {
-        // Place holder
-        m_gdiObjects.Append(NULL);
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-    node = node->GetNext();
-  }
-  double actualWidth = (double)fabs(metaFile->right - metaFile->left);
-  double actualHeight = (double)fabs(metaFile->bottom - metaFile->top);
-
-  double initialScaleX = 1.0;
-  double initialScaleY = 1.0;
-
-  double xoffset, yoffset;
-
-  // Translate so origin is at centre of rectangle
-  if (metaFile->bottom > metaFile->top)
-    yoffset = - (double)((metaFile->bottom - metaFile->top)/2.0);
-  else
-    yoffset = - (double)((metaFile->top - metaFile->bottom)/2.0);
-
-  if (metaFile->right > metaFile->left)
-    xoffset = - (double)((metaFile->right - metaFile->left)/2.0);
-  else
-    xoffset = - (double)((metaFile->left - metaFile->right)/2.0);
-
-  Translate(xoffset, yoffset);
-
-  // Scale to a reasonable size (take the width of this wxDrawnShape
-  // as a guide)
-  if (actualWidth != 0.0)
-  {
-    initialScaleX = (double)((*rwidth) / actualWidth);
-    initialScaleY = initialScaleX;
-    (*rheight) = initialScaleY*actualHeight;
-  }
-  Scale(initialScaleX, initialScaleY);
-
-  m_width = (actualWidth*initialScaleX);
-  m_height = *rheight;
-
-  delete metaFile;
-  return true;
-}
-
-// Scale to fit size
-void wxPseudoMetaFile::ScaleTo(double w, double h)
-{
-  double scaleX = (double)(w/m_width);
-  double scaleY = (double)(h/m_height);
-
-  // Do the scaling
-  Scale(scaleX, scaleY);
-}
-
-void wxPseudoMetaFile::GetBounds(double *boundMinX, double *boundMinY, double *boundMaxX, double *boundMaxY)
-{
-  double maxX = (double) -99999.9;
-  double maxY = (double) -99999.9;
-  double minX = (double) 99999.9;
-  double minY = (double) 99999.9;
-
-  wxNode *node = m_ops.GetFirst();
-  while (node)
-  {
-    wxDrawOp *op = (wxDrawOp *)node->GetData();
-    switch (op->GetOp())
-    {
-      case DRAWOP_DRAW_LINE:
-      case DRAWOP_DRAW_RECT:
-      case DRAWOP_DRAW_ROUNDED_RECT:
-      case DRAWOP_DRAW_ELLIPSE:
-      case DRAWOP_DRAW_ELLIPTIC_ARC:
-      case DRAWOP_DRAW_POINT:
-      case DRAWOP_DRAW_TEXT:
-      {
-        wxOpDraw *opDraw = (wxOpDraw *)op;
-        if (opDraw->m_x1 < minX) minX = opDraw->m_x1;
-        if (opDraw->m_x1 > maxX) maxX = opDraw->m_x1;
-        if (opDraw->m_y1 < minY) minY = opDraw->m_y1;
-        if (opDraw->m_y1 > maxY) maxY = opDraw->m_y1;
-        if (op->GetOp() == DRAWOP_DRAW_LINE)
-        {
-          if (opDraw->m_x2 < minX) minX = opDraw->m_x2;
-          if (opDraw->m_x2 > maxX) maxX = opDraw->m_x2;
-          if (opDraw->m_y2 < minY) minY = opDraw->m_y2;
-          if (opDraw->m_y2 > maxY) maxY = opDraw->m_y2;
-        }
-        else if (op->GetOp() == DRAWOP_DRAW_RECT ||
-                 op->GetOp() == DRAWOP_DRAW_ROUNDED_RECT ||
-                 op->GetOp() == DRAWOP_DRAW_ELLIPSE ||
-                 op->GetOp() == DRAWOP_DRAW_ELLIPTIC_ARC)
-        {
-          if ((opDraw->m_x1 + opDraw->m_x2) < minX) minX = (opDraw->m_x1 + opDraw->m_x2);
-          if ((opDraw->m_x1 + opDraw->m_x2) > maxX) maxX = (opDraw->m_x1 + opDraw->m_x2);
-          if ((opDraw->m_y1 + opDraw->m_y2) < minY) minY = (opDraw->m_y1 + opDraw->m_y2);
-          if ((opDraw->m_y1 + opDraw->m_y2) > maxY) maxY = (opDraw->m_y1 + opDraw->m_y2);
-        }
-        break;
-      }
-      case DRAWOP_DRAW_ARC:
-      {
-        // TODO: don't yet know how to calculate the bounding box
-        // for an arc. So pretend it's a line; to get a correct
-        // bounding box, draw a blank rectangle first, of the correct
-        // size.
-        wxOpDraw *opDraw = (wxOpDraw *)op;
-        if (opDraw->m_x1 < minX) minX = opDraw->m_x1;
-        if (opDraw->m_x1 > maxX) maxX = opDraw->m_x1;
-        if (opDraw->m_y1 < minY) minY = opDraw->m_y1;
-        if (opDraw->m_y1 > maxY) maxY = opDraw->m_y1;
-        if (opDraw->m_x2 < minX) minX = opDraw->m_x2;
-        if (opDraw->m_x2 > maxX) maxX = opDraw->m_x2;
-        if (opDraw->m_y2 < minY) minY = opDraw->m_y2;
-        if (opDraw->m_y2 > maxY) maxY = opDraw->m_y2;
-        break;
-      }
-      case DRAWOP_DRAW_POLYLINE:
-      case DRAWOP_DRAW_POLYGON:
-      case DRAWOP_DRAW_SPLINE:
-      {
-        wxOpPolyDraw *poly = (wxOpPolyDraw *)op;
-        for (int i = 0; i < poly->m_noPoints; i++)
-        {
-          if (poly->m_points[i].x < minX) minX = poly->m_points[i].x;
-          if (poly->m_points[i].x > maxX) maxX = poly->m_points[i].x;
-          if (poly->m_points[i].y < minY) minY = poly->m_points[i].y;
-          if (poly->m_points[i].y > maxY) maxY = poly->m_points[i].y;
-        }
-        break;
-      }
-      default:
-        break;
-    }
-    node = node->GetNext();
-  }
-
-  *boundMinX = minX;
-  *boundMinY = minY;
-  *boundMaxX = maxX;
-  *boundMaxY = maxY;
-/*
-  *w = (double)fabs(maxX - minX);
-  *h = (double)fabs(maxY - minY);
-*/
-}
-
-// Calculate size from current operations
-void wxPseudoMetaFile::CalculateSize(wxDrawnShape* shape)
-{
-  double boundMinX, boundMinY, boundMaxX, boundMaxY;
-
-  GetBounds(& boundMinX, & boundMinY, & boundMaxX, & boundMaxY);
-
-  SetSize(boundMaxX - boundMinX, boundMaxY - boundMinY);
-
-  if (shape)
-  {
-    shape->SetWidth(m_width);
-    shape->SetHeight(m_height);
-  }
-}
-
-// Set of functions for drawing into a pseudo metafile.
-// They use integers, but doubles are used internally for accuracy
-// when scaling.
-
-void wxPseudoMetaFile::DrawLine(const wxPoint& pt1, const wxPoint& pt2)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_LINE,
-          (double) pt1.x, (double) pt1.y, (double) pt2.x, (double) pt2.y);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawRectangle(const wxRect& rect)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_RECT,
-          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawRoundedRectangle(const wxRect& rect, double radius)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ROUNDED_RECT,
-          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
-
-    theOp->m_radius = radius;
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawEllipse(const wxRect& rect)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ELLIPSE,
-          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ARC,
-          (double) centrePt.x, (double) centrePt.y, (double) startPt.x, (double) startPt.y);
-
-    theOp->m_x3 = (double) endPt.x;
-    theOp->m_y3 = (double) endPt.y;
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle)
-{
-    const double pi = M_PI ;
-
-    double startAngleRadians = startAngle* (pi*2.0/360.0);
-    double endAngleRadians = endAngle* (pi*2.0/360.0);
-
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ELLIPTIC_ARC,
-          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
-
-    theOp->m_x3 = startAngleRadians;
-    theOp->m_y3 = endAngleRadians;
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawPoint(const wxPoint& pt)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_POINT,
-          (double) pt.x, (double) pt.y, 0.0, 0.0);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawText(const wxString& text, const wxPoint& pt)
-{
-    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_TEXT,
-          (double) pt.x, (double) pt.y, 0.0, 0.0);
-
-    theOp->m_textString = text;
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawLines(int n, wxPoint pts[])
-{
-    wxRealPoint* realPoints = new wxRealPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        realPoints[i].x = pts[i].x;
-        realPoints[i].y = pts[i].y;
-    }
-    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_POLYLINE, n, realPoints);
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::DrawPolygon(int n, wxPoint pts[], int flags)
-{
-    wxRealPoint* realPoints = new wxRealPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        realPoints[i].x = pts[i].x;
-        realPoints[i].y = pts[i].y;
-    }
-    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_POLYGON, n, realPoints);
-    m_ops.Append(theOp);
-
-    if (flags & oglMETAFLAGS_OUTLINE)
-        m_outlineOp = (m_ops.GetCount() - 1);
-}
-
-void wxPseudoMetaFile::DrawSpline(int n, wxPoint pts[])
-{
-    wxRealPoint* realPoints = new wxRealPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        realPoints[i].x = pts[i].x;
-        realPoints[i].y = pts[i].y;
-    }
-    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_SPLINE, n, realPoints);
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::SetClippingRect(const wxRect& rect)
-{
-    /* wxOpSetClipping* theOp = */ new wxOpSetClipping(DRAWOP_SET_CLIPPING_RECT,
-        (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
-}
-
-void wxPseudoMetaFile::DestroyClippingRect()
-{
-    wxOpSetClipping* theOp = new wxOpSetClipping(DRAWOP_DESTROY_CLIPPING_RECT,
-        0.0, 0.0, 0.0, 0.0);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::SetPen(const wxPen* pen, bool isOutline)
-{
-    m_gdiObjects.Append(wx_const_cast(wxPen*, pen));
-    int n = m_gdiObjects.GetCount();
-
-    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_PEN, this, n - 1);
-
-    m_ops.Append(theOp);
-
-    if (isOutline)
-    {
-        m_outlineColours.Append((wxObject*) (n - 1));
-    }
-}
-
-void wxPseudoMetaFile::SetBrush(const wxBrush* brush, bool isFill)
-{
-    m_gdiObjects.Append(wx_const_cast(wxBrush*, brush));
-    int n = m_gdiObjects.GetCount();
-
-    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BRUSH, this, n - 1);
-
-    m_ops.Append(theOp);
-
-    if (isFill)
-    {
-        m_fillColours.Append((wxObject*) (n - 1));
-    }
-}
-
-void wxPseudoMetaFile::SetFont(wxFont* font)
-{
-    m_gdiObjects.Append(font);
-    int n = m_gdiObjects.GetCount();
-
-    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_FONT, this, n - 1);
-
-    m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::SetTextColour(const wxColour& colour)
-{
-   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_TEXT_COLOUR, this, 0);
-   theOp->m_r = colour.Red();
-   theOp->m_g = colour.Green();
-   theOp->m_b = colour.Blue();
-
-   m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::SetBackgroundColour(const wxColour& colour)
-{
-   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BK_COLOUR, this, 0);
-   theOp->m_r = colour.Red();
-   theOp->m_g = colour.Green();
-   theOp->m_b = colour.Blue();
-
-   m_ops.Append(theOp);
-}
-
-void wxPseudoMetaFile::SetBackgroundMode(int mode)
-{
-   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BK_MODE, this, 0, mode);
-
-   m_ops.Append(theOp);
-}
-
diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
deleted file mode 100644
index a5982157a0..0000000000
--- a/contrib/src/ogl/lines.cpp
+++ /dev/null
@@ -1,2505 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        lines.cpp
-// Purpose:     wxLineShape
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include <ctype.h>
-
-#include "wx/ogl/ogl.h"
-
-
-// Line shape
-IMPLEMENT_DYNAMIC_CLASS(wxLineShape, wxShape)
-
-wxLineShape::wxLineShape()
-{
-  m_sensitivity = OP_CLICK_LEFT | OP_CLICK_RIGHT;
-  m_draggable = false;
-  m_attachmentTo = 0;
-  m_attachmentFrom = 0;
-/*
-  m_actualTextWidth = 0.0;
-  m_actualTextHeight = 0.0;
-*/
-  m_from = NULL;
-  m_to = NULL;
-  m_erasing = false;
-  m_arrowSpacing = 5.0; // For the moment, don't bother saving this to file.
-  m_ignoreArrowOffsets = false;
-  m_isSpline = false;
-  m_maintainStraightLines = false;
-  m_alignmentStart = 0;
-  m_alignmentEnd = 0;
-
-  m_lineControlPoints = NULL;
-
-  // Clear any existing regions (created in an earlier constructor)
-  // and make the three line regions.
-  ClearRegions();
-  wxShapeRegion *newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("Middle"));
-  newRegion->SetSize(150, 50);
-  m_regions.Append((wxObject *)newRegion);
-
-  newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("Start"));
-  newRegion->SetSize(150, 50);
-  m_regions.Append((wxObject *)newRegion);
-
-  newRegion = new wxShapeRegion;
-  newRegion->SetName(wxT("End"));
-  newRegion->SetSize(150, 50);
-  m_regions.Append((wxObject *)newRegion);
-
-  for (int i = 0; i < 3; i++)
-    m_labelObjects[i] = NULL;
-}
-
-wxLineShape::~wxLineShape()
-{
-  if (m_lineControlPoints)
-  {
-    ClearPointList(*m_lineControlPoints);
-    delete m_lineControlPoints;
-  }
-  for (int i = 0; i < 3; i++)
-  {
-    if (m_labelObjects[i])
-    {
-      m_labelObjects[i]->Select(false);
-      m_labelObjects[i]->RemoveFromCanvas(m_canvas);
-      delete m_labelObjects[i];
-      m_labelObjects[i] = NULL;
-    }
-  }
-  ClearArrowsAtPosition(-1);
-}
-
-void wxLineShape::MakeLineControlPoints(int n)
-{
-  if (m_lineControlPoints)
-  {
-    ClearPointList(*m_lineControlPoints);
-    delete m_lineControlPoints;
-  }
-  m_lineControlPoints = new wxList;
-
-  for (int i = 0; i < n; i++)
-  {
-    wxRealPoint *point = new wxRealPoint(-999, -999);
-    m_lineControlPoints->Append((wxObject*) point);
-  }
-}
-
-wxNode *wxLineShape::InsertLineControlPoint(wxDC* dc)
-{
-    if (dc)
-        Erase(*dc);
-
-  wxNode *last = m_lineControlPoints->GetLast();
-  wxNode *second_last = last->GetPrevious();
-  wxRealPoint *last_point = (wxRealPoint *)last->GetData();
-  wxRealPoint *second_last_point = (wxRealPoint *)second_last->GetData();
-
-  // Choose a point half way between the last and penultimate points
-  double line_x = ((last_point->x + second_last_point->x)/2);
-  double line_y = ((last_point->y + second_last_point->y)/2);
-
-  wxRealPoint *point = new wxRealPoint(line_x, line_y);
-  wxNode *node = m_lineControlPoints->Insert(last, (wxObject*) point);
-  return node;
-}
-
-bool wxLineShape::DeleteLineControlPoint()
-{
-  if (m_lineControlPoints->GetCount() < 3)
-    return false;
-
-  wxNode *last = m_lineControlPoints->GetLast();
-  wxNode *second_last = last->GetPrevious();
-
-  wxRealPoint *second_last_point = (wxRealPoint *)second_last->GetData();
-  delete second_last_point;
-  delete second_last;
-
-  return true;
-}
-
-void wxLineShape::Initialise()
-{
-  if (m_lineControlPoints)
-  {
-    // Just move the first and last control points
-    wxNode *first = m_lineControlPoints->GetFirst();
-    wxRealPoint *first_point = (wxRealPoint *)first->GetData();
-
-    wxNode *last = m_lineControlPoints->GetLast();
-    wxRealPoint *last_point = (wxRealPoint *)last->GetData();
-
-    // If any of the line points are at -999, we must
-    // initialize them by placing them half way between the first
-    // and the last.
-    wxNode *node = first->GetNext();
-    while (node)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      if (point->x == -999)
-      {
-        double x1, y1, x2, y2;
-        if (first_point->x < last_point->x)
-          { x1 = first_point->x; x2 = last_point->x; }
-        else
-          { x2 = first_point->x; x1 = last_point->x; }
-
-        if (first_point->y < last_point->y)
-          { y1 = first_point->y; y2 = last_point->y; }
-        else
-          { y2 = first_point->y; y1 = last_point->y; }
-
-        point->x = ((x2 - x1)/2 + x1);
-        point->y = ((y2 - y1)/2 + y1);
-      }
-      node = node->GetNext();
-    }
-  }
-}
-
-// Format a text string according to the region size, adding
-// strings with positions to region text list
-void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
-{
-  double w, h;
-  ClearText(i);
-
-  if (m_regions.GetCount() < 1)
-    return;
-  wxNode *node = m_regions.Item(i);
-  if (!node)
-    return;
-
-  wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-  region->SetText(s);
-  dc.SetFont(* region->GetFont());
-
-  region->GetSize(&w, &h);
-  // Initialize the size if zero
-  if (((w == 0) || (h == 0)) && (s.Length() > 0))
-  {
-    w = 100; h = 50;
-    region->SetSize(w, h);
-  }
-
-  wxStringList *string_list = oglFormatText(dc, s, (w-5), (h-5), region->GetFormatMode());
-  node = (wxNode*)string_list->GetFirst();
-  while (node)
-  {
-    wxChar *s = (wxChar *)node->GetData();
-    wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
-    region->GetFormattedText().Append((wxObject *)line);
-    node = node->GetNext();
-  }
-  delete string_list;
-  double actualW = w;
-  double actualH = h;
-  if (region->GetFormatMode() & FORMAT_SIZE_TO_CONTENTS)
-  {
-    oglGetCentredTextExtent(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, &actualW, &actualH);
-    if ((actualW != w ) || (actualH != h))
-    {
-      double xx, yy;
-      GetLabelPosition(i, &xx, &yy);
-      EraseRegion(dc, region, xx, yy);
-      if (m_labelObjects[i])
-      {
-        m_labelObjects[i]->Select(false, &dc);
-        m_labelObjects[i]->Erase(dc);
-        m_labelObjects[i]->SetSize(actualW, actualH);
-      }
-
-      region->SetSize(actualW, actualH);
-
-      if (m_labelObjects[i])
-      {
-        m_labelObjects[i]->Select(true, & dc);
-        m_labelObjects[i]->Draw(dc);
-      }
-    }
-  }
-  oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode());
-  m_formatted = true;
-}
-
-void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y)
-{
-  if (GetDisableLabel())
-    return;
-
-  double w, h;
-  double xx, yy;
-  region->GetSize(&w, &h);
-
-  // Get offset from x, y
-  region->GetPosition(&xx, &yy);
-
-  double xp = xx + x;
-  double yp = yy + y;
-
-  // First, clear a rectangle for the text IF there is any
-  if (region->GetFormattedText().GetCount() > 0)
-  {
-      dc.SetPen(GetBackgroundPen());
-      dc.SetBrush(GetBackgroundBrush());
-
-      // Now draw the text
-      if (region->GetFont()) dc.SetFont(* region->GetFont());
-
-      dc.DrawRectangle((long)(xp - w/2.0), (long)(yp - h/2.0), (long)w, (long)h);
-
-      if (m_pen) dc.SetPen(* m_pen);
-      dc.SetTextForeground(region->GetActualColourObject());
-
-#ifdef __WXMSW__
-      dc.SetTextBackground(GetBackgroundBrush().GetColour());
-#endif
-
-      oglDrawFormattedText(dc, &(region->GetFormattedText()), xp, yp, w, h, region->GetFormatMode());
-  }
-}
-
-void wxLineShape::EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y)
-{
-  if (GetDisableLabel())
-    return;
-
-  double w, h;
-  double xx, yy;
-  region->GetSize(&w, &h);
-
-  // Get offset from x, y
-  region->GetPosition(&xx, &yy);
-
-  double xp = xx + x;
-  double yp = yy + y;
-
-  if (region->GetFormattedText().GetCount() > 0)
-  {
-      dc.SetPen(GetBackgroundPen());
-      dc.SetBrush(GetBackgroundBrush());
-
-      dc.DrawRectangle((long)(xp - w/2.0), (long)(yp - h/2.0), (long)w, (long)h);
-  }
-}
-
-// Get the reference point for a label. Region x and y
-// are offsets from this.
-// position is 0, 1, 2
-void wxLineShape::GetLabelPosition(int position, double *x, double *y)
-{
-  switch (position)
-  {
-    case 0:
-    {
-      // Want to take the middle section for the label
-      int n = m_lineControlPoints->GetCount();
-      int half_way = (int)(n/2);
-
-      // Find middle of this line
-      wxNode *node = m_lineControlPoints->Item(half_way - 1);
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      wxNode *next_node = node->GetNext();
-      wxRealPoint *next_point = (wxRealPoint *)next_node->GetData();
-
-      double dx = (next_point->x - point->x);
-      double dy = (next_point->y - point->y);
-      *x = (double)(point->x + dx/2.0);
-      *y = (double)(point->y + dy/2.0);
-      break;
-    }
-    case 1:
-    {
-      wxNode *node = m_lineControlPoints->GetFirst();
-      *x = ((wxRealPoint *)node->GetData())->x;
-      *y = ((wxRealPoint *)node->GetData())->y;
-      break;
-    }
-    case 2:
-    {
-      wxNode *node = m_lineControlPoints->GetLast();
-      *x = ((wxRealPoint *)node->GetData())->x;
-      *y = ((wxRealPoint *)node->GetData())->y;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-/*
- * Find whether line is supposed to be vertical or horizontal and
- * make it so.
- *
- */
-void GraphicsStraightenLine(wxRealPoint *point1, wxRealPoint *point2)
-{
-  double dx = point2->x - point1->x;
-  double dy = point2->y - point1->y;
-
-  if (dx == 0.0)
-    return;
-  else if (fabs(dy/dx) > 1.0)
-  {
-    point2->x = point1->x;
-  }
-  else point2->y = point1->y;
-}
-
-void wxLineShape::Straighten(wxDC *dc)
-{
-  if (!m_lineControlPoints || m_lineControlPoints->GetCount() < 3)
-    return;
-
-  if (dc)
-    Erase(* dc);
-
-  wxNode *first_point_node = m_lineControlPoints->GetFirst();
-  wxNode *last_point_node = m_lineControlPoints->GetLast();
-  wxNode *second_last_point_node = last_point_node->GetPrevious();
-
-  wxRealPoint *last_point = (wxRealPoint *)last_point_node->GetData();
-  wxRealPoint *second_last_point = (wxRealPoint *)second_last_point_node->GetData();
-
-  GraphicsStraightenLine(last_point, second_last_point);
-
-  wxNode *node = first_point_node;
-  while (node && (node != second_last_point_node))
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *next_point = (wxRealPoint *)(node->GetNext()->GetData());
-
-    GraphicsStraightenLine(point, next_point);
-    node = node->GetNext();
-  }
-
-  if (dc)
-    Draw(* dc);
-}
-
-
-void wxLineShape::Unlink()
-{
-  if (m_to)
-    m_to->GetLines().DeleteObject(this);
-  if (m_from)
-    m_from->GetLines().DeleteObject(this);
-  m_to = NULL;
-  m_from = NULL;
-}
-
-void wxLineShape::SetEnds(double x1, double y1, double x2, double y2)
-{
-  // Find centre point
-  wxNode *first_point_node = m_lineControlPoints->GetFirst();
-  wxNode *last_point_node = m_lineControlPoints->GetLast();
-  wxRealPoint *first_point = (wxRealPoint *)first_point_node->GetData();
-  wxRealPoint *last_point = (wxRealPoint *)last_point_node->GetData();
-
-  first_point->x = x1;
-  first_point->y = y1;
-  last_point->x = x2;
-  last_point->y = y2;
-
-  m_xpos = (double)((x1 + x2)/2.0);
-  m_ypos = (double)((y1 + y2)/2.0);
-}
-
-// Get absolute positions of ends
-void wxLineShape::GetEnds(double *x1, double *y1, double *x2, double *y2)
-{
-  wxNode *first_point_node = m_lineControlPoints->GetFirst();
-  wxNode *last_point_node = m_lineControlPoints->GetLast();
-  wxRealPoint *first_point = (wxRealPoint *)first_point_node->GetData();
-  wxRealPoint *last_point = (wxRealPoint *)last_point_node->GetData();
-
-  *x1 = first_point->x; *y1 = first_point->y;
-  *x2 = last_point->x; *y2 = last_point->y;
-}
-
-void wxLineShape::SetAttachments(int from_attach, int to_attach)
-{
-  m_attachmentFrom = from_attach;
-  m_attachmentTo = to_attach;
-}
-
-bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
-{
-  if (!m_lineControlPoints)
-    return false;
-
-  // Look at label regions in case mouse is over a label
-  bool inLabelRegion = false;
-  for (int i = 0; i < 3; i ++)
-  {
-    wxNode *regionNode = m_regions.Item(i);
-    if (regionNode)
-    {
-      wxShapeRegion *region = (wxShapeRegion *)regionNode->GetData();
-      if (region->m_formattedText.GetCount() > 0)
-      {
-        double xp, yp, cx, cy, cw, ch;
-        GetLabelPosition(i, &xp, &yp);
-        // Offset region from default label position
-        region->GetPosition(&cx, &cy);
-        region->GetSize(&cw, &ch);
-        cx += xp;
-        cy += yp;
-        double rLeft = (double)(cx - (cw/2.0));
-        double rTop = (double)(cy - (ch/2.0));
-        double rRight = (double)(cx + (cw/2.0));
-        double rBottom = (double)(cy + (ch/2.0));
-        if (x > rLeft && x < rRight && y > rTop && y < rBottom)
-        {
-          inLabelRegion = true;
-          i = 3;
-        }
-      }
-    }
-  }
-
-  wxNode *node = m_lineControlPoints->GetFirst();
-
-  while (node && node->GetNext())
-  {
-    wxRealPoint *point1 = (wxRealPoint *)node->GetData();
-    wxRealPoint *point2 = (wxRealPoint *)node->GetNext()->GetData();
-
-    // For inaccurate mousing allow 8 pixel corridor
-    int extra = 4;
-
-    double dx = point2->x - point1->x;
-    double dy = point2->y - point1->y;
-    double seg_len = sqrt(dx*dx+dy*dy);
-    double distance_from_seg =
-      seg_len*((x-point1->x)*dy-(y-point1->y)*dx)/(dy*dy+dx*dx);
-    double distance_from_prev =
-      seg_len*((y-point1->y)*dy+(x-point1->x)*dx)/(dy*dy+dx*dx);
-
-    if ((fabs(distance_from_seg) < extra &&
-         distance_from_prev >= 0 && distance_from_prev <= seg_len)
-        || inLabelRegion)
-    {
-      *attachment = 0;
-      *distance = distance_from_seg;
-      return true;
-    }
-
-    node = node->GetNext();
-  }
-  return false;
-}
-
-void wxLineShape::DrawArrows(wxDC& dc)
-{
-  // Distance along line of each arrow: space them out evenly.
-  double startArrowPos = 0.0;
-  double endArrowPos = 0.0;
-  double middleArrowPos = 0.0;
-
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    switch (arrow->GetArrowEnd())
-    {
-      case ARROW_POSITION_START:
-      {
-        if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
-          // If specified, x offset is proportional to line length
-          DrawArrow(dc, arrow, arrow->GetXOffset(), true);
-        else
-        {
-          DrawArrow(dc, arrow, startArrowPos, false);      // Absolute distance
-          startArrowPos += arrow->GetSize() + arrow->GetSpacing();
-        }
-        break;
-      }
-      case ARROW_POSITION_END:
-      {
-        if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
-          DrawArrow(dc, arrow, arrow->GetXOffset(), true);
-        else
-        {
-          DrawArrow(dc, arrow, endArrowPos, false);
-          endArrowPos += arrow->GetSize() + arrow->GetSpacing();
-        }
-        break;
-      }
-      case ARROW_POSITION_MIDDLE:
-      {
-        arrow->SetXOffset(middleArrowPos);
-        if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
-          DrawArrow(dc, arrow, arrow->GetXOffset(), true);
-        else
-        {
-          DrawArrow(dc, arrow, middleArrowPos, false);
-          middleArrowPos += arrow->GetSize() + arrow->GetSpacing();
-        }
-        break;
-      }
-    }
-    node = node->GetNext();
-  }
-}
-
-void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset)
-{
-  wxNode *first_line_node = m_lineControlPoints->GetFirst();
-  wxRealPoint *first_line_point = (wxRealPoint *)first_line_node->GetData();
-  wxNode *second_line_node = first_line_node->GetNext();
-  wxRealPoint *second_line_point = (wxRealPoint *)second_line_node->GetData();
-
-  wxNode *last_line_node = m_lineControlPoints->GetLast();
-  wxRealPoint *last_line_point = (wxRealPoint *)last_line_node->GetData();
-  wxNode *second_last_line_node = last_line_node->GetPrevious();
-  wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
-
-  // Position where we want to start drawing
-  double positionOnLineX = 0.0, positionOnLineY = 0.0;
-
-  // Position of start point of line, at the end of which we draw the arrow.
-  double startPositionX = 0.0 , startPositionY = 0.0;
-
-  switch (arrow->GetPosition())
-  {
-    case ARROW_POSITION_START:
-    {
-      // If we're using a proportional offset, calculate just where this will
-      // be on the line.
-      double realOffset = xOffset;
-      if (proportionalOffset)
-      {
-        double totalLength =
-          (double)sqrt((second_line_point->x - first_line_point->x)*(second_line_point->x - first_line_point->x) +
-                      (second_line_point->y - first_line_point->y)*(second_line_point->y - first_line_point->y));
-        realOffset = (double)(xOffset * totalLength);
-      }
-      GetPointOnLine(second_line_point->x, second_line_point->y,
-                     first_line_point->x, first_line_point->y,
-                     realOffset, &positionOnLineX, &positionOnLineY);
-      startPositionX = second_line_point->x;
-      startPositionY = second_line_point->y;
-      break;
-    }
-    case ARROW_POSITION_END:
-    {
-      // If we're using a proportional offset, calculate just where this will
-      // be on the line.
-      double realOffset = xOffset;
-      if (proportionalOffset)
-      {
-        double totalLength =
-          (double)sqrt((second_last_line_point->x - last_line_point->x)*(second_last_line_point->x - last_line_point->x) +
-                      (second_last_line_point->y - last_line_point->y)*(second_last_line_point->y - last_line_point->y));
-        realOffset = (double)(xOffset * totalLength);
-      }
-      GetPointOnLine(second_last_line_point->x, second_last_line_point->y,
-                     last_line_point->x, last_line_point->y,
-                     realOffset, &positionOnLineX, &positionOnLineY);
-      startPositionX = second_last_line_point->x;
-      startPositionY = second_last_line_point->y;
-      break;
-    }
-    case ARROW_POSITION_MIDDLE:
-    {
-      // Choose a point half way between the last and penultimate points
-      double x = ((last_line_point->x + second_last_line_point->x)/2);
-      double y = ((last_line_point->y + second_last_line_point->y)/2);
-
-      // If we're using a proportional offset, calculate just where this will
-      // be on the line.
-      double realOffset = xOffset;
-      if (proportionalOffset)
-      {
-        double totalLength =
-          (double)sqrt((second_last_line_point->x - x)*(second_last_line_point->x - x) +
-                      (second_last_line_point->y - y)*(second_last_line_point->y - y));
-        realOffset = (double)(xOffset * totalLength);
-      }
-
-      GetPointOnLine(second_last_line_point->x, second_last_line_point->y,
-                     x, y, realOffset, &positionOnLineX, &positionOnLineY);
-      startPositionX = second_last_line_point->x;
-      startPositionY = second_last_line_point->y;
-      break;
-    }
-  }
-
-  /*
-   * Add yOffset to arrow, if any
-   */
-
-  const double myPi = (double) M_PI;
-  // The translation that the y offset may give
-  double deltaX = 0.0;
-  double deltaY = 0.0;
-  if ((arrow->GetYOffset() != 0.0) && !m_ignoreArrowOffsets)
-  {
-    /*
-                                 |(x4, y4)
-                                 |d
-                                 |
-       (x1, y1)--------------(x3, y3)------------------(x2, y2)
-       x4 = x3 - d * sin(theta)
-       y4 = y3 + d * cos(theta)
-
-       Where theta = tan(-1) of (y3-y1)/(x3-x1)
-     */
-     double x1 = startPositionX;
-     double y1 = startPositionY;
-     double x3 = positionOnLineX;
-     double y3 = positionOnLineY;
-     double d = -arrow->GetYOffset(); // Negate so +offset is above line
-
-     double theta;
-     if (x3 == x1)
-       theta = (double)(myPi/2.0);
-     else
-       theta = (double)atan((y3-y1)/(x3-x1));
-
-     double x4 = (double)(x3 - (d*sin(theta)));
-     double y4 = (double)(y3 + (d*cos(theta)));
-
-     deltaX = x4 - positionOnLineX;
-     deltaY = y4 - positionOnLineY;
-  }
-
-  switch (arrow->_GetType())
-  {
-    case ARROW_ARROW:
-    {
-      double arrowLength = arrow->GetSize();
-      double arrowWidth = (double)(arrowLength/3.0);
-
-      double tip_x, tip_y, side1_x, side1_y, side2_x, side2_y;
-      oglGetArrowPoints(startPositionX+deltaX, startPositionY+deltaY,
-                       positionOnLineX+deltaX, positionOnLineY+deltaY,
-                       arrowLength, arrowWidth, &tip_x, &tip_y,
-                       &side1_x, &side1_y, &side2_x, &side2_y);
-
-      wxPoint points[4];
-      points[0].x = (int) tip_x; points[0].y = (int) tip_y;
-      points[1].x = (int) side1_x; points[1].y = (int) side1_y;
-      points[2].x = (int) side2_x; points[2].y = (int) side2_y;
-      points[3].x = (int) tip_x; points[3].y = (int) tip_y;
-
-      dc.SetPen(* m_pen);
-      dc.SetBrush(* m_brush);
-      dc.DrawPolygon(4, points);
-      break;
-    }
-    case ARROW_HOLLOW_CIRCLE:
-    case ARROW_FILLED_CIRCLE:
-    {
-      // Find point on line of centre of circle, which is a radius away
-      // from the end position
-      double diameter = (double)(arrow->GetSize());
-      double x, y;
-      GetPointOnLine(startPositionX+deltaX, startPositionY+deltaY,
-                   positionOnLineX+deltaX, positionOnLineY+deltaY,
-                   (double)(diameter/2.0),
-                   &x, &y);
-
-      // Convert ellipse centre to top-left coordinates
-      double x1 = (double)(x - (diameter/2.0));
-      double y1 = (double)(y - (diameter/2.0));
-
-      dc.SetPen(* m_pen);
-      if (arrow->_GetType() == ARROW_HOLLOW_CIRCLE)
-        dc.SetBrush(GetBackgroundBrush());
-      else
-        dc.SetBrush(* m_brush);
-
-      dc.DrawEllipse((long) x1, (long) y1, (long) diameter, (long) diameter);
-      break;
-    }
-    case ARROW_SINGLE_OBLIQUE:
-    {
-      break;
-    }
-    case ARROW_METAFILE:
-    {
-      if (arrow->GetMetaFile())
-      {
-        // Find point on line of centre of object, which is a half-width away
-        // from the end position
-        /*
-         *                width
-         * <-- start pos  <-----><-- positionOnLineX
-         *                _____
-         * --------------|  x  | <-- e.g. rectangular arrowhead
-         *                -----
-         */
-        double x, y;
-        GetPointOnLine(startPositionX, startPositionY,
-                   positionOnLineX, positionOnLineY,
-                   (double)(arrow->GetMetaFile()->m_width/2.0),
-                   &x, &y);
-
-        // Calculate theta for rotating the metafile.
-        /*
-          |
-          |     o(x2, y2)   'o' represents the arrowhead.
-          |    /
-          |   /
-          |  /theta
-          | /(x1, y1)
-          |______________________
-        */
-        double theta = 0.0;
-        double x1 = startPositionX;
-        double y1 = startPositionY;
-        double x2 = positionOnLineX;
-        double y2 = positionOnLineY;
-
-        if ((x1 == x2) && (y1 == y2))
-          theta = 0.0;
-
-        else if ((x1 == x2) && (y1 > y2))
-          theta = (double)(3.0*myPi/2.0);
-
-        else if ((x1 == x2) && (y2 > y1))
-          theta = (double)(myPi/2.0);
-
-        else if ((x2 > x1) && (y2 >= y1))
-          theta = (double)atan((y2 - y1)/(x2 - x1));
-
-        else if (x2 < x1)
-          theta = (double)(myPi + atan((y2 - y1)/(x2 - x1)));
-
-        else if ((x2 > x1) && (y2 < y1))
-          theta = (double)(2*myPi + atan((y2 - y1)/(x2 - x1)));
-
-        else
-        {
-          wxLogFatalError(wxT("Unknown arrowhead rotation case in lines.cc"));
-        }
-
-        // Rotate about the centre of the object, then place
-        // the object on the line.
-        if (arrow->GetMetaFile()->GetRotateable())
-          arrow->GetMetaFile()->Rotate(0.0, 0.0, theta);
-
-        if (m_erasing)
-        {
-          // If erasing, just draw a rectangle.
-          double minX, minY, maxX, maxY;
-          arrow->GetMetaFile()->GetBounds(&minX, &minY, &maxX, &maxY);
-          // Make erasing rectangle slightly bigger or you get droppings.
-          int extraPixels = 4;
-          dc.DrawRectangle((long)(deltaX + x + minX - (extraPixels/2.0)), (long)(deltaY + y + minY - (extraPixels/2.0)),
-                           (long)(maxX - minX + extraPixels), (long)(maxY - minY + extraPixels));
-        }
-        else
-          arrow->GetMetaFile()->Draw(dc, x+deltaX, y+deltaY);
-      }
-      break;
-    }
-    default:
-    {
-    }
-  }
-}
-
-void wxLineShape::OnErase(wxDC& dc)
-{
-    const wxPen *old_pen = m_pen;
-    const wxBrush *old_brush = m_brush;
-    wxPen bg_pen = GetBackgroundPen();
-    wxBrush bg_brush = GetBackgroundBrush();
-    SetPen(&bg_pen);
-    SetBrush(&bg_brush);
-
-    double bound_x, bound_y;
-    GetBoundingBoxMax(&bound_x, &bound_y);
-    if (m_font) dc.SetFont(* m_font);
-
-    // Undraw text regions
-    for (int i = 0; i < 3; i++)
-    {
-      wxNode *node = m_regions.Item(i);
-      if (node)
-      {
-        double x, y;
-        wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-        GetLabelPosition(i, &x, &y);
-        EraseRegion(dc, region, x, y);
-      }
-    }
-
-    // Undraw line
-    dc.SetPen(GetBackgroundPen());
-    dc.SetBrush(GetBackgroundBrush());
-
-    // Drawing over the line only seems to work if the line has a thickness
-    // of 1.
-    if (old_pen && (old_pen->GetWidth() > 1))
-    {
-      dc.DrawRectangle((long)(m_xpos - (bound_x/2.0) - 2.0), (long)(m_ypos - (bound_y/2.0) - 2.0),
-                        (long)(bound_x+4.0),  (long)(bound_y+4.0));
-    }
-    else
-    {
-      m_erasing = true;
-      GetEventHandler()->OnDraw(dc);
-      GetEventHandler()->OnEraseControlPoints(dc);
-      m_erasing = false;
-    }
-
-    if (old_pen) SetPen(old_pen);
-    if (old_brush) SetBrush(old_brush);
-}
-
-void wxLineShape::GetBoundingBoxMin(double *w, double *h)
-{
-  double x1 = 10000;
-  double y1 = 10000;
-  double x2 = -10000;
-  double y2 = -10000;
-
-  wxNode *node = m_lineControlPoints->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-
-    if (point->x < x1) x1 = point->x;
-    if (point->y < y1) y1 = point->y;
-    if (point->x > x2) x2 = point->x;
-    if (point->y > y2) y2 = point->y;
-
-    node = node->GetNext();
-  }
-  *w = (double)(x2 - x1);
-  *h = (double)(y2 - y1);
-}
-
-/*
- * For a node image of interest, finds the position of this arc
- * amongst all the arcs which are attached to THIS SIDE of the node image,
- * and the number of same.
- */
-void wxLineShape::FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming)
-{
-  int n = -1;
-  int num = 0;
-  wxNode *node = image->GetLines().GetFirst();
-  int this_attachment;
-  if (image == m_to)
-    this_attachment = m_attachmentTo;
-  else
-    this_attachment = m_attachmentFrom;
-
-  // Find number of lines going into/out of this particular attachment point
-  while (node)
-  {
-    wxLineShape *line = (wxLineShape *)node->GetData();
-
-    if (line->m_from == image)
-    {
-      // This is the nth line attached to 'image'
-      if ((line == this) && !incoming)
-        n = num;
-
-      // Increment num count if this is the same side (attachment number)
-      if (line->m_attachmentFrom == this_attachment)
-        num ++;
-    }
-
-    if (line->m_to == image)
-    {
-      // This is the nth line attached to 'image'
-      if ((line == this) && incoming)
-        n = num;
-
-      // Increment num count if this is the same side (attachment number)
-      if (line->m_attachmentTo == this_attachment)
-        num ++;
-    }
-
-    node = node->GetNext();
-  }
-  *nth = n;
-  *no_arcs = num;
-}
-
-void wxLineShape::OnDrawOutline(wxDC& dc, double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h))
-{
-  const wxPen *old_pen = m_pen;
-  const wxBrush *old_brush = m_brush;
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  SetPen(& dottedPen);
-  SetBrush( wxTRANSPARENT_BRUSH );
-
-  GetEventHandler()->OnDraw(dc);
-
-  if (old_pen) SetPen(old_pen);
-  else SetPen(NULL);
-  if (old_brush) SetBrush(old_brush);
-  else SetBrush(NULL);
-}
-
-bool wxLineShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool WXUNUSED(display))
-{
-  double x_offset = x - old_x;
-  double y_offset = y - old_y;
-
-  if (m_lineControlPoints && !(x_offset == 0.0 && y_offset == 0.0))
-  {
-    wxNode *node = m_lineControlPoints->GetFirst();
-    while (node)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-      point->x += x_offset;
-      point->y += y_offset;
-      node = node->GetNext();
-    }
-
-  }
-
-  // Move temporary label rectangles if necessary
-  for (int i = 0; i < 3; i++)
-  {
-    if (m_labelObjects[i])
-    {
-      m_labelObjects[i]->Erase(dc);
-      double xp, yp, xr, yr;
-      GetLabelPosition(i, &xp, &yp);
-      wxNode *node = m_regions.Item(i);
-      if (node)
-      {
-        wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-        region->GetPosition(&xr, &yr);
-      }
-      else
-      {
-        xr = 0.0; yr = 0.0;
-      }
-
-      m_labelObjects[i]->Move(dc, xp+xr, yp+yr);
-    }
-  }
-  return true;
-}
-
-void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints)
-{
-  if (!m_from || !m_to)
-   return;
-
-    if (m_lineControlPoints->GetCount() > 2)
-      Initialise();
-
-    // Do each end - nothing in the middle. User has to move other points
-    // manually if necessary.
-    double end_x, end_y;
-    double other_end_x, other_end_y;
-
-    FindLineEndPoints(&end_x, &end_y, &other_end_x, &other_end_y);
-
-    wxNode *first = m_lineControlPoints->GetFirst();
-    /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();
-    wxNode *last = m_lineControlPoints->GetLast();
-    /* wxRealPoint *last_point = */ (wxRealPoint *)last->GetData();
-
-/* This is redundant, surely? Done by SetEnds.
-    first_point->x = end_x; first_point->y = end_y;
-    last_point->x = other_end_x; last_point->y = other_end_y;
-*/
-
-    double oldX = m_xpos;
-    double oldY = m_ypos;
-
-    SetEnds(end_x, end_y, other_end_x, other_end_y);
-
-    // Do a second time, because one may depend on the other.
-    FindLineEndPoints(&end_x, &end_y, &other_end_x, &other_end_y);
-    SetEnds(end_x, end_y, other_end_x, other_end_y);
-
-    // Try to move control points with the arc
-    double x_offset = m_xpos - oldX;
-    double y_offset = m_ypos - oldY;
-
-//    if (moveControlPoints && m_lineControlPoints && !(x_offset == 0.0 && y_offset == 0.0))
-    // Only move control points if it's a self link. And only works if attachment mode is ON.
-    if ((m_from == m_to) && (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE) && moveControlPoints && m_lineControlPoints && !(x_offset == 0.0 && y_offset == 0.0))
-    {
-      wxNode *node = m_lineControlPoints->GetFirst();
-      while (node)
-      {
-        if ((node != m_lineControlPoints->GetFirst()) && (node != m_lineControlPoints->GetLast()))
-        {
-          wxRealPoint *point = (wxRealPoint *)node->GetData();
-          point->x += x_offset;
-          point->y += y_offset;
-        }
-        node = node->GetNext();
-      }
-    }
-
-    Move(dc, m_xpos, m_ypos);
-}
-
-// Finds the x, y points at the two ends of the line.
-// This function can be used by e.g. line-routing routines to
-// get the actual points on the two node images where the lines will be drawn
-// to/from.
-void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, double *toY)
-{
-  if (!m_from || !m_to)
-   return;
-
-  // Do each end - nothing in the middle. User has to move other points
-  // manually if necessary.
-  double end_x = 0.0, end_y = 0.0;
-  double other_end_x = 0.0, other_end_y = 0.0;
-
-  wxNode *first = m_lineControlPoints->GetFirst();
-  /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();
-  wxNode *last = m_lineControlPoints->GetLast();
-  /* wxRealPoint *last_point = */ (wxRealPoint *)last->GetData();
-
-  wxNode *second = first->GetNext();
-  wxRealPoint *second_point = (wxRealPoint *)second->GetData();
-
-  wxNode *second_last = last->GetPrevious();
-  wxRealPoint *second_last_point = (wxRealPoint *)second_last->GetData();
-
-  if (m_lineControlPoints->GetCount() > 2)
-  {
-    if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
-    {
-      int nth, no_arcs;
-      FindNth(m_from, &nth, &no_arcs, false); // Not incoming
-      m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
-    }
-    else
-      (void) m_from->GetPerimeterPoint(m_from->GetX(), m_from->GetY(),
-                                   (double)second_point->x, (double)second_point->y,
-                                    &end_x, &end_y);
-
-    if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
-    {
-      int nth, no_arcs;
-      FindNth(m_to, &nth, &no_arcs, true); // Incoming
-      m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
-    }
-    else
-      (void) m_to->GetPerimeterPoint(m_to->GetX(), m_to->GetY(),
-                                (double)second_last_point->x, (double)second_last_point->y,
-                                &other_end_x, &other_end_y);
-  }
-  else
-  {
-    double fromX = m_from->GetX();
-    double fromY = m_from->GetY();
-    double toX = m_to->GetX();
-    double toY = m_to->GetY();
-
-    if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
-    {
-      int nth, no_arcs;
-      FindNth(m_from, &nth, &no_arcs, false);
-      m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
-      fromX = end_x;
-      fromY = end_y;
-    }
-
-    if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
-    {
-      int nth, no_arcs;
-      FindNth(m_to, &nth, &no_arcs, true);
-      m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
-      toX = other_end_x;
-      toY = other_end_y;
-    }
-
-    if (m_from->GetAttachmentMode() == ATTACHMENT_MODE_NONE)
-      (void) m_from->GetPerimeterPoint(m_from->GetX(), m_from->GetY(),
-                                  toX, toY,
-                                  &end_x, &end_y);
-
-    if (m_to->GetAttachmentMode() == ATTACHMENT_MODE_NONE)
-      (void) m_to->GetPerimeterPoint(m_to->GetX(), m_to->GetY(),
-                                fromX, fromY,
-                                &other_end_x, &other_end_y);
-  }
-  *fromX = end_x;
-  *fromY = end_y;
-  *toX = other_end_x;
-  *toY = other_end_y;
-}
-
-void wxLineShape::OnDraw(wxDC& dc)
-{
-  if (m_lineControlPoints)
-  {
-    if (m_pen)
-      dc.SetPen(* m_pen);
-    if (m_brush)
-      dc.SetBrush(* m_brush);
-
-    int n = m_lineControlPoints->GetCount();
-    wxPoint *points = new wxPoint[n];
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        wxRealPoint* point = (wxRealPoint*) m_lineControlPoints->Item(i)->GetData();
-        points[i].x = WXROUND(point->x);
-        points[i].y = WXROUND(point->y);
-    }
-
-    if (m_isSpline)
-      dc.DrawSpline(n, points);
-    else
-      dc.DrawLines(n, points);
-
-#ifdef __WXMSW__
-    // For some reason, last point isn't drawn under Windows.
-    dc.DrawPoint(points[n-1]);
-#endif
-
-    delete[] points;
-
-
-    // Problem with pen - if not a solid pen, does strange things
-    // to the arrowhead. So make (get) a new pen that's solid.
-    if (m_pen && (m_pen->GetStyle() != wxSOLID))
-    {
-      wxPen *solid_pen =
-        wxThePenList->FindOrCreatePen(m_pen->GetColour(), 1, wxSOLID);
-      if (solid_pen)
-        dc.SetPen(* solid_pen);
-    }
-    DrawArrows(dc);
-  }
-}
-
-void wxLineShape::OnDrawControlPoints(wxDC& dc)
-{
-  if (!m_drawHandles)
-    return;
-
-  // Draw temporary label rectangles if necessary
-  for (int i = 0; i < 3; i++)
-  {
-    if (m_labelObjects[i])
-      m_labelObjects[i]->Draw(dc);
-  }
-  wxShape::OnDrawControlPoints(dc);
-}
-
-void wxLineShape::OnEraseControlPoints(wxDC& dc)
-{
-  // Erase temporary label rectangles if necessary
-  for (int i = 0; i < 3; i++)
-  {
-    if (m_labelObjects[i])
-      m_labelObjects[i]->Erase(dc);
-  }
-  wxShape::OnEraseControlPoints(dc);
-}
-
-void wxLineShape::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-}
-
-void wxLineShape::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-}
-
-void wxLineShape::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-}
-
-/*
-void wxLineShape::SetArrowSize(double length, double width)
-{
-  arrow_length = length;
-  arrow_width = width;
-}
-
-void wxLineShape::SetStartArrow(int style)
-{
-  start_style = style;
-}
-
-void wxLineShape::SetMiddleArrow(int style)
-{
-  middle_style = style;
-}
-
-void wxLineShape::SetEndArrow(int style)
-{
-  end_style = style;
-}
-*/
-
-void wxLineShape::OnDrawContents(wxDC& dc)
-{
-  if (GetDisableLabel())
-    return;
-
-  for (int i = 0; i < 3; i++)
-  {
-    wxNode *node = m_regions.Item(i);
-    if (node)
-    {
-      wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-      double x, y;
-      GetLabelPosition(i, &x, &y);
-      DrawRegion(dc, region, x, y);
-    }
-  }
-}
-
-void wxLineShape::SetTo(wxShape *object)
-{
-  m_to = object;
-}
-
-void wxLineShape::SetFrom(wxShape *object)
-{
-  m_from = object;
-}
-
-void wxLineShape::MakeControlPoints()
-{
-  if (m_canvas && m_lineControlPoints)
-  {
-    wxNode *first = m_lineControlPoints->GetFirst();
-    wxNode *last = m_lineControlPoints->GetLast();
-    wxRealPoint *first_point = (wxRealPoint *)first->GetData();
-    wxRealPoint *last_point = (wxRealPoint *)last->GetData();
-
-    wxLineControlPoint *control = new wxLineControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
-                                               first_point->x, first_point->y,
-                                               CONTROL_POINT_ENDPOINT_FROM);
-    control->m_point = first_point;
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-
-
-    wxNode *node = first->GetNext();
-    while (node != last)
-    {
-      wxRealPoint *point = (wxRealPoint *)node->GetData();
-
-      control = new wxLineControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
-                                               point->x, point->y,
-                                               CONTROL_POINT_LINE);
-      control->m_point = point;
-
-      m_canvas->AddShape(control);
-      m_controlPoints.Append(control);
-
-      node = node->GetNext();
-    }
-    control = new wxLineControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
-                                               last_point->x, last_point->y,
-                                               CONTROL_POINT_ENDPOINT_TO);
-    control->m_point = last_point;
-    m_canvas->AddShape(control);
-    m_controlPoints.Append(control);
-
-  }
-
-}
-
-void wxLineShape::ResetControlPoints()
-{
-  if (m_canvas && m_lineControlPoints && m_controlPoints.GetCount() > 0)
-  {
-    wxNode *node = m_controlPoints.GetFirst();
-    wxNode *control_node = m_lineControlPoints->GetFirst();
-    while (node && control_node)
-    {
-      wxRealPoint *point = (wxRealPoint *)control_node->GetData();
-      wxLineControlPoint *control = (wxLineControlPoint *)node->GetData();
-      control->SetX(point->x);
-      control->SetY(point->y);
-
-      node = node->GetNext();
-      control_node = control_node->GetNext();
-    }
-  }
-}
-
-#if wxUSE_PROLOGIO
-void wxLineShape::WriteAttributes(wxExpr *clause)
-{
-  wxShape::WriteAttributes(clause);
-
-  if (m_from)
-    clause->AddAttributeValue(_T("from"), m_from->GetId());
-  if (m_to)
-    clause->AddAttributeValue(_T("to"), m_to->GetId());
-
-  if (m_attachmentTo != 0)
-    clause->AddAttributeValue(_T("attachment_to"), (long)m_attachmentTo);
-  if (m_attachmentFrom != 0)
-    clause->AddAttributeValue(_T("attachment_from"), (long)m_attachmentFrom);
-
-  if (m_alignmentStart != 0)
-    clause->AddAttributeValue(_T("align_start"), (long)m_alignmentStart);
-  if (m_alignmentEnd != 0)
-    clause->AddAttributeValue(_T("align_end"), (long)m_alignmentEnd);
-
-  clause->AddAttributeValue(_T("is_spline"), (long)m_isSpline);
-  if (m_maintainStraightLines)
-    clause->AddAttributeValue(_T("keep_lines_straight"), (long)m_maintainStraightLines);
-
-  // Make a list of lists for the (sp)line controls
-  wxExpr *list = new wxExpr(wxExprList);
-  wxNode *node = m_lineControlPoints->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxExpr *point_list = new wxExpr(wxExprList);
-    wxExpr *x_expr = new wxExpr((double) point->x);
-    wxExpr *y_expr = new wxExpr((double) point->y);
-    point_list->Append(x_expr);
-    point_list->Append(y_expr);
-    list->Append(point_list);
-
-    node = node->GetNext();
-  }
-  clause->AddAttributeValue(_T("controls"), list);
-
-  // Write arc arrows in new OGL format, if there are any.
-  // This is a list of lists. Each sublist comprises:
-  // (arrowType arrowEnd xOffset arrowSize)
-  if (m_arcArrows.GetCount() > 0)
-  {
-    wxExpr *arrow_list = new wxExpr(wxExprList);
-    node = m_arcArrows.GetFirst();
-    while (node)
-    {
-      wxArrowHead *head = (wxArrowHead *)node->GetData();
-      wxExpr *head_list = new wxExpr(wxExprList);
-      head_list->Append(new wxExpr((long)head->_GetType()));
-      head_list->Append(new wxExpr((long)head->GetArrowEnd()));
-      head_list->Append(new wxExpr(head->GetXOffset()));
-      head_list->Append(new wxExpr(head->GetArrowSize()));
-      head_list->Append(new wxExpr(wxExprString, head->GetName()));
-      head_list->Append(new wxExpr(head->GetId()));
-
-      // New members of wxArrowHead
-      head_list->Append(new wxExpr(head->GetYOffset()));
-      head_list->Append(new wxExpr(head->GetSpacing()));
-
-      arrow_list->Append(head_list);
-
-      node = node->GetNext();
-    }
-    clause->AddAttributeValue(_T("arrows"), arrow_list);
-  }
-}
-
-void wxLineShape::ReadAttributes(wxExpr *clause)
-{
-  wxShape::ReadAttributes(clause);
-
-  int iVal = (int) m_isSpline;
-  clause->AssignAttributeValue(wxT("is_spline"), &iVal);
-  m_isSpline = (iVal != 0);
-
-  iVal = (int) m_maintainStraightLines;
-  clause->AssignAttributeValue(wxT("keep_lines_straight"), &iVal);
-  m_maintainStraightLines = (iVal != 0);
-
-  clause->AssignAttributeValue(wxT("align_start"), &m_alignmentStart);
-  clause->AssignAttributeValue(wxT("align_end"), &m_alignmentEnd);
-
-  // Compatibility: check for no regions.
-  if (m_regions.GetCount() == 0)
-  {
-    wxShapeRegion *newRegion = new wxShapeRegion;
-    newRegion->SetName(_T("Middle"));
-    newRegion->SetSize(150, 50);
-    m_regions.Append((wxObject *)newRegion);
-    if (m_text.GetCount() > 0)
-    {
-      newRegion->ClearText();
-      wxNode *node = m_text.GetFirst();
-      while (node)
-      {
-        wxShapeTextLine *textLine = (wxShapeTextLine *)node->GetData();
-        wxNode *next = node->GetNext();
-        newRegion->GetFormattedText().Append((wxObject *)textLine);
-        delete node;
-        node = next;
-      }
-    }
-
-    newRegion = new wxShapeRegion;
-    newRegion->SetName(wxT("Start"));
-    newRegion->SetSize(150, 50);
-    m_regions.Append((wxObject *)newRegion);
-
-    newRegion = new wxShapeRegion;
-    newRegion->SetName(wxT("End"));
-    newRegion->SetSize(150, 50);
-    m_regions.Append((wxObject *)newRegion);
-  }
-
-  m_attachmentTo = 0;
-  m_attachmentFrom = 0;
-
-  clause->AssignAttributeValue(wxT("attachment_to"), &m_attachmentTo);
-  clause->AssignAttributeValue(wxT("attachment_from"), &m_attachmentFrom);
-
-  wxExpr *line_list = NULL;
-
-  // When image is created, there are default control points. Override
-  // them if there are some in the file.
-  clause->AssignAttributeValue(wxT("controls"), &line_list);
-
-  if (line_list)
-  {
-    // Read a list of lists for the spline controls
-    if (m_lineControlPoints)
-    {
-      ClearPointList(*m_lineControlPoints);
-    }
-    else
-      m_lineControlPoints = new wxList;
-
-    wxExpr *node = line_list->value.first;
-
-    while (node)
-    {
-      wxExpr *xexpr = node->value.first;
-      double x = xexpr->RealValue();
-
-      wxExpr *yexpr = xexpr->next;
-      double y = yexpr->RealValue();
-
-      wxRealPoint *point = new wxRealPoint(x, y);
-      m_lineControlPoints->Append((wxObject*) point);
-
-      node = node->next;
-    }
-  }
-
-  // Read arrow list, for new OGL code
-  wxExpr *arrow_list = NULL;
-
-  clause->AssignAttributeValue(wxT("arrows"), &arrow_list);
-  if (arrow_list)
-  {
-    wxExpr *node = arrow_list->value.first;
-
-    while (node)
-    {
-      WXTYPE arrowType = ARROW_ARROW;
-      int arrowEnd = 0;
-      double xOffset = 0.0;
-      double arrowSize = 0.0;
-      wxString arrowName;
-      long arrowId = -1;
-
-      wxExpr *type_expr = node->Nth(0);
-      wxExpr *end_expr = node->Nth(1);
-      wxExpr *dist_expr = node->Nth(2);
-      wxExpr *size_expr = node->Nth(3);
-      wxExpr *name_expr = node->Nth(4);
-      wxExpr *id_expr = node->Nth(5);
-
-      // New members of wxArrowHead
-      wxExpr *yOffsetExpr = node->Nth(6);
-      wxExpr *spacingExpr = node->Nth(7);
-
-      if (type_expr)
-          arrowType = (WXTYPE)type_expr->IntegerValue();
-      if (end_expr)
-        arrowEnd = (int)end_expr->IntegerValue();
-      if (dist_expr)
-        xOffset = dist_expr->RealValue();
-      if (size_expr)
-        arrowSize = size_expr->RealValue();
-      if (name_expr)
-        arrowName = name_expr->StringValue();
-      if (id_expr)
-        arrowId = id_expr->IntegerValue();
-
-      if (arrowId == -1)
-        arrowId = wxNewId();
-      else
-        wxRegisterId(arrowId);
-
-      wxArrowHead *arrowHead = AddArrow(arrowType, arrowEnd, arrowSize, xOffset, arrowName, NULL, arrowId);
-      if (yOffsetExpr)
-        arrowHead->SetYOffset(yOffsetExpr->RealValue());
-      if (spacingExpr)
-        arrowHead->SetSpacing(spacingExpr->RealValue());
-
-      node = node->next;
-    }
-  }
-}
-#endif
-
-void wxLineShape::Copy(wxShape& copy)
-{
-  wxShape::Copy(copy);
-
-  wxASSERT( copy.IsKindOf(CLASSINFO(wxLineShape)) );
-
-  wxLineShape& lineCopy = (wxLineShape&) copy;
-
-  lineCopy.m_to = m_to;
-  lineCopy.m_from = m_from;
-  lineCopy.m_attachmentTo = m_attachmentTo;
-  lineCopy.m_attachmentFrom = m_attachmentFrom;
-  lineCopy.m_isSpline = m_isSpline;
-  lineCopy.m_alignmentStart = m_alignmentStart;
-  lineCopy.m_alignmentEnd = m_alignmentEnd;
-  lineCopy.m_maintainStraightLines = m_maintainStraightLines;
-  lineCopy.m_lineOrientations.Clear();
-
-  wxNode *node = m_lineOrientations.GetFirst();
-  while (node)
-  {
-    lineCopy.m_lineOrientations.Append(node->GetData());
-    node = node->GetNext();
-  }
-
-  if (lineCopy.m_lineControlPoints)
-  {
-    ClearPointList(*lineCopy.m_lineControlPoints);
-    delete lineCopy.m_lineControlPoints;
-  }
-
-  lineCopy.m_lineControlPoints = new wxList;
-
-  node = m_lineControlPoints->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
-    lineCopy.m_lineControlPoints->Append((wxObject*) new_point);
-    node = node->GetNext();
-  }
-
-  // Copy arrows
-  lineCopy.ClearArrowsAtPosition(-1);
-  node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    lineCopy.m_arcArrows.Append(new wxArrowHead(*arrow));
-    node = node->GetNext();
-  }
-}
-
-// Override select, to create/delete temporary label-moving objects
-void wxLineShape::Select(bool select, wxDC* dc)
-{
-  wxShape::Select(select, dc);
-  if (select)
-  {
-    for (int i = 0; i < 3; i++)
-    {
-      wxNode *node = m_regions.Item(i);
-      if (node)
-      {
-        wxShapeRegion *region = (wxShapeRegion *)node->GetData();
-        if (region->m_formattedText.GetCount() > 0)
-        {
-          double w, h, x, y, xx, yy;
-          region->GetSize(&w, &h);
-          region->GetPosition(&x, &y);
-          GetLabelPosition(i, &xx, &yy);
-          if (m_labelObjects[i])
-          {
-            m_labelObjects[i]->Select(false);
-            m_labelObjects[i]->RemoveFromCanvas(m_canvas);
-            delete m_labelObjects[i];
-          }
-          m_labelObjects[i] = OnCreateLabelShape(this, region, w, h);
-          m_labelObjects[i]->AddToCanvas(m_canvas);
-          m_labelObjects[i]->Show(true);
-          if (dc)
-            m_labelObjects[i]->Move(*dc, (double)(x + xx), (double)(y + yy));
-          m_labelObjects[i]->Select(true, dc);
-        }
-      }
-    }
-  }
-  else
-  {
-    for (int i = 0; i < 3; i++)
-    {
-      if (m_labelObjects[i])
-      {
-        m_labelObjects[i]->Select(false, dc);
-        m_labelObjects[i]->Erase(*dc);
-        m_labelObjects[i]->RemoveFromCanvas(m_canvas);
-        delete m_labelObjects[i];
-        m_labelObjects[i] = NULL;
-      }
-    }
-  }
-}
-
-/*
- * Line control point
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxLineControlPoint, wxControlPoint)
-
-wxLineControlPoint::wxLineControlPoint(wxShapeCanvas *theCanvas, wxShape *object, double size, double x, double y, int the_type):
-  wxControlPoint(theCanvas, object, size, x, y, the_type)
-{
-  m_xpos = x;
-  m_ypos = y;
-  m_type = the_type;
-  m_point = NULL;
-}
-
-wxLineControlPoint::~wxLineControlPoint()
-{
-}
-
-void wxLineControlPoint::OnDraw(wxDC& dc)
-{
-  wxRectangleShape::OnDraw(dc);
-}
-
-// Implement movement of Line point
-void wxLineControlPoint::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingDragLeft(this, draw, x, y, keys, attachment);
-}
-
-void wxLineControlPoint::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingBeginDragLeft(this, x, y, keys, attachment);
-}
-
-void wxLineControlPoint::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-    m_shape->GetEventHandler()->OnSizingEndDragLeft(this, x, y, keys, attachment);
-}
-
-// Control points ('handles') redirect control to the actual shape, to make it easier
-// to override sizing behaviour.
-void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  dc.SetLogicalFunction(OGLRBLF);
-
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  if (lpt->m_type == CONTROL_POINT_LINE)
-  {
-    m_canvas->Snap(&x, &y);
-
-    lpt->SetX(x); lpt->SetY(y);
-    lpt->m_point->x = x; lpt->m_point->y = y;
-
-    wxLineShape *lineShape = (wxLineShape *)this;
-
-    const wxPen *old_pen = lineShape->GetPen();
-    const wxBrush *old_brush = lineShape->GetBrush();
-
-    wxPen dottedPen(*wxBLACK, 1, wxDOT);
-    lineShape->SetPen(& dottedPen);
-    lineShape->SetBrush(wxTRANSPARENT_BRUSH);
-
-    lineShape->GetEventHandler()->OnMoveLink(dc, false);
-
-    lineShape->SetPen(old_pen);
-    lineShape->SetBrush(old_brush);
-  }
-
-  if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM || lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-//    lpt->SetX(x); lpt->SetY(y);
-  }
-
-}
-
-void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  wxLineShape *lineShape = (wxLineShape *)this;
-  if (lpt->m_type == CONTROL_POINT_LINE)
-  {
-    lpt->m_originalPos = * (lpt->m_point);
-    m_canvas->Snap(&x, &y);
-
-    this->Erase(dc);
-
-    // Redraw start and end objects because we've left holes
-    // when erasing the line
-    lineShape->GetFrom()->OnDraw(dc);
-    lineShape->GetFrom()->OnDrawContents(dc);
-    lineShape->GetTo()->OnDraw(dc);
-    lineShape->GetTo()->OnDrawContents(dc);
-
-    this->SetDisableLabel(true);
-    dc.SetLogicalFunction(OGLRBLF);
-
-    lpt->m_xpos = x; lpt->m_ypos = y;
-    lpt->m_point->x = x; lpt->m_point->y = y;
-
-    const wxPen *old_pen = lineShape->GetPen();
-    const wxBrush *old_brush = lineShape->GetBrush();
-
-    wxPen dottedPen(*wxBLACK, 1, wxDOT);
-    lineShape->SetPen(& dottedPen);
-    lineShape->SetBrush(wxTRANSPARENT_BRUSH);
-
-    lineShape->GetEventHandler()->OnMoveLink(dc, false);
-
-    lineShape->SetPen(old_pen);
-    lineShape->SetBrush(old_brush);
-  }
-
-  if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM || lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-    m_canvas->SetCursor(wxCursor(wxCURSOR_BULLSEYE));
-    lpt->m_oldCursor = wxSTANDARD_CURSOR;
-  }
-}
-
-void wxLineShape::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))
-{
-  wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
-
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  this->SetDisableLabel(false);
-  wxLineShape *lineShape = (wxLineShape *)this;
-
-  if (lpt->m_type == CONTROL_POINT_LINE)
-  {
-    m_canvas->Snap(&x, &y);
-
-    wxRealPoint pt = wxRealPoint(x, y);
-
-    // Move the control point back to where it was;
-    // MoveControlPoint will move it to the new position
-    // if it decides it wants. We only moved the position
-    // during user feedback so we could redraw the line
-    // as it changed shape.
-    lpt->m_xpos = lpt->m_originalPos.x; lpt->m_ypos = lpt->m_originalPos.y;
-    lpt->m_point->x = lpt->m_originalPos.x; lpt->m_point->y = lpt->m_originalPos.y;
-
-    OnMoveMiddleControlPoint(dc, lpt, pt);
-  }
-  if (lpt->m_type == CONTROL_POINT_ENDPOINT_FROM)
-  {
-    if (lpt->m_oldCursor)
-      m_canvas->SetCursor(* lpt->m_oldCursor);
-
-//    this->Erase(dc);
-
-//    lpt->m_xpos = x; lpt->m_ypos = y;
-
-    if (lineShape->GetFrom())
-    {
-      lineShape->GetFrom()->MoveLineToNewAttachment(dc, lineShape, x, y);
-    }
-  }
-  if (lpt->m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-    if (lpt->m_oldCursor)
-      m_canvas->SetCursor(* lpt->m_oldCursor);
-
-//    lpt->m_xpos = x; lpt->m_ypos = y;
-
-    if (lineShape->GetTo())
-    {
-      lineShape->GetTo()->MoveLineToNewAttachment(dc, lineShape, x, y);
-    }
-  }
-
-  // Needed?
-#if 0
-  int i = 0;
-  for (i = 0; i < lineShape->GetLineControlPoints()->GetCount(); i++)
-    if (((wxRealPoint *)(lineShape->GetLineControlPoints()->Item(i)->GetData())) == lpt->m_point)
-      break;
-
-  // N.B. in OnMoveControlPoint, an event handler in Hardy could have deselected
-  // the line and therefore deleted 'this'. -> GPF, intermittently.
-  // So assume at this point that we've been blown away.
-
-  lineShape->OnMoveControlPoint(i+1, x, y);
-#endif
-}
-
-// This is called only when a non-end control point is moved.
-bool wxLineShape::OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt)
-{
-    lpt->m_xpos = pt.x; lpt->m_ypos = pt.y;
-    lpt->m_point->x = pt.x; lpt->m_point->y = pt.y;
-
-    GetEventHandler()->OnMoveLink(dc);
-
-    return true;
-}
-
-// Implement movement of endpoint to a new attachment
-// OBSOLETE: done by dragging with the left button.
-
-#if 0
-void wxLineControlPoint::OnDragRight(bool draw, double x, double y, int keys, int attachment)
-{
-  if (m_type == CONTROL_POINT_ENDPOINT_FROM || m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-    m_xpos = x; m_ypos = y;
-  }
-}
-
-void wxLineControlPoint::OnBeginDragRight(double x, double y, int keys, int attachment)
-{
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  wxLineShape *lineShape = (wxLineShape *)m_shape;
-  if (m_type == CONTROL_POINT_ENDPOINT_FROM || m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-    Erase(dc);
-    lineShape->GetEventHandler()->OnDraw(dc);
-    if (m_type == CONTROL_POINT_ENDPOINT_FROM)
-    {
-      lineShape->GetFrom()->GetEventHandler()->OnDraw(dc);
-      lineShape->GetFrom()->GetEventHandler()->OnDrawContents(dc);
-    }
-    else
-    {
-      lineShape->GetTo()->GetEventHandler()->OnDraw(dc);
-      lineShape->GetTo()->GetEventHandler()->OnDrawContents(dc);
-    }
-    m_canvas->SetCursor(wxCursor(wxCURSOR_BULLSEYE));
-    m_oldCursor = wxSTANDARD_CURSOR;
-  }
-}
-
-void wxLineControlPoint::OnEndDragRight(double x, double y, int keys, int attachment)
-{
-  wxClientDC dc(GetCanvas());
-  GetCanvas()->PrepareDC(dc);
-
-  wxLineShape *lineShape = (wxLineShape *)m_shape;
-  if (m_type == CONTROL_POINT_ENDPOINT_FROM)
-  {
-    if (m_oldCursor)
-      m_canvas->SetCursor(m_oldCursor);
-
-    m_xpos = x; m_ypos = y;
-
-    if (lineShape->GetFrom())
-    {
-      lineShape->GetFrom()->EraseLinks(dc);
-
-      int new_attachment;
-      double distance;
-
-      if (lineShape->GetFrom()->HitTest(x, y, &new_attachment, &distance))
-        lineShape->SetAttachments(new_attachment, lineShape->GetAttachmentTo());
-
-      lineShape->GetFrom()->MoveLinks(dc);
-    }
-  }
-  if (m_type == CONTROL_POINT_ENDPOINT_TO)
-  {
-    if (m_oldCursor)
-      m_canvas->SetCursor(m_oldCursor);
-    m_shape->Erase(dc);
-
-    m_xpos = x; m_ypos = y;
-
-    if (lineShape->GetTo())
-    {
-      lineShape->GetTo()->EraseLinks(dc);
-
-      int new_attachment;
-      double distance;
-      if (lineShape->GetTo()->HitTest(x, y, &new_attachment, &distance))
-        lineShape->SetAttachments(lineShape->GetAttachmentFrom(), new_attachment);
-
-      lineShape->GetTo()->MoveLinks(dc);
-    }
-  }
-  int i = 0;
-  for (i = 0; i < lineShape->GetLineControlPoints()->GetCount(); i++)
-    if (((wxRealPoint *)(lineShape->GetLineControlPoints()->Item(i)->GetData())) == m_point)
-      break;
-  lineShape->OnMoveControlPoint(i+1, x, y);
-  if (!m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
-}
-#endif
-
-/*
- * Get the point on the given line (x1, y1) (x2, y2)
- * distance 'length' along from the end,
- * returned values in x and y
- */
-
-void GetPointOnLine(double x1, double y1, double x2, double y2,
-                    double length, double *x, double *y)
-{
-  double l = (double)sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-
-  if (l < 0.01)
-    l = (double) 0.01;
-
-  double i_bar = (x2 - x1)/l;
-  double j_bar = (y2 - y1)/l;
-
-  *x = (- length*i_bar) + x2;
-  *y = (- length*j_bar) + y2;
-}
-
-wxArrowHead *wxLineShape::AddArrow(WXTYPE type, int end, double size, double xOffset,
-    const wxString& name, wxPseudoMetaFile *mf, long arrowId)
-{
-  wxArrowHead *arrow = new wxArrowHead(type, end, size, xOffset, name, mf, arrowId);
-  m_arcArrows.Append(arrow);
-  return arrow;
-}
-
-/*
- * Add arrowhead at a particular position in the arrowhead list.
- */
-bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end)
-{
-  wxNode *refNode = referenceList.GetFirst();
-  wxNode *currNode = m_arcArrows.GetFirst();
-  wxString targetName(arrow->GetName());
-  if (!refNode) return false;
-
-  // First check whether we need to insert in front of list,
-  // because this arrowhead is the first in the reference
-  // list and should therefore be first in the current list.
-  wxArrowHead *refArrow = (wxArrowHead *)refNode->GetData();
-  if (refArrow->GetName() == targetName)
-  {
-    m_arcArrows.Insert(arrow);
-    return true;
-  }
-
-  wxArrowHead *currArrow = (wxArrowHead *)currNode->GetData();
-  while (refNode && currNode)
-  {
-    refArrow = (wxArrowHead *)refNode->GetData();
-
-    // Matching: advance current arrow pointer
-    if ((currArrow->GetArrowEnd() == end) &&
-        (currArrow->GetName() == refArrow->GetName()))
-    {
-      currNode = currNode->GetNext(); // Could be NULL now
-      if (currNode)
-        currArrow = (wxArrowHead *)currNode->GetData();
-    }
-
-    // Check if we're at the correct position in the
-    // reference list
-    if (targetName == refArrow->GetName())
-    {
-      if (currNode)
-        m_arcArrows.Insert(currNode, arrow);
-      else
-        m_arcArrows.Append(arrow);
-      return true;
-    }
-    refNode = refNode->GetNext();
-  }
-  m_arcArrows.Append(arrow);
-  return true;
-}
-
-void wxLineShape::ClearArrowsAtPosition(int end)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    wxNode *next = node->GetNext();
-    switch (end)
-    {
-      case -1:
-      {
-        delete arrow;
-        delete node;
-        break;
-      }
-      case ARROW_POSITION_START:
-      {
-        if (arrow->GetArrowEnd() == ARROW_POSITION_START)
-        {
-          delete arrow;
-          delete node;
-        }
-        break;
-      }
-      case ARROW_POSITION_END:
-      {
-        if (arrow->GetArrowEnd() == ARROW_POSITION_END)
-        {
-          delete arrow;
-          delete node;
-        }
-        break;
-      }
-      case ARROW_POSITION_MIDDLE:
-      {
-        if (arrow->GetArrowEnd() == ARROW_POSITION_MIDDLE)
-        {
-          delete arrow;
-          delete node;
-        }
-        break;
-      }
-    }
-    node = next;
-  }
-}
-
-bool wxLineShape::ClearArrow(const wxString& name)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    if (arrow->GetName() == name)
-    {
-      delete arrow;
-      delete node;
-      return true;
-    }
-    node = node->GetNext();
-  }
-  return false;
-}
-
-/*
- * Finds an arrowhead at the given position (if -1, any position)
- *
- */
-
-wxArrowHead *wxLineShape::FindArrowHead(int position, const wxString& name)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    if (((position == -1) || (position == arrow->GetArrowEnd())) &&
-        (arrow->GetName() == name))
-      return arrow;
-    node = node->GetNext();
-  }
-  return NULL;
-}
-
-wxArrowHead *wxLineShape::FindArrowHead(long arrowId)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    if (arrowId == arrow->GetId())
-      return arrow;
-    node = node->GetNext();
-  }
-  return NULL;
-}
-
-/*
- * Deletes an arrowhead at the given position (if -1, any position)
- *
- */
-
-bool wxLineShape::DeleteArrowHead(int position, const wxString& name)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    if (((position == -1) || (position == arrow->GetArrowEnd())) &&
-        (arrow->GetName() == name))
-    {
-      delete arrow;
-      delete node;
-      return true;
-    }
-    node = node->GetNext();
-  }
-  return false;
-}
-
-// Overloaded DeleteArrowHead: pass arrowhead id.
-bool wxLineShape::DeleteArrowHead(long id)
-{
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrow = (wxArrowHead *)node->GetData();
-    if (arrow->GetId() == id)
-    {
-      delete arrow;
-      delete node;
-      return true;
-    }
-    node = node->GetNext();
-  }
-  return false;
-}
-
-/*
- * Calculate the minimum width a line
- * occupies, for the purposes of drawing lines in tools.
- *
- */
-
-double wxLineShape::FindMinimumWidth()
-{
-  double minWidth = 0.0;
-  wxNode *node = m_arcArrows.GetFirst();
-  while (node)
-  {
-    wxArrowHead *arrowHead = (wxArrowHead *)node->GetData();
-    minWidth += arrowHead->GetSize();
-    if (node->GetNext())
-      minWidth += arrowHead->GetSpacing();
-
-    node = node->GetNext();
-  }
-  // We have ABSOLUTE minimum now. So
-  // scale it to give it reasonable aesthetics
-  // when drawing with line.
-  if (minWidth > 0.0)
-    minWidth = (double)(minWidth * 1.4);
-  else
-    minWidth = 20.0;
-
-  SetEnds(0.0, 0.0, minWidth, 0.0);
-  Initialise();
-
-  return minWidth;
-}
-
-// Find which position we're talking about at this (x, y).
-// Returns ARROW_POSITION_START, ARROW_POSITION_MIDDLE, ARROW_POSITION_END
-int wxLineShape::FindLinePosition(double x, double y)
-{
-  double startX, startY, endX, endY;
-  GetEnds(&startX, &startY, &endX, &endY);
-
-  // Find distances from centre, start and end. The smallest wins.
-  double centreDistance = (double)(sqrt((x - m_xpos)*(x - m_xpos) + (y - m_ypos)*(y - m_ypos)));
-  double startDistance = (double)(sqrt((x - startX)*(x - startX) + (y - startY)*(y - startY)));
-  double endDistance = (double)(sqrt((x - endX)*(x - endX) + (y - endY)*(y - endY)));
-
-  if (centreDistance < startDistance && centreDistance < endDistance)
-    return ARROW_POSITION_MIDDLE;
-  else if (startDistance < endDistance)
-    return ARROW_POSITION_START;
-  else
-    return ARROW_POSITION_END;
-}
-
-// Set alignment flags
-void wxLineShape::SetAlignmentOrientation(bool isEnd, bool isHoriz)
-{
-  if (isEnd)
-  {
-    if (isHoriz && ((m_alignmentEnd & LINE_ALIGNMENT_HORIZ) != LINE_ALIGNMENT_HORIZ))
-      m_alignmentEnd |= LINE_ALIGNMENT_HORIZ;
-    else if (!isHoriz && ((m_alignmentEnd & LINE_ALIGNMENT_HORIZ) == LINE_ALIGNMENT_HORIZ))
-      m_alignmentEnd -= LINE_ALIGNMENT_HORIZ;
-  }
-  else
-  {
-    if (isHoriz && ((m_alignmentStart & LINE_ALIGNMENT_HORIZ) != LINE_ALIGNMENT_HORIZ))
-      m_alignmentStart |= LINE_ALIGNMENT_HORIZ;
-    else if (!isHoriz && ((m_alignmentStart & LINE_ALIGNMENT_HORIZ) == LINE_ALIGNMENT_HORIZ))
-      m_alignmentStart -= LINE_ALIGNMENT_HORIZ;
-  }
-}
-
-void wxLineShape::SetAlignmentType(bool isEnd, int alignType)
-{
-  if (isEnd)
-  {
-    if (alignType == LINE_ALIGNMENT_TO_NEXT_HANDLE)
-    {
-      if ((m_alignmentEnd & LINE_ALIGNMENT_TO_NEXT_HANDLE) != LINE_ALIGNMENT_TO_NEXT_HANDLE)
-        m_alignmentEnd |= LINE_ALIGNMENT_TO_NEXT_HANDLE;
-    }
-    else if ((m_alignmentEnd & LINE_ALIGNMENT_TO_NEXT_HANDLE) == LINE_ALIGNMENT_TO_NEXT_HANDLE)
-      m_alignmentEnd -= LINE_ALIGNMENT_TO_NEXT_HANDLE;
-  }
-  else
-  {
-    if (alignType == LINE_ALIGNMENT_TO_NEXT_HANDLE)
-    {
-      if ((m_alignmentStart & LINE_ALIGNMENT_TO_NEXT_HANDLE) != LINE_ALIGNMENT_TO_NEXT_HANDLE)
-        m_alignmentStart |= LINE_ALIGNMENT_TO_NEXT_HANDLE;
-    }
-    else if ((m_alignmentStart & LINE_ALIGNMENT_TO_NEXT_HANDLE) == LINE_ALIGNMENT_TO_NEXT_HANDLE)
-      m_alignmentStart -= LINE_ALIGNMENT_TO_NEXT_HANDLE;
-  }
-}
-
-bool wxLineShape::GetAlignmentOrientation(bool isEnd)
-{
-  if (isEnd)
-    return ((m_alignmentEnd & LINE_ALIGNMENT_HORIZ) == LINE_ALIGNMENT_HORIZ);
-  else
-    return ((m_alignmentStart & LINE_ALIGNMENT_HORIZ) == LINE_ALIGNMENT_HORIZ);
-}
-
-int wxLineShape::GetAlignmentType(bool isEnd)
-{
-  if (isEnd)
-    return (m_alignmentEnd & LINE_ALIGNMENT_TO_NEXT_HANDLE);
-  else
-    return (m_alignmentStart & LINE_ALIGNMENT_TO_NEXT_HANDLE);
-}
-
-wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
-{
-  int n = m_lineControlPoints->GetCount();
-  int nn;
-  if (m_to == nodeObject)
-  {
-    // Must be END of line, so we want (n - 1)th control point.
-    // But indexing ends at n-1, so subtract 2.
-    nn = n - 2;
-  }
-  else nn = 1;
-  wxNode *node = m_lineControlPoints->Item(nn);
-  if (node)
-  {
-    return (wxRealPoint *)node->GetData();
-  }
-  else
-    return NULL;
-}
-
-/*
- * Arrowhead
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxArrowHead, wxObject)
-
-wxArrowHead::wxArrowHead(WXTYPE type, int end, double size, double dist, const wxString& name,
-                     wxPseudoMetaFile *mf, long arrowId)
-{
-  m_arrowType = type; m_arrowEnd = end; m_arrowSize = size;
-  m_xOffset = dist;
-  m_yOffset = 0.0;
-  m_spacing = 5.0;
-
-  m_arrowName = name;
-  m_metaFile = mf;
-  m_id = arrowId;
-  if (m_id == -1)
-    m_id = wxNewId();
-}
-
-wxArrowHead::wxArrowHead(wxArrowHead& toCopy):wxObject()
-{
-  m_arrowType = toCopy.m_arrowType; m_arrowEnd = toCopy.GetArrowEnd();
-  m_arrowSize = toCopy.m_arrowSize;
-  m_xOffset = toCopy.m_xOffset;
-  m_yOffset = toCopy.m_yOffset;
-  m_spacing = toCopy.m_spacing;
-  m_arrowName = toCopy.m_arrowName ;
-  if (toCopy.m_metaFile)
-    m_metaFile = new wxPseudoMetaFile(*(toCopy.m_metaFile));
-  else
-    m_metaFile = NULL;
-  m_id = wxNewId();
-}
-
-wxArrowHead::~wxArrowHead()
-{
-  if (m_metaFile) delete m_metaFile;
-}
-
-void wxArrowHead::SetSize(double size)
-{
-  m_arrowSize = size;
-  if ((m_arrowType == ARROW_METAFILE) && m_metaFile)
-  {
-    double oldWidth = m_metaFile->m_width;
-    if (oldWidth == 0.0)
-      return;
-
-    double scale = (double)(size/oldWidth);
-    if (scale != 1.0)
-      m_metaFile->Scale(scale, scale);
-  }
-}
-
-// Can override this to create a different class of label shape
-wxLabelShape* wxLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
-{
-    return new wxLabelShape(parent, region, w, h);
-}
-
-/*
- * Label object
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxLabelShape, wxRectangleShape)
-
-wxLabelShape::wxLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h):wxRectangleShape(w, h)
-{
-  m_lineShape = parent;
-  m_shapeRegion = region;
-  SetPen(wxThePenList->FindOrCreatePen(*wxBLACK, 1, wxDOT));
-}
-
-wxLabelShape::~wxLabelShape()
-{
-}
-
-void wxLabelShape::OnDraw(wxDC& dc)
-{
-  if (m_lineShape && !m_lineShape->GetDrawHandles())
-    return;
-
-    double x1 = (double)(m_xpos - m_width/2.0);
-    double y1 = (double)(m_ypos - m_height/2.0);
-
-    if (m_pen)
-    {
-      if (m_pen->GetWidth() == 0)
-        dc.SetPen(* g_oglTransparentPen);
-      else
-        dc.SetPen(* m_pen);
-    }
-    dc.SetBrush(* wxTRANSPARENT_BRUSH);
-
-    if (m_cornerRadius > 0.0)
-      dc.DrawRoundedRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height), m_cornerRadius);
-    else
-      dc.DrawRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height));
-}
-
-void wxLabelShape::OnDrawContents(wxDC& WXUNUSED(dc))
-{
-}
-
-void wxLabelShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
-{
-  wxRectangleShape::OnDragLeft(draw, x, y, keys, attachment);
-}
-
-void wxLabelShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
-{
-  wxRectangleShape::OnBeginDragLeft(x, y, keys, attachment);
-}
-
-void wxLabelShape::OnEndDragLeft(double x, double y, int keys, int attachment)
-{
-  wxRectangleShape::OnEndDragLeft(x, y, keys, attachment);
-}
-
-bool wxLabelShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
-{
-    return m_lineShape->OnLabelMovePre(dc, this, x, y, old_x, old_y, display);
-}
-
-bool wxLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
-{
-  labelShape->m_shapeRegion->SetSize(labelShape->GetWidth(), labelShape->GetHeight());
-
-  // Find position in line's region list
-  int i = 0;
-  wxNode *node = GetRegions().GetFirst();
-  while (node)
-  {
-    if (labelShape->m_shapeRegion == (wxShapeRegion *)node->GetData())
-      node = NULL;
-    else
-    {
-      node = node->GetNext();
-      i ++;
-    }
-  }
-  double xx, yy;
-  GetLabelPosition(i, &xx, &yy);
-  // Set the region's offset, relative to the default position for
-  // each region.
-  labelShape->m_shapeRegion->SetPosition((double)(x - xx), (double)(y - yy));
-
-  labelShape->SetX(x);
-  labelShape->SetY(y);
-
-  // Need to reformat to fit region.
-  if (labelShape->m_shapeRegion->GetText())
-  {
-
-    wxString s(labelShape->m_shapeRegion->GetText());
-    labelShape->FormatText(dc, s, i);
-    DrawRegion(dc, labelShape->m_shapeRegion, xx, yy);
-  }
-  return true;
-}
-
-// Divert left and right clicks to line object
-void wxLabelShape::OnLeftClick(double x, double y, int keys, int attachment)
-{
-  m_lineShape->GetEventHandler()->OnLeftClick(x, y, keys, attachment);
-}
-
-void wxLabelShape::OnRightClick(double x, double y, int keys, int attachment)
-{
-  m_lineShape->GetEventHandler()->OnRightClick(x, y, keys, attachment);
-}
diff --git a/contrib/src/ogl/makedocs.vc b/contrib/src/ogl/makedocs.vc
deleted file mode 100644
index 6b971b3dbe..0000000000
--- a/contrib/src/ogl/makedocs.vc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# File:         makefile.vc
-WXDIR=$(WXWIN)
-
-NAME=ogl
-DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME)
-DOCDIR=$(WXDIR)\docs
-THISDIR = $(WXDIR)\contrib\src\$(NAME)
-DOCSOURCES=$(DOCSOURCEDIR)\$(NAME).tex \
- $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
-
-alldocs: mkdirs html htmlhelp htb hlp pdfrtf
-html: touchmanual $(DOCDIR)\html\$(NAME)\$(NAME).htm
-htmlhelp: touchmanual $(DOCDIR)\htmlhelp\$(NAME).chm
-htb:	$(DOCDIR)\htb\$(NAME).htb
-hlp: touchmanual $(DOCDIR)\winhelp\$(NAME).hlp
-pdfrtf: $(DOCDIR)\pdf\$(NAME).rtf
-ps: $(DOCDIR)\ps\$(NAME).ps
-
-touchmanual:
-	touch $(DOCSOURCEDIR)\$(NAME).tex
-
-$(DOCDIR)\winhelp\$(NAME).hlp:         $(DOCSOURCEDIR)\$(NAME).rtf $(DOCSOURCEDIR)\$(NAME).hpj
-        cd $(DOCSOURCEDIR)
-        -erase $(NAME).ph
-        hcw /c /e $(NAME)
-        move $(NAME).hlp $(DOCDIR)\winhelp\$(NAME).hlp
-        move $(NAME).cnt $(DOCDIR)\winhelp\$(NAME).cnt
-        cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).hpj:
-	echo [OPTIONS] > $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BMROOT=$(WXDIR)\contrib\docs\latex\$(NAME) >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo TITLE=OGL Manual >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CONTENTS=Contents >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo COMPRESS=HIGH >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [FILES] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo $(NAME).rtf >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [CONFIG] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo CreateButton("Up", "&Up", "JumpId(`$(NAME).hlp', `Contents')") >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo BrowseButtons() >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [MAP] >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo "" >> $(DOCSOURCEDIR)\$(NAME).hpj
-	echo [BITMAPS] >> $(DOCSOURCEDIR)\$(NAME).hpj
-
-$(DOCSOURCEDIR)\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCSOURCEDIR)\$(NAME).rtf -twice -winhelp
-        cd $(THISDIR)
-
-$(DOCDIR)\pdf\$(NAME).rtf: $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\pdf\$(NAME).rtf -twice -rtf
-        cd $(THISDIR)
-
-$(DOCDIR)\html\$(NAME)\$(NAME).htm:         $(DOCSOURCES)
-        cd $(DOCSOURCEDIR)
-        -mkdir $(DOCDIR)\html\$(NAME)
-        copy *.gif $(DOCDIR)\html\$(NAME)
-        -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\$(NAME).tex $(DOCDIR)\html\$(NAME)\$(NAME).htm -twice -html
-        -erase $(DOCDIR)\html\$(NAME)\*.con
-        -erase *.con
-        -erase $(DOCDIR)\html\$(NAME)\*.ref
-        cd $(THISDIR)
-
-$(DOCDIR)\htmlhelp\$(NAME).chm: $(DOCDIR)\html\$(NAME)\$(NAME).htm $(DOCDIR)\html\$(NAME)\$(NAME).hhp
-	cd $(DOCDIR)\html\$(NAME)
-	-hhc $(NAME).hhp
-    -erase $(DOCDIR)\htmlhelp\$(NAME).chm
-    move $(NAME).chm $(DOCDIR)\htmlhelp\$(NAME).chm
-	cd $(THISDIR)
-
-# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
-# files, renamed to htb.
-# This can then be used with e.g. helpview.
-# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\$(NAME).htb: $(DOCDIR)\html\$(NAME)\$(NAME).htm
-	cd $(DOCDIR)\html\$(NAME)
-    -erase $(NAME).zip $(NAME).htb
-    zip $(NAME).zip *.htm *.gif *.hhp *.hhc *.hhk
-    -mkdir $(DOCDIR)\htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    -erase $(DOCDIR)\htb\$(NAME).htb
-    move $(NAME).zip $(DOCDIR)\htb\$(NAME).htb
-    cd $(THISDIR)
-
-$(DOCSOURCEDIR)\$(NAME).dvi:	$(DOCSOURCES)
-	cd $(DOCSOURCEDIR)
-        -latex $(NAME)
-        -latex $(NAME)
-        -makeindx $(NAME)
-        -bibtex $(NAME)
-        -latex $(NAME)
-        -latex $(NAME)
-        cd $(THISDIR)
-
-$(WXDIR)\docs\ps\$(NAME).ps:	$(DOCSOURCEDIR)\$(NAME).dvi
-	cd $(DOCSOURCEDIR)
-        -dvips32 -o $(NAME).ps $(NAME)
-        move $(NAME).ps $(WXDIR)\docs\ps\$(NAME).ps
-        cd $(THISDIR)
-
diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
deleted file mode 100644
index 9a103bedde..0000000000
--- a/contrib/src/ogl/mfutils.cpp
+++ /dev/null
@@ -1,1083 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        mfutils.cpp
-// Purpose:     Metafile utillities
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/metafile.h"
-#include "wx/utils.h"
-
-#include "wx/ogl/ogl.h"
-
-#include <stdio.h>
-
-static char _buf[1024]; // a temp buffer to use inplace of wxBuffer, which is deprecated.
-
-// 16-bit unsigned integer
-static unsigned int getshort(FILE *fp)
-{
-  int c, c1;
-  c = getc(fp);  c1 = getc(fp);
-  unsigned int res = ((unsigned int) c) + (((unsigned int) c1) << 8);
-  return res;
-}
-
-// 16-bit signed integer
-static int getsignedshort(FILE *fp)
-{
-  int c, c1;
-  c = getc(fp);  c1 = getc(fp);
-#if 0
-   // this is not used value, no need to execute it
-  int testRes = ((unsigned int) c) + (((unsigned int) c1) << 8);
-#endif
-  unsigned long res1 = ((unsigned int) c) + (((unsigned int) c1) << 8);
-  int res;
-  if (res1 > 32767)
-    res = (int)(res1 - 65536);
-  else
-    res = (int)(res1);
-  return res;
-}
-
-// 32-bit integer
-static long getint(FILE *fp)
-{
-  int c, c1, c2, c3;
-  c = getc(fp);  c1 = getc(fp);  c2 = getc(fp);  c3 = getc(fp);
-  long res = (long)((long) c) +
-         (((long) c1) << 8) +
-         (((long) c2) << 16) +
-         (((long) c3) << 24);
-  return res;
-}
-
-
-/* Placeable metafile header
-struct mfPLACEABLEHEADER {
-    DWORD  key;         // 32-bit
-    HANDLE hmf;         // 16-bit
-    RECT   bbox;        // 4x16 bit
-    WORD   inch;        // 16-bit
-    DWORD  reserved;    // 32-bit
-    WORD   checksum;    // 16-bit
-};
-*/
-
-wxMetaRecord::~wxMetaRecord(void)
-{
-  if (points) delete[] points;
-  if (stringParam) delete[] stringParam;
-}
-
-wxXMetaFile::wxXMetaFile(const wxChar *file)
-{
-  ok = false;
-  top = 0.0;
-  bottom = 0.0;
-  left = 0.0;
-  right = 0.0;
-
-  if (file)
-    ok = ReadFile(file);
-}
-
-/*
-  Handle table       gdiObjects
-  ------------       ----------
-  [0]                  wxPen
-  [1]----param2---     wxBrush
-  [2]             |    wxFont
-  [3]             | -> wxPen
-
- The handle table works as follows.
- When a GDI object is created while reading in the
- metafile, the (e.g.) createpen record is added to the
- first free entry in the handle table. The createpen
- record's param1 is a pointer to the actual wxPen, and
- its param2 is the index into the gdiObjects list, which only
- grows and never shrinks (unlike the handle table.)
-
- When SelectObject(index) is found, the index in the file
- refers to the position in the handle table. BUT we then
- set param2 to be the position of the wxPen in gdiObjects,
- i.e. to param2 of the CreatePen record, itself found in
- the handle table.
-
- When an object is deleted, the entry in the handletable is
- NULLed but the gdiObjects entry is not removed (no point, and
- allows us to create all GDI objects in advance of playing the
- metafile).
-*/
-
-
-static wxMetaRecord *HandleTable[100];
-static int HandleTableSize = 0;
-
-void DeleteMetaRecordHandle(int index)
-{
-  HandleTable[index] = NULL;
-}
-
-int AddMetaRecordHandle(wxMetaRecord *record)
-{
-  for (int i = 0; i < HandleTableSize; i++)
-    if (!HandleTable[i])
-    {
-      HandleTable[i] = record;
-      return i;
-    }
-  // No free spaces in table, so append.
-
-  HandleTable[HandleTableSize] = record;
-  HandleTableSize ++;
-  return (HandleTableSize - 1);
-}
-
-bool wxXMetaFile::ReadFile(const wxChar *file)
-{
-  HandleTableSize = 0;
-
-  FILE *handle = wxFopen(file, wxT("rb"));
-  if (!handle) return false;
-
-  // Read placeable metafile header, if any
-  long key = getint(handle);
-
-  if (key == (long) 0x9AC6CDD7)
-  {
-    /* long hmf = */ getshort(handle);
-    int iLeft, iTop, iRight, iBottom;
-    iLeft = getsignedshort(handle);
-    iTop = getsignedshort(handle);
-    iRight = getsignedshort(handle);
-    iBottom = getsignedshort(handle);
-
-    left = (double)iLeft;
-    top = (double)iTop;
-    right = (double)iRight;
-    bottom = (double)iBottom;
-
-    /* int inch = */ getshort(handle);
-    /* long reserved = */ getint(handle);
-    /* int checksum = */ getshort(handle);
-/*
-      double widthInUnits = (double)right - left;
-      double heightInUnits = (double)bottom - top;
-      *width = (int)((widthInUnits*1440.0)/inch);
-      *height = (int)((heightInUnits*1440.0)/inch);
-*/
-  }
-  else rewind(handle);
-
-  // Read METAHEADER
-  int mtType = getshort(handle);
-
-  if (mtType != 1 && mtType != 2)
-  {
-    fclose(handle);
-    return false;
-  }
-
-  /* int mtHeaderSize = */ getshort(handle);
-  int mtVersion = getshort(handle);
-
-  if (mtVersion != 0x0300 && mtVersion != 0x0100)
-  {
-    fclose(handle);
-    return false;
-  }
-
-  /* long mtSize = */ getint(handle);
-  /* int mtNoObjects = */ getshort(handle);
-  /* long mtMaxRecord = */ getint(handle);
-  /* int mtNoParameters = */ getshort(handle);
-
-  while (!feof(handle))
-  {
-    long rdSize = getint(handle);      // 4 bytes
-    int rdFunction = getshort(handle); // 2 bytes
-    if (feof(handle))
-      break;
-
-    switch (rdFunction)
-    {
-      case META_SETBKCOLOR:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETBKCOLOR);
-        long colorref = getint(handle); // COLORREF
-        rec->param1 = GetRValue(colorref);
-        rec->param2 = GetGValue(colorref);
-        rec->param3 = GetBValue(colorref);
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_SETBKMODE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETBKMODE);
-        rec->param1 = getshort(handle); // Background mode
-        if (rec->param1 == OPAQUE) rec->param1 = wxSOLID;
-        else rec->param1 = wxTRANSPARENT;
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_SETMAPMODE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETMAPMODE);
-        rec->param1 = getshort(handle);
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_SETROP2:
-//      case META_SETRELABS:
-//      case META_SETPOLYFILLMODE:
-//      case META_SETSTRETCHBLTMODE:
-//      case META_SETTEXTCHAREXTRA:
-      case META_SETTEXTCOLOR:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETTEXTCOLOR);
-        long colorref = getint(handle); // COLORREF
-        rec->param1 = GetRValue(colorref);
-        rec->param2 = GetGValue(colorref);
-        rec->param3 = GetBValue(colorref);
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_SETTEXTJUSTIFICATION:
-      case META_SETWINDOWORG:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETWINDOWORG);
-        rec->param2 = getshort(handle);
-        rec->param1 = getshort(handle);
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_SETWINDOWEXT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETWINDOWEXT);
-        rec->param2 = getshort(handle);
-        rec->param1 = getshort(handle);
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_SETVIEWPORTORG:
-//      case META_SETVIEWPORTEXT:
-//      case META_OFFSETWINDOWORG:
-//      case META_SCALEWINDOWEXT:
-//      case META_OFFSETVIEWPORTORG:
-//      case META_SCALEVIEWPORTEXT:
-      case META_LINETO:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_LINETO);
-        rec->param1 = getshort(handle); // x1
-        rec->param2 = getshort(handle); // y1
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_MOVETO:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_MOVETO);
-        rec->param1 = getshort(handle); // x1
-        rec->param2 = getshort(handle); // y1
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_EXCLUDECLIPRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_EXCLUDECLIPRECT);
-        rec->param4 = getshort(handle); // y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_INTERSECTCLIPRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_INTERSECTCLIPRECT);
-        rec->param4 = getshort(handle); // y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_ARC: // DO!!!
-      case META_ELLIPSE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_ELLIPSE);
-        rec->param4 = getshort(handle); // y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_FLOODFILL:
-//      case META_PIE: // DO!!!
-      case META_RECTANGLE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_RECTANGLE);
-        rec->param4 = getshort(handle); // y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_ROUNDRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_ROUNDRECT);
-        rec->param6 = getshort(handle); // width
-        rec->param5 = getshort(handle); // height
-        rec->param4 = getshort(handle); // y2
-        rec->param3 = getshort(handle); // x2
-        rec->param2 = getshort(handle); // y1
-        rec->param1 = getshort(handle); // x1
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_PATBLT:
-//      case META_SAVEDC:
-      case META_SETPIXEL:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SETPIXEL);
-        rec->param1 = getshort(handle); // x1
-        rec->param2 = getshort(handle); // y1
-        rec->param3 = getint(handle);   // COLORREF
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_OFFSETCLIPRGN:
-      case META_TEXTOUT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_TEXTOUT);
-        int count = getshort(handle);
-        rec->stringParam = new wxChar[count+1];
-        fread((void *)rec->stringParam, sizeof(wxChar), count, handle);
-        rec->stringParam[count] = 0;
-        rec->param2 = getshort(handle); // Y
-        rec->param1 = getshort(handle); // X
-        metaRecords.Append(rec);
-        break;
-      }
-/*
-      case META_EXTTEXTOUT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_EXTTEXTOUT);
-        int cellSpacing = getshort(handle);
-        int count = getshort(handle);
-        rec->stringParam = new char[count+1];
-        fread((void *)rec->stringParam, sizeof(char), count, handle);
-        rec->stringParam[count] = 0;
-        // Rectangle
-        int rectY2 = getshort(handle);
-        int rectX2 = getshort(handle);
-        int rectY1 = getshort(handle);
-        int rectX1 = getshort(handle);
-        int rectType = getshort(handle);
-        rec->param2 = getshort(handle); // Y
-        rec->param1 = getshort(handle); // X
-        metaRecords.Append(rec);
-        break;
-      }
-*/
-//      case META_BITBLT:
-//      case META_STRETCHBLT:
-      case META_POLYGON:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_POLYGON);
-        rec->param1 = getshort(handle);
-        rec->points = new wxRealPoint[(int)rec->param1];
-        for (int i = 0; i < rec->param1; i++)
-        {
-          rec->points[i].x = getshort(handle);
-          rec->points[i].y = getshort(handle);
-        }
-
-        metaRecords.Append(rec);
-        break;
-      }
-      case META_POLYLINE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_POLYLINE);
-        rec->param1 = (long)getshort(handle);
-        rec->points = new wxRealPoint[(int)rec->param1];
-        for (int i = 0; i < rec->param1; i++)
-        {
-          rec->points[i].x = getshort(handle);
-          rec->points[i].y = getshort(handle);
-        }
-
-        metaRecords.Append(rec);
-        break;
-      }
-//      case META_ESCAPE:
-//      case META_RESTOREDC:
-//      case META_FILLREGION:
-//      case META_FRAMEREGION:
-//      case META_INVERTREGION:
-//      case META_PAINTREGION:
-//      case META_SELECTCLIPREGION: // DO THIS!
-      case META_SELECTOBJECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_SELECTOBJECT);
-        rec->param1 = (long)getshort(handle); // Position of object in gdiObjects list
-        metaRecords.Append(rec);
-        // param2 gives the index into gdiObjects, which is different from
-        // the index into the handle table.
-        rec->param2 = HandleTable[(int)rec->param1]->param2;
-        break;
-      }
-//      case META_SETTEXTALIGN:
-//      case META_DRAWTEXT:
-//      case META_CHORD:
-//      case META_SETMAPPERFLAGS:
-//      case META_EXTTEXTOUT:
-//      case META_SETDIBTODEV:
-//      case META_SELECTPALETTE:
-//      case META_REALIZEPALETTE:
-//      case META_ANIMATEPALETTE:
-//      case META_SETPALENTRIES:
-//      case META_POLYPOLYGON:
-//      case META_RESIZEPALETTE:
-//      case META_DIBBITBLT:
-//      case META_DIBSTRETCHBLT:
-      case META_DIBCREATEPATTERNBRUSH:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_DIBCREATEPATTERNBRUSH);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-//      case META_STRETCHDIB:
-//      case META_EXTFLOODFILL:
-//      case META_RESETDC:
-//      case META_STARTDOC:
-//      case META_STARTPAGE:
-//      case META_ENDPAGE:
-//      case META_ABORTDOC:
-//      case META_ENDDOC:
-      case META_DELETEOBJECT:
-      {
-        int index = getshort(handle);
-        DeleteMetaRecordHandle(index);
-        break;
-      }
-      case META_CREATEPALETTE:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEPALETTE);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEBRUSH:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEBRUSH);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEPATTERNBRUSH:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEPATTERNBRUSH);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEPENINDIRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEPENINDIRECT);
-        int msStyle = getshort(handle); // Style: 2 bytes
-        int x = getshort(handle); // X:     2 bytes
-        /* int y = */ getshort(handle); // Y:     2 bytes
-        long colorref = getint(handle); // COLORREF 4 bytes
-
-        int style;
-        if (msStyle == PS_DOT)
-          style = wxDOT;
-        else if (msStyle == PS_DASH)
-          style = wxSHORT_DASH;
-        else if (msStyle == PS_NULL)
-          style = wxTRANSPARENT;
-        else style = wxSOLID;
-
-        wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
-        rec->param1 = (long)wxThePenList->FindOrCreatePen(colour, x, style);
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-
-        // For some reason, the size of this record is sometimes 9 words!!!
-        // instead of the usual 8. So read 2 characters extra.
-        if (rdSize == 9)
-        {
-          (void) getshort(handle);
-        }
-        break;
-      }
-      case META_CREATEFONTINDIRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEFONTINDIRECT);
-        int lfHeight = getshort(handle);    // 2 bytes
-        /* int lfWidth = */ getshort(handle);     // 2 bytes
-        /* int lfEsc = */ getshort(handle);       // 2 bytes
-        /* int lfOrient = */ getshort(handle);    // 2 bytes
-        int lfWeight = getshort(handle);    // 2 bytes
-        char lfItalic = (char)getc(handle);       // 1 byte
-        char lfUnderline = (char)getc(handle);    // 1 byte
-        /* char lfStrikeout = */ getc(handle);    // 1 byte
-        /* char lfCharSet = */ getc(handle);      // 1 byte
-        /* char lfOutPrecision = */ getc(handle); // 1 byte
-        /* char lfClipPrecision = */ getc(handle); // 1 byte
-        /* char lfQuality = */ getc(handle);      // 1 byte
-        char lfPitchAndFamily = (char)getc(handle);   // 1 byte (18th)
-        char lfFacename[32];
-        // Read the rest of the record, which is total record size
-        // minus the number of bytes already read (18 record, 6 metarecord
-        // header)
-        fread((void *)lfFacename, sizeof(char), (int)((2*rdSize) - 18 - 6), handle);
-
-        int family;
-        if (lfPitchAndFamily & FF_MODERN)
-          family = wxMODERN;
-        else if (lfPitchAndFamily & FF_MODERN)
-          family = wxMODERN;
-        else if (lfPitchAndFamily & FF_ROMAN)
-          family = wxROMAN;
-        else if (lfPitchAndFamily & FF_SWISS)
-          family = wxSWISS;
-        else if (lfPitchAndFamily & FF_DECORATIVE)
-          family = wxDECORATIVE;
-        else
-          family = wxDEFAULT;
-
-        int weight;
-        if (lfWeight == 300)
-          weight = wxLIGHT;
-        else if (lfWeight == 400)
-          weight = wxNORMAL;
-        else if (lfWeight == 900)
-          weight = wxBOLD;
-        else weight = wxNORMAL;
-
-        int style;
-        if (lfItalic != 0)
-          style = wxITALIC;
-        else
-          style = wxNORMAL;
-
-        // About how many pixels per inch???
-        int logPixelsY = 100;
-        int pointSize = (int)(lfHeight*72.0/logPixelsY);
-
-        wxFont *theFont =
-          wxTheFontList->FindOrCreateFont(pointSize, family, style, weight, (lfUnderline != 0));
-
-        rec->param1 = (long) theFont;
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEBRUSHINDIRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEBRUSHINDIRECT);
-        int msStyle = getshort(handle); // Style: 2 bytes
-        long colorref = getint(handle);   // COLORREF: 4 bytes
-        int hatchStyle = getshort(handle); // Hatch style 2 bytes
-
-        int style;
-        switch (msStyle)
-        {
-          case BS_HATCHED:
-          {
-            switch (hatchStyle)
-            {
-              case HS_BDIAGONAL:
-                style = wxBDIAGONAL_HATCH;
-                break;
-              case HS_DIAGCROSS:
-                style = wxCROSSDIAG_HATCH;
-                break;
-              case HS_FDIAGONAL:
-                style = wxFDIAGONAL_HATCH;
-                break;
-              case HS_HORIZONTAL:
-                style = wxHORIZONTAL_HATCH;
-                break;
-              case HS_VERTICAL:
-                style = wxVERTICAL_HATCH;
-                break;
-              default:
-              case HS_CROSS:
-                style = wxCROSS_HATCH;
-                break;
-            }
-            break;
-          }
-#if PS_DOT != BS_HATCHED
-          /* ABX 30.12.2003                                   */
-          /* in microsoft/include/wingdi.h  both are the same */
-          /* in fact I'm not sure  why pen related PS_XXX and */
-          /* BS_XXX constants are all mixed into single style */
-          case PS_DOT:
-            style = wxDOT;
-            break;
-#endif
-          case PS_DASH:
-            style = wxSHORT_DASH;
-            break;
-          case PS_NULL:
-            style = wxTRANSPARENT;
-            break;
-          case BS_SOLID:
-          default:
-            style = wxSOLID;
-            break;
-        }
-
-        wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
-        rec->param1 = (long)wxTheBrushList->FindOrCreateBrush(colour, style);
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEBITMAPINDIRECT:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAPINDIRECT);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEBITMAP:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAP);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      case META_CREATEREGION:
-      {
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEREGION);
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-
-        metaRecords.Append(rec);
-        gdiObjects.Append(rec);
-        AddMetaRecordHandle(rec);
-        rec->param2 = (long)(gdiObjects.GetCount() - 1);
-        break;
-      }
-      default:
-      {
-        fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
-        break;
-      }
-    }
-  }
-  fclose(handle);
-  return true;
-}
-
-wxXMetaFile::~wxXMetaFile(void)
-{
-  wxObjectList::compatibility_iterator node = metaRecords.GetFirst();
-  while (node)
-  {
-    wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
-    delete rec;
-    wxObjectList::compatibility_iterator next = node->GetNext();
-    metaRecords.Erase(node);
-    node = next;
-  }
-}
-
-bool wxXMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
-{
-  return false;
-}
-
-bool wxXMetaFile::Play(wxDC *dc)
-{
-  wxObjectList::compatibility_iterator node = metaRecords.GetFirst();
-  while (node)
-  {
-    wxMetaRecord *rec = (wxMetaRecord *)node->GetData();
-    int rdFunction = rec->metaFunction;
-
-    switch (rdFunction)
-    {
-      case META_SETBKCOLOR:
-      {
-        break;
-      }
-      case META_SETBKMODE:
-      {
-        break;
-      }
-      case META_SETMAPMODE:
-      {
-        break;
-      }
-//      case META_SETROP2:
-//      case META_SETRELABS:
-//      case META_SETPOLYFILLMODE:
-//      case META_SETSTRETCHBLTMODE:
-//      case META_SETTEXTCHAREXTRA:
-      case META_SETTEXTCOLOR:
-      {
-        break;
-      }
-//      case META_SETTEXTJUSTIFICATION:
-      case META_SETWINDOWORG:
-      {
-        break;
-      }
-      case META_SETWINDOWEXT:
-      {
-        break;
-      }
-//      case META_SETVIEWPORTORG:
-//      case META_SETVIEWPORTEXT:
-//      case META_OFFSETWINDOWORG:
-//      case META_SCALEWINDOWEXT:
-//      case META_OFFSETVIEWPORTORG:
-//      case META_SCALEVIEWPORTEXT:
-      case META_LINETO:
-      {
-        long x1 = rec->param1;
-        long y1 = rec->param2;
-        dc->DrawLine((long) lastX, (long) lastY, x1, y1);
-        break;
-      }
-      case META_MOVETO:
-      {
-        lastX = (double)rec->param1;
-        lastY = (double)rec->param2;
-        break;
-      }
-      case META_EXCLUDECLIPRECT:
-      {
-        break;
-      }
-      case META_INTERSECTCLIPRECT:
-      {
-        break;
-      }
-//      case META_ARC: // DO!!!
-      case META_ELLIPSE:
-      {
-        break;
-      }
-//      case META_FLOODFILL:
-//      case META_PIE: // DO!!!
-      case META_RECTANGLE:
-      {
-        dc->DrawRectangle((long)rec->param1, (long)rec->param2,
-                          (long)rec->param3 - rec->param1,
-                          (long)rec->param4 - rec->param2);
-        break;
-      }
-      case META_ROUNDRECT:
-      {
-        dc->DrawRoundedRectangle((long)rec->param1, (long)rec->param2,
-                          (long)rec->param3 - rec->param1,
-                          (long)rec->param4 - rec->param2,
-                          (long)rec->param5);
-        break;
-      }
-//      case META_PATBLT:
-//      case META_SAVEDC:
-      case META_SETPIXEL:
-      {
-//        rec->param1 = getshort(handle); // x1
-//        rec->param2 = getshort(handle); // y1
-//        rec->param3 = getint(handle);   // COLORREF
-        break;
-      }
-//      case META_OFFSETCLIPRGN:
-      case META_TEXTOUT:
-      {
-/*
-        int count = getshort(handle);
-        rec->stringParam = new char[count+1];
-        fread((void *)rec->stringParam, sizeof(char), count, handle);
-        rec->stringParam[count] = 0;
-        rec->param2 = getshort(handle); // Y
-        rec->param1 = getshort(handle); // X
-*/
-        break;
-      }
-//      case META_BITBLT:
-//      case META_STRETCHBLT:
-      case META_POLYGON:
-      {
-/*
-        rec->param1 = getshort(handle);
-        rec->points = new wxRealPoint[(int)rec->param1];
-        for (int i = 0; i < rec->param1; i++)
-        {
-          rec->points[i].x = getshort(handle);
-          rec->points[i].y = getshort(handle);
-        }
-*/
-        break;
-      }
-      case META_POLYLINE:
-      {
-/*
-        wxMetaRecord *rec = new wxMetaRecord(META_POLYLINE);
-        rec->param1 = (long)getshort(handle);
-        rec->points = new wxRealPoint[(int)rec->param1];
-        for (int i = 0; i < rec->param1; i++)
-        {
-          rec->points[i].x = getshort(handle);
-          rec->points[i].y = getshort(handle);
-        }
-*/
-        break;
-      }
-//      case META_ESCAPE:
-//      case META_RESTOREDC:
-//      case META_FILLREGION:
-//      case META_FRAMEREGION:
-//      case META_INVERTREGION:
-//      case META_PAINTREGION:
-//      case META_SELECTCLIPREGION: // DO THIS!
-      case META_SELECTOBJECT:
-      {
-/*
-        wxMetaRecord *rec = new wxMetaRecord(META_SELECTOBJECT);
-        rec->param1 = (long)getshort(handle); // Position of object in gdiObjects list
-*/
-        break;
-      }
-//      case META_SETTEXTALIGN:
-//      case META_DRAWTEXT:
-//      case META_CHORD:
-//      case META_SETMAPPERFLAGS:
-//      case META_EXTTEXTOUT:
-//      case META_SETDIBTODEV:
-//      case META_SELECTPALETTE:
-//      case META_REALIZEPALETTE:
-//      case META_ANIMATEPALETTE:
-//      case META_SETPALENTRIES:
-//      case META_POLYPOLYGON:
-//      case META_RESIZEPALETTE:
-//      case META_DIBBITBLT:
-//      case META_DIBSTRETCHBLT:
-      case META_DIBCREATEPATTERNBRUSH:
-      {
-/*
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-//      case META_STRETCHDIB:
-//      case META_EXTFLOODFILL:
-//      case META_RESETDC:
-//      case META_STARTDOC:
-//      case META_STARTPAGE:
-//      case META_ENDPAGE:
-//      case META_ABORTDOC:
-//      case META_ENDDOC:
-//      case META_DELETEOBJECT: // DO!!
-      case META_CREATEPALETTE:
-      {
-/*
-        wxMetaRecord *rec = new wxMetaRecord(META_CREATEPALETTE);
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-      case META_CREATEBRUSH:
-      {
-/*
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-      case META_CREATEPATTERNBRUSH:
-      {
-/*
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-      case META_CREATEPENINDIRECT:
-      {
-/*
-        int msStyle = getshort(handle); // Style: 2 bytes
-        int x = getshort(handle); // X:     2 bytes
-        int y = getshort(handle); // Y:     2 bytes
-        int colorref = getint(handle); // COLORREF 4 bytes
-
-        int style;
-        if (msStyle == PS_DOT)
-          style = wxDOT;
-        else if (msStyle == PS_DASH)
-          style = wxSHORT_DASH;
-        else if (msStyle == PS_NULL)
-          style = wxTRANSPARENT;
-        else style = wxSOLID;
-
-        wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
-        rec->param1 = (long)wxThePenList->FindOrCreatePen(&colour, x, style);
-*/
-        break;
-      }
-      case META_CREATEFONTINDIRECT:
-      {
-/*
-        int lfHeight = getshort(handle);
-        int lfWidth = getshort(handle);
-        int lfEsc = getshort(handle);
-        int lfOrient = getshort(handle);
-        int lfWeight = getshort(handle);
-        char lfItalic = getc(handle);
-        char lfUnderline = getc(handle);
-        char lfStrikeout = getc(handle);
-        char lfCharSet = getc(handle);
-        char lfOutPrecision = getc(handle);
-        char lfClipPrecision = getc(handle);
-        char lfQuality = getc(handle);
-        char lfPitchAndFamily = getc(handle);
-        char lfFacename[32];
-        fread((void *)lfFacename, sizeof(char), 32, handle);
-
-        int family;
-        if (lfPitchAndFamily & FF_MODERN)
-          family = wxMODERN;
-        else if (lfPitchAndFamily & FF_MODERN)
-          family = wxMODERN;
-        else if (lfPitchAndFamily & FF_ROMAN)
-          family = wxROMAN;
-        else if (lfPitchAndFamily & FF_SWISS)
-          family = wxSWISS;
-        else if (lfPitchAndFamily & FF_DECORATIVE)
-          family = wxDECORATIVE;
-        else
-          family = wxDEFAULT;
-
-        int weight;
-        if (lfWeight == 300)
-          weight = wxLIGHT;
-        else if (lfWeight == 400)
-          weight = wxNORMAL;
-        else if (lfWeight == 900)
-          weight = wxBOLD;
-        else weight = wxNORMAL;
-
-        int style;
-        if ((bool)lfItalic)
-          style = wxITALIC;
-        else
-          style = wxNORMAL;
-
-        // About how many pixels per inch???
-        int logPixelsY = 100;
-        int pointSize = (int)(lfHeight*72.0/logPixelsY);
-
-        wxFont *theFont =
-          wxTheFontList->FindOrCreateFont(pointSize, family, style, weight, (bool)lfUnderline);
-
-        rec->param1 = (long)theFont;
-*/
-        break;
-      }
-      case META_CREATEBRUSHINDIRECT:
-      {
-/*
-        int msStyle = getshort(handle); // Style: 2 bytes
-        int colorref = getint(handle);   // COLORREF: 4 bytes
-        int hatchStyle = getshort(handle); // Hatch style 2 bytes
-
-        int style;
-        if (msStyle == PS_DOT)
-          style = wxDOT;
-        else if (msStyle == PS_DASH)
-          style = wxSHORT_DASH;
-        else if (msStyle == PS_NULL)
-          style = wxTRANSPARENT;
-        else style = wxSOLID;
-
-        wxColour colour(GetRValue(colorref), GetGValue(colorref), GetBValue(colorref));
-        rec->param1 = (long)wxTheBrushList->FindOrCreateBrush(&colour, wxSOLID);
-*/
-        break;
-      }
-      case META_CREATEBITMAPINDIRECT:
-      {
-/*
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-      case META_CREATEBITMAP:
-      {
-/*
-        fread((void *)wxBuffer, sizeof(char), (int)(rdSize - 3), handle);
-*/
-        break;
-      }
-      case META_CREATEREGION:
-      {
-        dc->DestroyClippingRegion();
-/*
-        rec->param1 = getshort(handle); // Style: 2 bytes
-*/
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-    node = node->GetNext();
-  }
-  return true;
-}
-
diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
deleted file mode 100644
index d580ee81ac..0000000000
--- a/contrib/src/ogl/ogldiag.cpp
+++ /dev/null
@@ -1,742 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        ogldiag.cpp
-// Purpose:     wxDiagram
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#ifdef new
-#undef new
-#endif
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "wx/ogl/ogl.h"
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxDiagram, wxObject)
-
-// Object canvas
-wxDiagram::wxDiagram()
-{
-  m_diagramCanvas = NULL;
-  m_quickEditMode = false;
-  m_snapToGrid = true;
-  m_gridSpacing = 5.0;
-  m_shapeList = new wxList;
-  m_mouseTolerance = DEFAULT_MOUSE_TOLERANCE;
-}
-
-wxDiagram::~wxDiagram()
-{
-  if (m_shapeList)
-    delete m_shapeList;
-}
-
-void wxDiagram::SetSnapToGrid(bool snap)
-{
-  m_snapToGrid = snap;
-}
-
-void wxDiagram::SetGridSpacing(double spacing)
-{
-  m_gridSpacing = spacing;
-}
-
-void wxDiagram::Snap(double *x, double *y)
-{
-  if (m_snapToGrid)
-  {
-    *x = m_gridSpacing * ((int)(*x/m_gridSpacing + 0.5));
-    *y = m_gridSpacing * ((int)(*y/m_gridSpacing + 0.5));
-  }
-}
-
-
-void wxDiagram::Redraw(wxDC& dc)
-{
-  if (m_shapeList)
-  {
-    if (GetCanvas())
-      GetCanvas()->SetCursor(* wxHOURGLASS_CURSOR);
-    wxNode *current = m_shapeList->GetFirst();
-
-    while (current)
-    {
-      wxShape *object = (wxShape *)current->GetData();
-      if (!object->GetParent())
-        object->Draw(dc);
-
-      current = current->GetNext();
-    }
-    if (GetCanvas())
-      GetCanvas()->SetCursor(* wxSTANDARD_CURSOR);
-  }
-}
-
-void wxDiagram::Clear(wxDC& dc)
-{
-  dc.Clear();
-}
-
-// Insert object after addAfter, or at end of list.
-void wxDiagram::AddShape(wxShape *object, wxShape *addAfter)
-{
-  wxNode *nodeAfter = NULL;
-  if (addAfter)
-    nodeAfter = m_shapeList->Member(addAfter);
-
-  if (!m_shapeList->Member(object))
-  {
-    if (nodeAfter)
-    {
-      if (nodeAfter->GetNext())
-        m_shapeList->Insert(nodeAfter->GetNext(), object);
-      else
-        m_shapeList->Append(object);
-    }
-    else
-      m_shapeList->Append(object);
-    object->SetCanvas(GetCanvas());
-  }
-}
-
-void wxDiagram::InsertShape(wxShape *object)
-{
-  m_shapeList->Insert(object);
-  object->SetCanvas(GetCanvas());
-}
-
-void wxDiagram::RemoveShape(wxShape *object)
-{
-  m_shapeList->DeleteObject(object);
-}
-
-// Should this delete the actual objects too? I think not.
-void wxDiagram::RemoveAllShapes()
-{
-  m_shapeList->Clear();
-}
-
-void wxDiagram::DeleteAllShapes()
-{
-  wxNode *node = m_shapeList->GetFirst();
-  while (node)
-  {
-    wxShape *shape = (wxShape *)node->GetData();
-    if (!shape->GetParent())
-    {
-      RemoveShape(shape);
-      delete shape;
-      node = m_shapeList->GetFirst();
-    }
-    else
-      node = node->GetNext();
-  }
-}
-
-void wxDiagram::ShowAll(bool show)
-{
-  wxNode *current = m_shapeList->GetFirst();
-
-  while (current)
-  {
-    wxShape *object = (wxShape *)current->GetData();
-    object->Show(show);
-
-    current = current->GetNext();
-  }
-}
-
-void wxDiagram::DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2)
-{
-  wxPen dottedPen(*wxBLACK, 1, wxDOT);
-  dc.SetPen(dottedPen);
-  dc.SetBrush((* wxTRANSPARENT_BRUSH));
-
-  wxPoint points[5];
-
-  points[0].x = (int) x1;
-  points[0].y = (int) y1;
-
-  points[1].x = (int) x2;
-  points[1].y = (int) y1;
-
-  points[2].x = (int) x2;
-  points[2].y = (int) y2;
-
-  points[3].x = (int) x1;
-  points[3].y = (int) y2;
-
-  points[4].x = (int) x1;
-  points[4].y = (int) y1;
-  dc.DrawLines(5, points);
-}
-
-// Make sure all text that should be centred, is centred.
-void wxDiagram::RecentreAll(wxDC& dc)
-{
-  wxNode *object_node = m_shapeList->GetFirst();
-  while (object_node)
-  {
-    wxShape *obj = (wxShape *)object_node->GetData();
-    obj->Recentre(dc);
-    object_node = object_node->GetNext();
-  }
-}
-
-// Input/output
-#if wxUSE_PROLOGIO
-bool wxDiagram::SaveFile(const wxString& filename)
-{
-  wxBeginBusyCursor();
-
-  wxExprDatabase *database = new wxExprDatabase;
-
-  // First write the diagram type
-  wxExpr *header = new wxExpr(_T("diagram"));
-  OnHeaderSave(*database, *header);
-
-  database->Append(header);
-
-  wxNode *node = m_shapeList->GetFirst();
-  while (node)
-  {
-    wxShape *shape = (wxShape *)node->GetData();
-
-    if (!shape->IsKindOf(CLASSINFO(wxControlPoint)))
-    {
-      wxExpr *expr;
-      if (shape->IsKindOf(CLASSINFO(wxLineShape)))
-        expr = new wxExpr(_T("line"));
-       else
-        expr = new wxExpr(_T("shape"));
-
-      OnShapeSave(*database, *shape, *expr);
-    }
-    node = node->GetNext();
-  }
-  OnDatabaseSave(*database);
-
-  wxString tempFile;
-  wxGetTempFileName(wxT("diag"), tempFile);
-  FILE* file = fopen(tempFile.mb_str(wxConvFile), "w");
-  if (! file)
-  {
-    wxEndBusyCursor();
-    delete database;
-    return false;
-  }
-
-  database->Write(file);
-  fclose(file);
-  delete database;
-
-/*
-  // Save backup
-  if (FileExists(filename))
-  {
-    char buf[400];
-#ifdef __X__
-    sprintf(buf, "%s.bak", filename);
-#endif
-#ifdef __WXMSW__
-    sprintf(buf, "_diagram.bak");
-#endif
-    if (FileExists(buf)) wxRemoveFile(buf);
-    if (!wxRenameFile(filename, buf))
-    {
-      wxCopyFile(filename, buf);
-      wxRemoveFile(filename);
-    }
-  }
-*/
-
-  // Copy the temporary file to the correct filename
-  if (!wxRenameFile(tempFile, filename))
-  {
-    wxCopyFile(tempFile, filename);
-    wxRemoveFile(tempFile);
-  }
-
-  wxEndBusyCursor();
-  return true;
-}
-
-bool wxDiagram::LoadFile(const wxString& filename)
-{
-  wxBeginBusyCursor();
-
-  wxExprDatabase database(wxExprInteger, _T("id"));
-  if (!database.Read(filename))
-  {
-    wxEndBusyCursor();
-    return false;
-  }
-
-  DeleteAllShapes();
-
-  database.BeginFind();
-  wxExpr *header = database.FindClauseByFunctor(_T("diagram"));
-
-  if (header)
-    OnHeaderLoad(database, *header);
-
-  // Scan through all clauses and register the ids
-  wxNode *node = database.GetFirst();
-  while (node)
-  {
-    wxExpr *clause = (wxExpr *)node->GetData();
-    long id = -1;
-    clause->GetAttributeValue(_T("id"), id);
-    wxRegisterId(id);
-    node = node->GetNext();
-  }
-
-  ReadNodes(database);
-  ReadContainerGeometry(database);
-  ReadLines(database);
-
-  OnDatabaseLoad(database);
-
-  wxEndBusyCursor();
-
-  return true;
-}
-
-void wxDiagram::ReadNodes(wxExprDatabase& database)
-{
-  // Find and create the node images
-  database.BeginFind();
-  wxExpr *clause = database.FindClauseByFunctor(_T("shape"));
-  while (clause)
-  {
-    wxChar *type = NULL;
-    long parentId = -1;
-
-    clause->AssignAttributeValue(wxT("type"), &type);
-    clause->AssignAttributeValue(wxT("parent"), &parentId);
-    wxClassInfo *classInfo = wxClassInfo::FindClass(type);
-    if (classInfo)
-    {
-      wxShape *shape = (wxShape *)classInfo->CreateObject();
-      OnShapeLoad(database, *shape, *clause);
-
-      shape->SetCanvas(GetCanvas());
-      shape->Show(true);
-
-      m_shapeList->Append(shape);
-
-      // If child of composite, link up
-      if (parentId > -1)
-      {
-        wxExpr *parentExpr = database.HashFind(_T("shape"), parentId);
-        if (parentExpr && parentExpr->GetClientData())
-        {
-          wxShape *parent = (wxShape *)parentExpr->GetClientData();
-          shape->SetParent(parent);
-          parent->GetChildren().Append(shape);
-        }
-      }
-
-      clause->SetClientData(shape);
-    }
-    if (type)
-      delete[] type;
-
-    clause = database.FindClauseByFunctor(_T("shape"));
-  }
-  return;
-}
-
-void wxDiagram::ReadLines(wxExprDatabase& database)
-{
-  database.BeginFind();
-  wxExpr *clause = database.FindClauseByFunctor(_T("line"));
-  while (clause)
-  {
-    wxString type;
-    long parentId = -1;
-
-    clause->GetAttributeValue(_T("type"), type);
-    clause->GetAttributeValue(_T("parent"), parentId);
-    wxClassInfo *classInfo = wxClassInfo::FindClass(type);
-    if (classInfo)
-    {
-      wxLineShape *shape = (wxLineShape *)classInfo->CreateObject();
-      shape->Show(true);
-
-      OnShapeLoad(database, *shape, *clause);
-      shape->SetCanvas(GetCanvas());
-
-      long image_to = -1; long image_from = -1;
-      clause->GetAttributeValue(_T("to"), image_to);
-      clause->GetAttributeValue(_T("from"), image_from);
-
-      wxExpr *image_to_expr = database.HashFind(_T("shape"), image_to);
-
-      if (!image_to_expr)
-      {
-        // Error
-      }
-      wxExpr *image_from_expr = database.HashFind(_T("shape"), image_from);
-
-      if (!image_from_expr)
-      {
-        // Error
-      }
-
-      if (image_to_expr && image_from_expr)
-      {
-        wxShape *image_to_object = (wxShape *)image_to_expr->GetClientData();
-        wxShape *image_from_object = (wxShape *)image_from_expr->GetClientData();
-
-        if (image_to_object && image_from_object)
-        {
-          image_from_object->AddLine(shape, image_to_object, shape->GetAttachmentFrom(), shape->GetAttachmentTo());
-        }
-      }
-      clause->SetClientData(shape);
-
-      m_shapeList->Append(shape);
-    }
-
-    clause = database.FindClauseByFunctor(_T("line"));
-  }
-}
-
-// Containers have divisions that reference adjoining divisions,
-// so we need a separate pass to link everything up.
-// Also used by Symbol Library.
-void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
-{
-  database.BeginFind();
-  wxExpr *clause = database.FindClauseByFunctor(_T("shape"));
-  while (clause)
-  {
-    wxShape *image = (wxShape *)clause->GetClientData();
-    if (image && image->IsKindOf(CLASSINFO(wxCompositeShape)))
-    {
-      wxCompositeShape *composite = (wxCompositeShape *)image;
-      wxExpr *divisionExpr = NULL;
-
-      // Find the list of divisions in the composite
-      clause->GetAttributeValue(_T("divisions"), &divisionExpr);
-      if (divisionExpr)
-      {
-        int i = 0;
-        wxExpr *idExpr = divisionExpr->Nth(i);
-        while (idExpr)
-        {
-          long divisionId = idExpr->IntegerValue();
-          wxExpr *childExpr = database.HashFind(_T("shape"), divisionId);
-          if (childExpr && childExpr->GetClientData())
-          {
-            wxDivisionShape *child = (wxDivisionShape *)childExpr->GetClientData();
-            composite->GetDivisions().Append(child);
-
-            // Find the adjoining shapes
-            long leftSideId = -1;
-            long topSideId = -1;
-            long rightSideId = -1;
-            long bottomSideId = -1;
-            childExpr->GetAttributeValue(_T("left_side"), leftSideId);
-            childExpr->GetAttributeValue(_T("top_side"), topSideId);
-            childExpr->GetAttributeValue(_T("right_side"), rightSideId);
-            childExpr->GetAttributeValue(_T("bottom_side"), bottomSideId);
-            if (leftSideId > -1)
-            {
-              wxExpr *leftExpr = database.HashFind(_T("shape"), leftSideId);
-              if (leftExpr && leftExpr->GetClientData())
-              {
-                wxDivisionShape *leftSide = (wxDivisionShape *)leftExpr->GetClientData();
-                child->SetLeftSide(leftSide);
-              }
-            }
-            if (topSideId > -1)
-            {
-              wxExpr *topExpr = database.HashFind(_T("shape"), topSideId);
-              if (topExpr && topExpr->GetClientData())
-              {
-                wxDivisionShape *topSide = (wxDivisionShape *)topExpr->GetClientData();
-                child->SetTopSide(topSide);
-              }
-            }
-            if (rightSideId > -1)
-            {
-              wxExpr *rightExpr = database.HashFind(_T("shape"), rightSideId);
-              if (rightExpr && rightExpr->GetClientData())
-              {
-                wxDivisionShape *rightSide = (wxDivisionShape *)rightExpr->GetClientData();
-                child->SetRightSide(rightSide);
-              }
-            }
-            if (bottomSideId > -1)
-            {
-              wxExpr *bottomExpr = database.HashFind(_T("shape"), bottomSideId);
-              if (bottomExpr && bottomExpr->GetClientData())
-              {
-                wxDivisionShape *bottomSide = (wxDivisionShape *)bottomExpr->GetClientData();
-                child->SetBottomSide(bottomSide);
-              }
-            }
-          }
-          i ++;
-          idExpr = divisionExpr->Nth(i);
-        }
-      }
-    }
-
-    clause = database.FindClauseByFunctor(_T("shape"));
-  }
-}
-
-// Allow for modifying file
-bool wxDiagram::OnDatabaseLoad(wxExprDatabase& WXUNUSED(db))
-{
-  return true;
-}
-
-bool wxDiagram::OnDatabaseSave(wxExprDatabase& WXUNUSED(db))
-{
-  return true;
-}
-
-bool wxDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
-{
-  shape.WriteAttributes(&expr);
-  db.Append(&expr);
-
-  if (shape.IsKindOf(CLASSINFO(wxCompositeShape)))
-  {
-    wxNode *node = shape.GetChildren().GetFirst();
-    while (node)
-    {
-      wxShape *childShape = (wxShape *)node->GetData();
-      wxExpr *childExpr = new wxExpr(_T("shape"));
-      OnShapeSave(db, *childShape, *childExpr);
-      node = node->GetNext();
-    }
-  }
-
-  return true;
-}
-
-bool wxDiagram::OnShapeLoad(wxExprDatabase& WXUNUSED(db), wxShape& shape, wxExpr& expr)
-{
-  shape.ReadAttributes(&expr);
-  return true;
-}
-
-bool wxDiagram::OnHeaderSave(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
-{
-  return true;
-}
-
-bool wxDiagram::OnHeaderLoad(wxExprDatabase& WXUNUSED(db), wxExpr& WXUNUSED(expr))
-{
-  return true;
-}
-
-#endif
-
-void wxDiagram::SetCanvas(wxShapeCanvas *can)
-{
-  m_diagramCanvas = can;
-}
-
-// Find a shape by its id
-wxShape* wxDiagram::FindShape(long id) const
-{
-    wxNode* node = GetShapeList()->GetFirst();
-    while (node)
-    {
-        wxShape* shape = (wxShape*) node->GetData();
-        if (shape->GetId() == id)
-            return shape;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-//// Crossings classes
-
-wxLineCrossings::wxLineCrossings()
-{
-}
-
-wxLineCrossings::~wxLineCrossings()
-{
-    ClearCrossings();
-}
-
-void wxLineCrossings::FindCrossings(wxDiagram& diagram)
-{
-    ClearCrossings();
-    wxNode* node1 = diagram.GetShapeList()->GetFirst();
-    while (node1)
-    {
-        wxShape* shape1 = (wxShape*) node1->GetData();
-        if (shape1->IsKindOf(CLASSINFO(wxLineShape)))
-        {
-            wxLineShape* lineShape1 = (wxLineShape*) shape1;
-            // Iterate through the segments
-            wxList* pts1 = lineShape1->GetLineControlPoints();
-            size_t i;
-            for (i = 0; i < (pts1->GetCount() - 1); i++)
-            {
-                wxRealPoint* pt1_a = (wxRealPoint*) (pts1->Item(i)->GetData());
-                wxRealPoint* pt1_b = (wxRealPoint*) (pts1->Item(i+1)->GetData());
-
-                // Now we iterate through the segments again
-
-                wxNode* node2 = diagram.GetShapeList()->GetFirst();
-                while (node2)
-                {
-                    wxShape* shape2 = (wxShape*) node2->GetData();
-
-                    // Assume that the same line doesn't cross itself
-                    if (shape2->IsKindOf(CLASSINFO(wxLineShape)) && (shape1 != shape2))
-                    {
-                        wxLineShape* lineShape2 = (wxLineShape*) shape2;
-                        // Iterate through the segments
-                        wxList* pts2 = lineShape2->GetLineControlPoints();
-                        int j;
-                        for (j = 0; j < (int) (pts2->GetCount() - 1); j++)
-                        {
-                            wxRealPoint* pt2_a = (wxRealPoint*) (pts2->Item(j)->GetData());
-                            wxRealPoint* pt2_b = (wxRealPoint*) (pts2->Item(j+1)->GetData());
-
-                            // Now let's see if these two segments cross.
-                            double ratio1, ratio2;
-                            oglCheckLineIntersection(pt1_a->x, pt1_a->y, pt1_b->x, pt1_b->y,
-                               pt2_a->x, pt2_a->y, pt2_b->x, pt2_b->y,
-                             & ratio1, & ratio2);
-
-                            if ((ratio1 < 1.0) && (ratio1 > -1.0))
-                            {
-                                // Intersection!
-                                wxLineCrossing* crossing = new wxLineCrossing;
-                                crossing->m_intersect.x = (pt1_a->x + (pt1_b->x - pt1_a->x)*ratio1);
-                                crossing->m_intersect.y = (pt1_a->y + (pt1_b->y - pt1_a->y)*ratio1);
-
-                                crossing->m_pt1 = * pt1_a;
-                                crossing->m_pt2 = * pt1_b;
-                                crossing->m_pt3 = * pt2_a;
-                                crossing->m_pt4 = * pt2_b;
-
-                                crossing->m_lineShape1 = lineShape1;
-                                crossing->m_lineShape2 = lineShape2;
-
-                                m_crossings.Append(crossing);
-                            }
-                        }
-                    }
-                    node2 = node2->GetNext();
-                }
-            }
-        }
-
-        node1 = node1->GetNext();
-    }
-}
-
-void wxLineCrossings::DrawCrossings(wxDiagram& WXUNUSED(diagram), wxDC& dc)
-{
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-    long arcWidth = 8;
-
-    wxNode* node = m_crossings.GetFirst();
-    while (node)
-    {
-        wxLineCrossing* crossing = (wxLineCrossing*) node->GetData();
-//        dc.DrawEllipse((long) (crossing->m_intersect.x - (arcWidth/2.0) + 0.5), (long) (crossing->m_intersect.y - (arcWidth/2.0) + 0.5),
-//           arcWidth, arcWidth);
-
-
-        // Let's do some geometry to find the points on either end of the arc.
-/*
-
-(x1, y1)
-    |\
-    | \
-    |  \
-    |   \
-    |    \
-    |    |\ c    c1
-    |  a | \
-         |  \
-    |     -  x <-- centre of arc
- a1 |     b  |\
-    |        | \ c2
-    |     a2 |  \
-    |         -  \
-    |         b2  \
-    |              \
-    |_______________\ (x2, y2)
-          b1
-
-*/
-
-        double a1 = wxMax(crossing->m_pt1.y, crossing->m_pt2.y) - wxMin(crossing->m_pt1.y, crossing->m_pt2.y) ;
-        double b1 = wxMax(crossing->m_pt1.x, crossing->m_pt2.x) - wxMin(crossing->m_pt1.x, crossing->m_pt2.x) ;
-        double c1 = sqrt( (a1*a1) + (b1*b1) );
-
-        double c = arcWidth / 2.0;
-        double a = c * a1/c1 ;
-        double b = c * b1/c1 ;
-
-        // I'm not sure this is right, since we don't know which direction we should be going in - need
-        // to know which way the line slopes and choose the sign appropriately.
-        double arcX1 = crossing->m_intersect.x - b;
-        double arcY1 = crossing->m_intersect.y - a;
-
-        double arcX2 = crossing->m_intersect.x + b;
-        double arcY2 = crossing->m_intersect.y + a;
-
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawArc( (long) arcX1, (long) arcY1, (long) arcX2, (long) arcY2,
-            (long) crossing->m_intersect.x, (long) crossing->m_intersect.y);
-
-        dc.SetPen(*wxWHITE_PEN);
-        dc.DrawLine( (long) arcX1, (long) arcY1, (long) arcX2, (long) arcY2 );
-
-        node = node->GetNext();
-    }
-}
-
-void wxLineCrossings::ClearCrossings()
-{
-    wxNode* node = m_crossings.GetFirst();
-    while (node)
-    {
-        wxLineCrossing* crossing = (wxLineCrossing*) node->GetData();
-        delete crossing;
-        node = node->GetNext();
-    }
-    m_crossings.Clear();
-}
-
diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
deleted file mode 100644
index 74ee28613f..0000000000
--- a/contrib/src/ogl/oglmisc.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        misc.cpp
-// Purpose:     Miscellaneous OGL support functions
-// Author:      Julian Smart
-// Modified by:
-// Created:     12/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if wxUSE_PROLOGIO
-#include "wx/deprecated/wxexpr.h"
-#endif
-
-#include "wx/types.h"
-
-#ifdef new
-#undef new
-#endif
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "wx/ogl/ogl.h"
-
-
-wxFont*         g_oglNormalFont;
-wxPen*          g_oglBlackPen;
-wxPen*          g_oglWhiteBackgroundPen;
-wxPen*          g_oglTransparentPen;
-wxBrush*        g_oglWhiteBackgroundBrush;
-wxPen*          g_oglBlackForegroundPen;
-wxCursor*       g_oglBullseyeCursor = NULL;
-
-wxChar*           oglBuffer = NULL;
-
-wxList          oglObjectCopyMapping(wxKEY_INTEGER);
-
-
-
-void wxOGLInitialize()
-{
-  g_oglBullseyeCursor = new wxCursor(wxCURSOR_BULLSEYE);
-
-  g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
-
-  g_oglBlackPen = new wxPen(wxT("BLACK"), 1, wxSOLID);
-
-  g_oglWhiteBackgroundPen = new wxPen(wxT("WHITE"), 1, wxSOLID);
-  g_oglTransparentPen = new wxPen(wxT("WHITE"), 1, wxTRANSPARENT);
-  g_oglWhiteBackgroundBrush = new wxBrush(wxT("WHITE"), wxSOLID);
-  g_oglBlackForegroundPen = new wxPen(wxT("BLACK"), 1, wxSOLID);
-
-  OGLInitializeConstraintTypes();
-
-  // Initialize big buffer used when writing images
-  oglBuffer = new wxChar[3000];
-
-}
-
-void wxOGLCleanUp()
-{
-    if (oglBuffer)
-    {
-        delete[] oglBuffer;
-        oglBuffer = NULL;
-    }
-    oglBuffer = NULL;
-
-    if (g_oglBullseyeCursor)
-    {
-        delete g_oglBullseyeCursor;
-        g_oglBullseyeCursor = NULL;
-    }
-
-    if (g_oglNormalFont)
-    {
-        delete g_oglNormalFont;
-        g_oglNormalFont = NULL;
-    }
-    if (g_oglBlackPen)
-    {
-        delete g_oglBlackPen;
-        g_oglBlackPen = NULL;
-    }
-    if (g_oglWhiteBackgroundPen)
-    {
-        delete g_oglWhiteBackgroundPen;
-        g_oglWhiteBackgroundPen = NULL;
-    }
-    if (g_oglTransparentPen)
-    {
-        delete g_oglTransparentPen;
-        g_oglTransparentPen = NULL;
-    }
-    if (g_oglWhiteBackgroundBrush)
-    {
-        delete g_oglWhiteBackgroundBrush;
-        g_oglWhiteBackgroundBrush = NULL;
-    }
-    if (g_oglBlackForegroundPen)
-    {
-        delete g_oglBlackForegroundPen;
-        g_oglBlackForegroundPen = NULL;
-    }
-
-    OGLCleanUpConstraintTypes();
-}
-
-wxFont *oglMatchFont(int point_size)
-{
-  wxFont *font = wxTheFontList->FindOrCreateFont(point_size, wxSWISS, wxNORMAL, wxNORMAL);
-#if 0
-  switch (point_size)
-  {
-    case 4:
-      font = swiss_font_4;
-      break;
-    case 6:
-      font = swiss_font_6;
-      break;
-    case 8:
-      font = swiss_font_8;
-      break;
-    case 12:
-      font = swiss_font_12;
-      break;
-    case 14:
-      font = swiss_font_14;
-      break;
-    case 18:
-      font = swiss_font_18;
-      break;
-    case 24:
-      font = swiss_font_24;
-      break;
-    default:
-    case 10:
-      font = swiss_font_10;
-      break;
-  }
-#endif
-  return font;
-}
-
-int FontSizeDialog(wxFrame *parent, int old_size)
-{
-  if (old_size <= 0)
-    old_size = 10;
-  wxString buf;
-  buf << old_size;
-  wxString ans = wxGetTextFromUser(wxT("Enter point size"), wxT("Font size"), buf, parent);
-  if (ans.Length() == 0)
-    return 0;
-
-  long new_size = 0;
-  ans.ToLong(&new_size);
-  if ((new_size <= 0) || (new_size > 40))
-  {
-    wxMessageBox(wxT("Invalid point size!"), wxT("Error"), wxOK);
-    return 0;
-  }
-  return new_size;
-/*
-  char *strings[8];
-  strings[0] = "4";
-  strings[1] = "6";
-  strings[2] = "8";
-  strings[3] = "10";
-  strings[4] = "12";
-  strings[5] = "14";
-  strings[6] = "18";
-  strings[7] = "24";
-  char *ans = wxGetSingleChoice("Choose", "Choose a font size", 8, strings, parent);
-  if (ans)
-  {
-    int size;
-    sscanf(ans, "%d", &size);
-    return oglMatchFont(size);
-  }
-  else return NULL;
-*/
-}
-
-// Centre a list of strings in the given box. xOffset and yOffset are the
-// the positions that these lines should be relative to, and this might be
-// the same as m_xpos, m_ypos, but might be zero if formatting from left-justifying.
-void oglCentreText(wxDC& dc, wxList *text_list,
-                double m_xpos, double m_ypos, double width, double height,
-                int formatMode)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-    return;
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  // Store text extents for speed
-  double *widths = new double[n];
-
-  wxObjectList::compatibility_iterator current = text_list->GetFirst();
-  int i = 0;
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-    widths[i] = current_width;
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-    i ++;
-  }
-
-  double max_height = n*char_height;
-
-  double xoffset, yoffset, xOffset, yOffset;
-
-  if (formatMode & FORMAT_CENTRE_VERT)
-  {
-    if (max_height < height)
-      yoffset = (double)(m_ypos - (height/2.0) + (height - max_height)/2.0);
-    else
-      yoffset = (double)(m_ypos - (height/2.0));
-    yOffset = m_ypos;
-  }
-  else
-  {
-    yoffset = 0.0;
-    yOffset = 0.0;
-  }
-
-  if (formatMode & FORMAT_CENTRE_HORIZ)
-  {
-    xoffset = (double)(m_xpos - width/2.0);
-    xOffset = m_xpos;
-  }
-  else
-  {
-    xoffset = 0.0;
-    xOffset = 0.0;
-  }
-
-  current = text_list->GetFirst();
-  i = 0;
-
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    double x;
-    if ((formatMode & FORMAT_CENTRE_HORIZ) && (widths[i] < width))
-      x = (double)((width - widths[i])/2.0 + xoffset);
-    else
-      x = xoffset;
-    double y = (double)(i*char_height + yoffset);
-
-    line->SetX( x - xOffset ); line->SetY( y - yOffset );
-    current = current->GetNext();
-    i ++;
-  }
-
-  delete[] widths;
-}
-
-// Centre a list of strings in the given box
-void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
-                              double m_xpos, double m_ypos, double width, double height)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-    return;
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  // Store text extents for speed
-  double *widths = new double[n];
-
-  wxObjectList::compatibility_iterator current = text_list->GetFirst();
-  int i = 0;
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-    widths[i] = current_width;
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-    i ++;
-  }
-
-  double max_height = n*char_height;
-
-  double yoffset = (double)(m_ypos - (height/2.0) + (height - max_height)/2.0);
-
-  double xoffset = (double)(m_xpos - width/2.0);
-
-  current = text_list->GetFirst();
-  i = 0;
-
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    double x = (double)((width - widths[i])/2.0 + xoffset);
-    double y = (double)(i*char_height + yoffset);
-
-    line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
-    current = current->GetNext();
-    i ++;
-  }
-  delete widths;
-}
-
-void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
-                              double WXUNUSED(m_xpos), double WXUNUSED(m_ypos), double WXUNUSED(width), double WXUNUSED(height),
-                              double *actual_width, double *actual_height)
-{
-  int n = text_list->GetCount();
-
-  if (!text_list || (n == 0))
-  {
-    *actual_width = 0;
-    *actual_height = 0;
-    return;
-  }
-
-  // First, get maximum dimensions of box enclosing text
-
-  long char_height = 0;
-  long max_width = 0;
-  long current_width = 0;
-
-  wxObjectList::compatibility_iterator current = text_list->GetFirst();
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-    dc.GetTextExtent(line->GetText(), &current_width, &char_height);
-
-    if (current_width > max_width)
-      max_width = current_width;
-    current = current->GetNext();
-  }
-
-  *actual_height = n*char_height;
-  *actual_width = max_width;
-}
-
-// Format a string to a list of strings that fit in the given box.
-// Interpret %n and 10 or 13 as a new line.
-wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double WXUNUSED(height), int formatMode)
-{
-  // First, parse the string into a list of words
-  wxStringList word_list;
-
-  // Make new lines into NULL strings at this point
-  int i = 0; int j = 0; int len = text.Length();
-  wxChar word[400]; word[0] = 0;
-  bool end_word = false; bool new_line = false;
-  while (i < len)
-  {
-    switch (text[i])
-    {
-      case wxT('%'):
-      {
-        i ++;
-        if (i == len)
-        { word[j] = wxT('%'); j ++; }
-        else
-        {
-          if (text[i] == wxT('n'))
-          { new_line = true; end_word = true; i++; }
-          else
-          { word[j] = wxT('%'); j ++; word[j] = text[i]; j ++; i ++; }
-        }
-        break;
-      }
-      case 10:
-      {
-        new_line = true; end_word = true; i++;
-        break;
-      }
-      case 13:
-      {
-        new_line = true; end_word = true; i++;
-        break;
-      }
-      case wxT(' '):
-      {
-        end_word = true;
-        i ++;
-        break;
-      }
-      default:
-      {
-        word[j] = text[i];
-        j ++; i ++;
-        break;
-      }
-    }
-    if (i == len) end_word = true;
-    if (end_word)
-    {
-      word[j] = 0;
-      j = 0;
-      word_list.Add(word);
-      end_word = false;
-    }
-    if (new_line)
-    {
-      word_list.Append(NULL);
-      new_line = false;
-    }
-  }
-  // Now, make a list of strings which can fit in the box
-  wxStringList *string_list = new wxStringList;
-
-  wxString buffer;
-  wxStringList::compatibility_iterator node = word_list.GetFirst();
-  long x, y;
-
-  while (node)
-  {
-    wxString oldBuffer(buffer);
-
-    wxString s = node->GetData();
-    if (s.empty())
-    {
-      // FORCE NEW LINE
-      if (buffer.Length() > 0)
-        string_list->Add(buffer);
-
-      buffer.Empty();
-    }
-    else
-    {
-      if (buffer.Length() != 0)
-        buffer += wxT(" ");
-
-      buffer += s;
-      dc.GetTextExtent(buffer, &x, &y);
-
-      // Don't fit within the bounding box if we're fitting shape to contents
-      if ((x > width) && !(formatMode & FORMAT_SIZE_TO_CONTENTS))
-      {
-        // Deal with first word being wider than box
-        if (oldBuffer.Length() > 0)
-          string_list->Add(oldBuffer);
-
-        buffer.Empty();
-        buffer += s;
-      }
-    }
-
-    node = node->GetNext();
-  }
-  if (buffer.Length() != 0)
-    string_list->Add(buffer);
-
-  return string_list;
-}
-
-void oglDrawFormattedText(wxDC& dc, wxList *text_list,
-                       double m_xpos, double m_ypos, double width, double height,
-                       int formatMode)
-{
-  double xoffset, yoffset;
-  if (formatMode & FORMAT_CENTRE_HORIZ)
-    xoffset = m_xpos;
-  else
-    xoffset = (double)(m_xpos - (width / 2.0));
-
-  if (formatMode & FORMAT_CENTRE_VERT)
-    yoffset = m_ypos;
-  else
-    yoffset = (double)(m_ypos - (height / 2.0));
-
-  dc.SetClippingRegion(
-                    (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
-                    (long)width+1, (long)height+1); // +1 to allow for rounding errors
-
-  wxObjectList::compatibility_iterator current = text_list->GetFirst();
-  while (current)
-  {
-    wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
-
-    dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
-    current = current->GetNext();
-  }
-
-  dc.DestroyClippingRegion();
-}
-
-/*
- * Find centroid given list of points comprising polyline
- *
- */
-
-void oglFindPolylineCentroid(wxList *points, double *x, double *y)
-{
-  double xcount = 0;
-  double ycount = 0;
-
-  wxObjectList::compatibility_iterator node = points->GetFirst();
-  while (node)
-  {
-    wxRealPoint *point = (wxRealPoint *)node->GetData();
-    xcount += point->x;
-    ycount += point->y;
-    node = node->GetNext();
-  }
-
-  *x = (xcount/points->GetCount());
-  *y = (ycount/points->GetCount());
-}
-
-/*
- * Check that (x1, y1) -> (x2, y2) hits (x3, y3) -> (x4, y4).
- * If so, ratio1 gives the proportion along the first line
- * that the intersection occurs (or something like that).
- * Used by functions below.
- *
- */
-void oglCheckLineIntersection(double x1, double y1, double x2, double y2,
-                             double x3, double y3, double x4, double y4,
-                             double *ratio1, double *ratio2)
-{
-  double denominator_term = (y4 - y3)*(x2 - x1) - (y2 - y1)*(x4 - x3);
-  double numerator_term = (x3 - x1)*(y4 - y3) + (x4 - x3)*(y1 - y3);
-
-  double line_constant;
-  double length_ratio = 1.0;
-  double k_line = 1.0;
-
-  // Check for parallel lines
-  if ((denominator_term < 0.005) && (denominator_term > -0.005))
-    line_constant = -1.0;
-  else
-    line_constant = numerator_term/denominator_term;
-
-  // Check for intersection
-  if ((line_constant < 1.0) && (line_constant > 0.0))
-  {
-    // Now must check that other line hits
-    if (((y4 - y3) < 0.005) && ((y4 - y3) > -0.005))
-      k_line = ((x1 - x3) + line_constant*(x2 - x1))/(x4 - x3);
-    else
-      k_line = ((y1 - y3) + line_constant*(y2 - y1))/(y4 - y3);
-
-    if ((k_line >= 0.0) && (k_line < 1.0))
-      length_ratio = line_constant;
-    else
-      k_line = 1.0;
-  }
-  *ratio1 = length_ratio;
-  *ratio2 = k_line;
-}
-
-/*
- * Find where (x1, y1) -> (x2, y2) hits one of the lines in xvec, yvec.
- * (*x3, *y3) is the point where it hits.
- *
- */
-void oglFindEndForPolyline(double n, double xvec[], double yvec[],
-                           double x1, double y1, double x2, double y2, double *x3, double *y3)
-{
-  int i;
-  double lastx = xvec[0];
-  double lasty = yvec[0];
-
-  double min_ratio = 1.0;
-  double line_ratio;
-  double other_ratio;
-
-  for (i = 1; i < n; i++)
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[i], yvec[i],
-                            &line_ratio, &other_ratio);
-    lastx = xvec[i];
-    lasty = yvec[i];
-
-    if (line_ratio < min_ratio)
-      min_ratio = line_ratio;
-  }
-
-  // Do last (implicit) line if last and first doubles are not identical
-  if (!(xvec[0] == lastx && yvec[0] == lasty))
-  {
-    oglCheckLineIntersection(x1, y1, x2, y2, lastx, lasty, xvec[0], yvec[0],
-                            &line_ratio, &other_ratio);
-
-    if (line_ratio < min_ratio)
-      min_ratio = line_ratio;
-  }
-
-  *x3 = (x1 + (x2 - x1)*min_ratio);
-  *y3 = (y1 + (y2 - y1)*min_ratio);
-
-}
-
-/*
- * Find where the line hits the box.
- *
- */
-
-void oglFindEndForBox(double width, double height,
-                      double x1, double y1,         // Centre of box (possibly)
-                      double x2, double y2,         // other end of line
-                      double *x3, double *y3)       // End on box edge
-{
-  double xvec[5];
-  double yvec[5];
-
-  xvec[0] = (double)(x1 - width/2.0);
-  yvec[0] = (double)(y1 - height/2.0);
-  xvec[1] = (double)(x1 - width/2.0);
-  yvec[1] = (double)(y1 + height/2.0);
-  xvec[2] = (double)(x1 + width/2.0);
-  yvec[2] = (double)(y1 + height/2.0);
-  xvec[3] = (double)(x1 + width/2.0);
-  yvec[3] = (double)(y1 - height/2.0);
-  xvec[4] = (double)(x1 - width/2.0);
-  yvec[4] = (double)(y1 - height/2.0);
-
-  oglFindEndForPolyline(5, xvec, yvec, x2, y2, x1, y1, x3, y3);
-}
-
-/*
- * Find where the line hits the circle.
- *
- */
-
-void oglFindEndForCircle(double radius,
-                         double x1, double y1,  // Centre of circle
-                         double x2, double y2,  // Other end of line
-                         double *x3, double *y3)
-{
-  double H = (double)sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-
-  if (H == 0.0)
-  {
-    *x3 = x1;
-    *y3 = y1;
-  }
-  else
-  {
-   *y3 = radius * (y2 - y1)/H + y1;
-   *x3 = radius * (x2 - x1)/H + x1;
-  }
-}
-
-/*
- * Given the line (x1, y1) -> (x2, y2), and an arrow size of given length and width,
- * return the position of the tip of the arrow and the left and right vertices of the arrow.
- *
- */
-
-void oglGetArrowPoints(double x1, double y1, double x2, double y2,
-                      double length, double width,
-                      double *tip_x, double *tip_y,
-                      double *side1_x, double *side1_y,
-                      double *side2_x, double *side2_y)
-{
-  double l = (double)sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-
-  if (l < 0.01)
-    l = (double) 0.01;
-
-  double i_bar = (x2 - x1)/l;
-  double j_bar = (y2 - y1)/l;
-
-  double x3 = (- length*i_bar) + x2;
-  double y3 = (- length*j_bar) + y2;
-
-  *side1_x = width*(-j_bar) + x3;
-  *side1_y = width*i_bar + y3;
-
-  *side2_x = -width*(-j_bar) + x3;
-  *side2_y = -width*i_bar + y3;
-
-  *tip_x = x2; *tip_y = y2;
-}
-
-/*
- * Given an ellipse and endpoints of a line, returns the point at which
- * the line touches the ellipse in values x4, y4.
- * This function assumes that the centre of the ellipse is at x1, y1, and the
- * ellipse has a width of width1 and a height of height1. It also assumes you are
- * wanting to draw an arc FROM point x2, y2 TOWARDS point x3, y3.
- * This function calculates the x,y coordinates of the intersection point of
- * the arc with the ellipse.
- * Author: Ian Harrison
- */
-
-void oglDrawArcToEllipse(double x1, double y1, double width1, double height1, double x2, double y2, double x3, double y3,
-  double *x4, double *y4)
-{
-  double a1 = (double)(width1/2.0);
-  double b1 = (double)(height1/2.0);
-
-  // These are required to give top left x and y coordinates for DrawEllipse
-//  double top_left_x1 = (double)(x1 - a1);
-//  double top_left_y1 = (double)(y1 - b1);
-/*
-  // Check for vertical line
-  if (fabs(x2 - x3) < 0.05)
-  {
-    *x4 = x3;
-    if (y2 < y3)
-      *y4 = (double)(y1 - b1);
-    else
-      *y4 = (double)(y1 + b1);
-    return;
-  }
-*/
-  // Check that x2 != x3
-  if (fabs(x2 - x3) < 0.05)
-  {
-    *x4 = x2;
-    if (y3 > y2)
-      *y4 = (double)(y1 - sqrt((b1*b1 - (((x2-x1)*(x2-x1))*(b1*b1)/(a1*a1)))));
-    else
-      *y4 = (double)(y1 + sqrt((b1*b1 - (((x2-x1)*(x2-x1))*(b1*b1)/(a1*a1)))));
-    return;
-  }
-
-  // Calculate the x and y coordinates of the point where arc intersects ellipse
-
-  double A, B, C, D, E, F, G, H, K;
-  double ellipse1_x, ellipse1_y;
-
-  A = (double)(1/(a1 * a1));
-  B = (double)((y3 - y2) * (y3 - y2)) / ((x3 - x2) * (x3 - x2) * b1 * b1);
-  C = (double)(2 * (y3 - y2) * (y2 - y1)) / ((x3 - x2) * b1 * b1);
-  D = (double)((y2 - y1) * (y2 - y1)) / (b1 * b1);
-  E = (double)(A + B);
-  F = (double)(C - (2 * A * x1) - (2 * B * x2));
-  G = (double)((A * x1 * x1) + (B * x2 * x2) - (C * x2) + D - 1);
-  H = (double)((y3 - y2) / (x3 - x2));
-  K = (double)((F * F) - (4 * E * G));
-
-  if (K >= 0)
-  // In this case the line intersects the ellipse, so calculate intersection
-  {
-    if(x2 >= x1)
-    {
-      ellipse1_x = (double)(((F * -1) + sqrt(K)) / (2 * E));
-      ellipse1_y = (double)((H * (ellipse1_x - x2)) + y2);
-    }
-    else
-    {
-      ellipse1_x = (double)(((F * -1) -  sqrt(K)) / (2 * E));
-      ellipse1_y = (double)((H * (ellipse1_x - x2)) + y2);
-    }
-  }
-  else
-  // in this case, arc does not intersect ellipse, so just draw arc
-  {
-    ellipse1_x = x3;
-    ellipse1_y = y3;
-  }
-  *x4 = ellipse1_x;
-  *y4 = ellipse1_y;
-
-/*
-  // Draw a little circle (radius = 2) at the end of the arc where it hits
-  // the ellipse .
-
-  double circle_x = ellipse1_x - 2.0;
-  double circle_y = ellipse1_y - 2.0;
-  m_canvas->DrawEllipse(circle_x, circle_y, 4.0, 4.0);
-*/
-}
-
-// Update a list item from a list of strings
-void UpdateListBox(wxListBox *item, wxList *list)
-{
-  item->Clear();
-  if (!list)
-    return;
-
-  wxObjectList::compatibility_iterator node = list->GetFirst();
-  while (node)
-  {
-    wxChar *s = (wxChar *)node->GetData();
-    item->Append(s);
-    node = node->GetNext();
-  }
-}
-
-bool oglRoughlyEqual(double val1, double val2, double tol)
-{
-    return ( (val1 < (val2 + tol)) && (val1 > (val2 - tol)) &&
-             (val2 < (val1 + tol)) && (val2 > (val1 - tol)));
-}
-
-/*
- * Hex<->Dec conversion
- */
-
-// Array used in DecToHex conversion routine.
-static wxChar sg_HexArray[] = { wxT('0'), wxT('1'), wxT('2'), wxT('3'),
-                                wxT('4'), wxT('5'), wxT('6'), wxT('7'),
-                                wxT('8'), wxT('9'), wxT('A'), wxT('B'),
-                                wxT('C'), wxT('D'), wxT('E'), wxT('F')
-};
-
-// Convert 2-digit hex number to decimal
-unsigned int oglHexToDec(wxChar* buf)
-{
-  int firstDigit, secondDigit;
-
-  if (buf[0] >= wxT('A'))
-    firstDigit = buf[0] - wxT('A') + 10;
-  else
-    firstDigit = buf[0] - wxT('0');
-
-  if (buf[1] >= wxT('A'))
-    secondDigit = buf[1] - wxT('A') + 10;
-  else
-    secondDigit = buf[1] - wxT('0');
-
-  return firstDigit * 16 + secondDigit;
-}
-
-// Convert decimal integer to 2-character hex string
-void oglDecToHex(unsigned int dec, wxChar *buf)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = sg_HexArray[firstDigit];
-    buf[1] = sg_HexArray[secondDigit];
-    buf[2] = 0;
-}
-
-// 3-digit hex to wxColour
-wxColour oglHexToColour(const wxString& hex)
-{
-    if (hex.Length() == 6)
-    {
-        long r, g, b;
-        r = g = b = 0;
-        hex.Mid(0,2).ToLong(&r, 16);
-        hex.Mid(2,2).ToLong(&g, 16);
-        hex.Mid(4,2).ToLong(&b, 16);
-        return wxColour((unsigned char)r,
-                        (unsigned char)g,
-                        (unsigned char)b);
-    }
-    else
-        return *wxBLACK;
-}
-
-// RGB to 3-digit hex
-wxString oglColourToHex(const wxColour& colour)
-{
-    wxChar buf[7];
-    unsigned int red = colour.Red();
-    unsigned int green = colour.Green();
-    unsigned int blue = colour.Blue();
-
-    oglDecToHex(red, buf);
-    oglDecToHex(green, buf+2);
-    oglDecToHex(blue, buf+4);
-
-    return wxString(buf);
-}
-
-
diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in
deleted file mode 100644
index 45dbddce73..0000000000
--- a/contrib/src/plot/Makefile.in
+++ /dev/null
@@ -1,290 +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@
-BK_MAKE_PCH = @BK_MAKE_PCH@
-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.9
-WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
-LIBDIRNAME = $(wx_top_builddir)/lib
-PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
-	-DWXMAKINGDLL_PLOT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-PLOTDLL_OBJECTS =  \
-	$(__plotdll___win32rc) \
-	plotdll_plot.o
-PLOTDLL_ODEP =  $(___pch_wxprec_plotdll_wx_wxprec_h_gch___depname)
-PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-PLOTLIB_OBJECTS =  \
-	plotlib_plot.o
-PLOTLIB_ODEP =  $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname)
-
-### 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_VERSION_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___plotdll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
-@COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___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_plotdll___depname = install_plotdll
-@COND_SHARED_1@__uninstall_plotdll___depname = uninstall_plotdll
-COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__plotdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___plotdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__plotdll___importlib = $(COND_PLATFORM_OS2_1___plotdll___importlib)
-COND_WINDOWS_IMPLIB_1___plotdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__plotdll___importlib = $(COND_WINDOWS_IMPLIB_1___plotdll___importlib)
-@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll
-@COND_ICC_PCH_1@__plotdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_plotdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_plotdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_plotdll/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@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_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.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)
-COND_USE_SOVERLINUX_1___plotdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__plotdll___soname_flags = $(COND_USE_SOVERLINUX_1___plotdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__plotdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___plotdll___soname_flags)
-COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_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___plotlib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__plotlib___depname = $(COND_SHARED_0___plotlib___depname)
-@COND_SHARED_0@__install_plotlib___depname = install_plotlib
-@COND_SHARED_0@__uninstall_plotlib___depname = uninstall_plotlib
-@COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib
-@COND_ICC_PCH_1@__plotlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@	.pch/wxprec_plotlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_plotlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@	= .pch/wxprec_plotlib/wx/wxprec.h.gch
-@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: $(__plotdll___depname) $(__plotlib___depname)
-
-install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; 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_plotdll___depname) $(__uninstall_plotlib___depname)
-	for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; 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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___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@	$(__plotdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_plotdll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_plotdll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS)
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(PLOTLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(PLOTLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_plotlib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_plotlib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@	$(BK_MAKE_PCH) .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS)
-
-plotdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(PLOTDLL_ODEP)
-	$(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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-plotdll_plot.o: $(srcdir)/plot.cpp $(PLOTDLL_ODEP)
-	$(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $(srcdir)/plot.cpp
-
-plotlib_plot.o: $(srcdir)/plot.cpp $(PLOTLIB_ODEP)
-	$(CXXC) -c -o $@ $(PLOTLIB_CXXFLAGS) $(srcdir)/plot.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_plotdll uninstall_plotdll install_plotlib uninstall_plotlib
diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
deleted file mode 100644
index 8a52aa8be5..0000000000
--- a/contrib/src/plot/plot.cpp
+++ /dev/null
@@ -1,1194 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        plot.cpp
-// Purpose:     wxPlotWindow
-// Author:      Robert Roebling
-// Modified by:
-// Created:     12/01/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/object.h"
-#include "wx/font.h"
-#include "wx/colour.h"
-#include "wx/settings.h"
-#include "wx/sizer.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/dcclient.h"
-#include "wx/stattext.h"
-#endif
-
-#include "wx/plot/plot.h"
-#include "wx/bmpbuttn.h"
-#include "wx/module.h"
-
-#include <math.h>
-
-// ----------------------------------------------------------------------------
-// XPMs
-// ----------------------------------------------------------------------------
-
-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    #include "wx/plot/plot_enl.xpm"
-    #include "wx/plot/plot_shr.xpm"
-    #include "wx/plot/plot_zin.xpm"
-    #include "wx/plot/plot_zot.xpm"
-    #include "wx/plot/plot_up.xpm"
-    #include "wx/plot/plot_dwn.xpm"
-#endif
-
-//----------------------------------------------------------------------------
-// event types
-//----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_CLICKED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_DOUBLECLICKED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_IN)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_OUT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATING)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATING)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_X_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_X_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_Y_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_TITLE_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_TITLE_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_CREATE)
-
-//----------------------------------------------------------------------------
-// accessor functions for the bitmaps (may return NULL, check for it!)
-//----------------------------------------------------------------------------
-
-static wxBitmap *GetEnlargeBitmap();
-static wxBitmap *GetShrinkBitmap();
-static wxBitmap *GetZoomInBitmap();
-static wxBitmap *GetZoomOutBitmap();
-static wxBitmap *GetUpBitmap();
-static wxBitmap *GetDownBitmap();
-
-//-----------------------------------------------------------------------------
-// consts
-//-----------------------------------------------------------------------------
-
-#define wxPLOT_SCROLL_STEP  30
-
-//-----------------------------------------------------------------------------
-// wxPlotEvent
-//-----------------------------------------------------------------------------
-
-wxPlotEvent::wxPlotEvent( wxEventType commandType, int id )
-    : wxNotifyEvent( commandType, id )
-{
-    m_curve = (wxPlotCurve*) NULL;
-    m_zoom = 1.0;
-    m_position = 0;
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotCurve
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPlotCurve, wxObject)
-
-wxPlotCurve::wxPlotCurve( int offsetY, double startY, double endY )
-: m_penNormal(*wxGREY_PEN), m_penSelected(*wxBLACK_PEN)
-{
-    m_offsetY = offsetY;
-    m_startY = startY;
-    m_endY = endY;
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotOnOffCurve
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPlotOnOffCurve, wxObject)
-
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayPlotOnOff);
-
-wxPlotOnOffCurve::wxPlotOnOffCurve( int offsetY )
-{
-    m_offsetY = offsetY;
-    m_minX = -1;
-    m_maxX = -1;
-}
-
-void wxPlotOnOffCurve::Add( wxInt32 on, wxInt32 off, void *clientData )
-{
-    wxASSERT_MSG( on > 0, _T("plot index < 0") );
-    wxASSERT( on <= off );
-
-    if (m_minX == -1)
-        m_minX = on;
-    if (off > m_maxX)
-        m_maxX = off;
-
-    wxPlotOnOff *v = new wxPlotOnOff;
-    v->m_on = on;
-    v->m_off = off;
-    v->m_clientData = clientData;
-    m_marks.Add( v );
-}
-
-size_t wxPlotOnOffCurve::GetCount()
-{
-    return m_marks.GetCount();
-}
-
-wxInt32 wxPlotOnOffCurve::GetOn( size_t index )
-{
-    wxPlotOnOff *v = &m_marks.Item( index );
-    return v->m_on;
-}
-
-wxInt32 wxPlotOnOffCurve::GetOff( size_t index )
-{
-    wxPlotOnOff *v = &m_marks.Item( index );
-    return v->m_off;
-}
-
-void* wxPlotOnOffCurve::GetClientData( size_t index )
-{
-    wxPlotOnOff *v = &m_marks.Item( index );
-    return v->m_clientData;
-}
-
-wxPlotOnOff *wxPlotOnOffCurve::GetAt( size_t index )
-{
-    return &m_marks.Item( index );
-}
-
-void wxPlotOnOffCurve::DrawOnLine( wxDC &dc, wxCoord y, wxCoord start, wxCoord end, void *WXUNUSED(clientData) )
-{
-    dc.DrawLine( start, y, start, y-30 );
-    dc.DrawLine( start, y-30, end, y-30 );
-    dc.DrawLine( end, y-30, end, y );
-}
-
-void wxPlotOnOffCurve::DrawOffLine( wxDC &dc, wxCoord y, wxCoord start, wxCoord end )
-{
-    dc.DrawLine( start, y, end, y );
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotArea
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPlotArea, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPlotArea, wxWindow)
-    EVT_PAINT(        wxPlotArea::OnPaint)
-    EVT_LEFT_DOWN(    wxPlotArea::OnMouse)
-    EVT_LEFT_DCLICK(  wxPlotArea::OnMouse)
-END_EVENT_TABLE()
-
-wxPlotArea::wxPlotArea( wxPlotWindow *parent )
-        : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") )
-{
-    m_owner = parent;
-
-    m_zooming = false;
-
-    SetBackgroundColour( *wxWHITE );
-}
-
-void wxPlotArea::OnMouse( wxMouseEvent &event )
-{
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-    view_y *= wxPLOT_SCROLL_STEP;
-
-    wxCoord x = event.GetX();
-    wxCoord y = event.GetY();
-    x += view_x;
-    y += view_y;
-
-    wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();
-    while (node)
-    {
-        wxPlotCurve *curve = (wxPlotCurve*)node->GetData();
-
-        double double_client_height = (double)client_height;
-        double range = curve->GetEndY() - curve->GetStartY();
-        double end = curve->GetEndY();
-        wxCoord offset_y = curve->GetOffsetY();
-
-        double dy = (end - curve->GetY( (wxInt32)(x/m_owner->GetZoom()) )) / range;
-        wxCoord curve_y = (wxCoord)(dy * double_client_height) - offset_y - 1;
-
-        if ((y-curve_y < 4) && (y-curve_y > -4))
-        {
-            wxPlotEvent event1( event.ButtonDClick() ? wxEVT_PLOT_DOUBLECLICKED : wxEVT_PLOT_CLICKED, m_owner->GetId() );
-            event1.SetEventObject( m_owner );
-            event1.SetZoom( m_owner->GetZoom() );
-            event1.SetCurve( curve );
-            event1.SetPosition( (int)floor(x/m_owner->GetZoom()) );
-            m_owner->GetEventHandler()->ProcessEvent( event1 );
-
-            if (curve != m_owner->GetCurrentCurve())
-            {
-                wxPlotEvent event2( wxEVT_PLOT_SEL_CHANGING, m_owner->GetId() );
-                event2.SetEventObject( m_owner );
-                event2.SetZoom( m_owner->GetZoom() );
-                event2.SetCurve( curve );
-                if (!m_owner->GetEventHandler()->ProcessEvent( event2 ) || event2.IsAllowed())
-                {
-                    m_owner->SetCurrentCurve( curve );
-                }
-            }
-            return;
-        }
-
-        node = node->GetNext();
-    }
-}
-
-void wxPlotArea::DeleteCurve( wxPlotCurve *curve, int from, int to )
-{
-    wxClientDC dc(this);
-    m_owner->PrepareDC( dc );
-    dc.SetPen( *wxWHITE_PEN );
-    DrawCurve( &dc, curve, from, to );
-}
-
-void wxPlotArea::DrawCurve( wxDC *dc, wxPlotCurve *curve, int from, int to )
-{
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-
-    if (from == -1)
-        from = view_x;
-
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-
-    if (to == -1)
-        to = view_x + client_width;
-
-    double zoom = m_owner->GetZoom();
-
-    int start_x = wxMax( from, (int)floor(curve->GetStartX()*zoom) );
-    int end_x = wxMin( to, (int)floor(curve->GetEndX()*zoom) );
-
-    start_x = wxMax( view_x, start_x );
-    end_x = wxMin( view_x + client_width, end_x );
-
-    end_x++;
-
-    double double_client_height = (double)client_height;
-    double range = curve->GetEndY() - curve->GetStartY();
-    double end = curve->GetEndY();
-    wxCoord offset_y = curve->GetOffsetY();
-
-    wxCoord last_y=0;
-    for (int x = start_x; x < end_x; x++)
-    {
-        double dy = (end - curve->GetY( (wxInt32)(x/zoom) )) / range;
-        wxCoord y = (wxCoord)(dy * double_client_height) - offset_y - 1;
-
-        if (x != start_x)
-           dc->DrawLine( x-1, last_y, x, y );
-
-        last_y = y;
-    }
-}
-
-void wxPlotArea::DrawOnOffCurve( wxDC *dc, wxPlotOnOffCurve *curve, int from, int to )
-{
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-
-    if (from == -1)
-        from = view_x;
-
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-
-    if (to == -1)
-        to = view_x + client_width;
-
-    double zoom = m_owner->GetZoom();
-
-    int start_x = wxMax( from, (int)floor(curve->GetStartX()*zoom) );
-    int end_x = wxMin( to, (int)floor(curve->GetEndX()*zoom) );
-
-    start_x = wxMax( view_x, start_x );
-    end_x = wxMin( view_x + client_width, end_x );
-
-    end_x++;
-
-    wxCoord offset_y = curve->GetOffsetY();
-    wxCoord last_off = -5;
-
-    if (curve->GetCount() == 0)
-        return;
-
-    for (size_t index = 0; index < curve->GetCount(); index++)
-    {
-        wxPlotOnOff *p = curve->GetAt( index );
-
-        wxCoord on = (wxCoord)(p->m_on*zoom);
-        wxCoord off = (wxCoord)(p->m_off*zoom);
-
-        if (end_x < on)
-        {
-            curve->DrawOffLine( *dc, client_height-offset_y, last_off, on );
-            break;
-        }
-
-        if (off >= start_x)
-        {
-            curve->DrawOffLine( *dc, client_height-offset_y, last_off, on );
-            curve->DrawOnLine( *dc, client_height-offset_y, on, off, p->m_clientData );
-        }
-        last_off = off;
-    }
-
-    wxPlotOnOff *p = curve->GetAt( curve->GetCount()-1 );
-    wxCoord off = (wxCoord)(p->m_off*zoom);
-    if (off < end_x)
-        curve->DrawOffLine( *dc, client_height-offset_y, off, to );
-}
-
-void wxPlotArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-    view_y *= wxPLOT_SCROLL_STEP;
-
-    wxPaintDC dc( this );
-    m_owner->PrepareDC( dc );
-
-    wxRegionIterator upd( GetUpdateRegion() );
-
-    while (upd)
-    {
-        int update_x = upd.GetX() + view_x;
-        int update_width = upd.GetWidth();
-
-/*
-        if (m_owner->m_current)
-        {
-            dc.SetPen( *wxLIGHT_GREY_PEN );
-            int base_line = client_height - m_owner->m_current->GetOffsetY();
-            dc.DrawLine( update_x-1, base_line-1, update_x+update_width+2, base_line-1 );
-        }
-*/
-
-        wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();
-        while (node)
-        {
-            wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
-
-            if (curve == m_owner->GetCurrentCurve())
-                dc.SetPen( curve->GetPenSelected() );
-            else
-                dc.SetPen( curve->GetPenNormal() );
-
-            DrawCurve( &dc, curve, update_x-1, update_x+update_width+2 );
-
-            node = node->GetNext();
-        }
-
-        dc.SetPen( *wxRED_PEN );
-
-        node = m_owner->m_onOffCurves.GetFirst();
-        while (node)
-        {
-            wxPlotOnOffCurve *curve = (wxPlotOnOffCurve*) node->GetData();
-
-            DrawOnOffCurve( &dc, curve, update_x-1, update_x+update_width+2 );
-
-            node = node->GetNext();
-        }
-
-        upd ++;
-    }
-}
-
-void wxPlotArea::ScrollWindow( int dx, int dy, const wxRect *rect )
-{
-    wxWindow::ScrollWindow( dx, dy, rect );
-//    m_owner->m_xaxis->ScrollWindow( dx, 0 );
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotXAxisArea
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPlotXAxisArea, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPlotXAxisArea, wxWindow)
-  EVT_PAINT(        wxPlotXAxisArea::OnPaint)
-  EVT_LEFT_DOWN(    wxPlotXAxisArea::OnMouse)
-END_EVENT_TABLE()
-
-wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent )
-        : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,40), 0, _T("plotxaxisarea") )
-{
-    m_owner = parent;
-
-    SetBackgroundColour( *wxWHITE );
-    SetFont( *wxSMALL_FONT );
-}
-
-void wxPlotXAxisArea::OnMouse( wxMouseEvent &event )
-{
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-    view_y *= wxPLOT_SCROLL_STEP;
-
-    wxCoord x = event.GetX() + view_x;
-    wxCoord y = event.GetY() + view_y;
-
-    /* TO DO: do something here */
-    wxUnusedVar(x);
-    wxUnusedVar(y);
-}
-
-void wxPlotXAxisArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    int view_x;
-    int view_y;
-    m_owner->GetViewStart( &view_x, &view_y );
-    view_x *= wxPLOT_SCROLL_STEP;
-    view_y *= wxPLOT_SCROLL_STEP;
-
-    wxPaintDC dc( this );
-
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-
-    double zoom = m_owner->GetZoom();
-
-    double ups = m_owner->GetUnitsPerValue() / zoom;
-
-    double start = view_x * ups;
-    double end = (view_x + client_width) * ups;
-    double range = end - start;
-
-    int int_log_range = (int)floor( log10( range ) );
-    double step = 1.0;
-    if (int_log_range > 0)
-    {
-        for (int i = 0; i < int_log_range; i++)
-           step *= 10;
-    }
-    if (int_log_range < 0)
-    {
-        for (int i = 0; i < -int_log_range; i++)
-           step /= 10;
-    }
-    double lower = ceil(start / step) * step;
-    double upper = floor(end / step) * step;
-
-    // if too few values, shrink size
-    if ((range/step) < 4)
-    {
-        step /= 2;
-        if (lower-step > start) lower -= step;
-        if (upper+step < end) upper += step;
-    }
-
-    // if still too few, again
-    if ((range/step) < 4)
-    {
-        step /= 2;
-        if (lower-step > start) lower -= step;
-        if (upper+step < end) upper += step;
-    }
-
-    dc.SetBrush( *wxWHITE_BRUSH );
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.DrawRectangle( 4, 5, client_width-14, 10 );
-    dc.DrawRectangle( 0, 20, client_width, 20 );
-    dc.SetPen( *wxBLACK_PEN );
-
-    double current = lower;
-    while (current < upper+(step/2))
-    {
-        int x = (int)ceil((current-start) / range * (double)client_width) - 1;
-        if ((x > 4) && (x < client_width-25))
-        {
-            dc.DrawLine( x, 5, x, 15 );
-            wxString label;
-            if (range < 50)
-            {
-                label.Printf( _T("%f"), current );
-                while (label.Last() == _T('0'))
-                    label.RemoveLast();
-                if ((label.Last() == _T('.')) || (label.Last() == _T(',')))
-                    label.Append( _T('0') );
-            }
-            else
-                label.Printf( _T("%d"), (int)floor(current) );
-            dc.DrawText( label, x-4, 20 );
-        }
-
-        current += step;
-    }
-
-    dc.DrawLine( 0, 15, client_width-8, 15 );
-    dc.DrawLine( client_width-4, 15, client_width-10, 10 );
-    dc.DrawLine( client_width-4, 15, client_width-10, 20 );
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotYAxisArea
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPlotYAxisArea, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPlotYAxisArea, wxWindow)
-  EVT_PAINT(        wxPlotYAxisArea::OnPaint)
-  EVT_LEFT_DOWN(    wxPlotYAxisArea::OnMouse)
-END_EVENT_TABLE()
-
-wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent )
-        : wxWindow( parent, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord), 0, _T("plotyaxisarea") )
-{
-    m_owner = parent;
-
-    SetBackgroundColour( *wxWHITE );
-    SetFont( *wxSMALL_FONT );
-}
-
-void wxPlotYAxisArea::OnMouse( wxMouseEvent &WXUNUSED(event) )
-{
-    /* do something here */
-}
-
-void wxPlotYAxisArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    wxPaintDC dc( this );
-
-    wxPlotCurve *curve = m_owner->GetCurrentCurve();
-
-    if (!curve) return;
-
-    int client_width;
-    int client_height;
-    GetClientSize( &client_width, &client_height);
-
-
-    double range = curve->GetEndY() - curve->GetStartY();
-    double offset = ((double) curve->GetOffsetY() / (double)client_height ) * range;
-    double start = curve->GetStartY() - offset;
-    double end = curve->GetEndY() - offset;
-
-    int int_log_range = (int)floor( log10( range ) );
-    double step = 1.0;
-    if (int_log_range > 0)
-    {
-        for (int i = 0; i < int_log_range; i++)
-           step *= 10;
-    }
-    if (int_log_range < 0)
-    {
-        for (int i = 0; i < -int_log_range; i++)
-           step /= 10;
-    }
-    double lower = ceil(start / step) * step;
-    double upper = floor(end / step) * step;
-
-    // if too few values, shrink size
-    if ((range/step) < 4)
-    {
-        step /= 2;
-        if (lower-step > start) lower -= step;
-        if (upper+step < end) upper += step;
-    }
-
-    // if still too few, again
-    if ((range/step) < 4)
-    {
-        step /= 2;
-        if (lower-step > start) lower -= step;
-        if (upper+step < end) upper += step;
-    }
-
-    dc.SetPen( *wxBLACK_PEN );
-
-    double current = lower;
-    while (current < upper+(step/2))
-    {
-        int y = (int)((curve->GetEndY()-current) / range * (double)client_height) - 1;
-        y -= curve->GetOffsetY();
-        if ((y > 10) && (y < client_height-7))
-        {
-            dc.DrawLine( client_width-15, y, client_width-7, y );
-            wxString label;
-            if (range < 50)
-            {
-                label.Printf( _T("%f"), current );
-                while (label.Last() == _T('0'))
-                    label.RemoveLast();
-                if ((label.Last() == _T('.')) || (label.Last() == _T(',')))
-                    label.Append( _T('0') );
-            }
-            else
-                label.Printf( _T("%d"), (int)floor(current) );
-            dc.DrawText( label, 5, y-7 );
-        }
-
-        current += step;
-    }
-
-    dc.DrawLine( client_width-15, 6, client_width-15, client_height );
-    dc.DrawLine( client_width-15, 2, client_width-20, 8 );
-    dc.DrawLine( client_width-15, 2, client_width-10, 8 );
-}
-
-//-----------------------------------------------------------------------------
-// wxPlotWindow
-//-----------------------------------------------------------------------------
-
-#define  ID_ENLARGE       1000
-#define  ID_SHRINK        1002
-
-#define  ID_MOVE_UP       1006
-#define  ID_MOVE_DOWN     1007
-
-#define  ID_ZOOM_IN       1010
-#define  ID_ZOOM_OUT      1011
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxPlotWindow, wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxPlotWindow, wxScrolledWindow)
-    EVT_BUTTON(  ID_MOVE_UP,     wxPlotWindow::OnMoveUp)
-    EVT_BUTTON(  ID_MOVE_DOWN,   wxPlotWindow::OnMoveDown)
-
-    EVT_BUTTON(  ID_ENLARGE,  wxPlotWindow::OnEnlarge)
-    EVT_BUTTON(  ID_SHRINK,   wxPlotWindow::OnShrink)
-
-    EVT_BUTTON(  ID_ZOOM_IN,     wxPlotWindow::OnZoomIn)
-    EVT_BUTTON(  ID_ZOOM_OUT,    wxPlotWindow::OnZoomOut)
-
-    EVT_SCROLLWIN( wxPlotWindow::OnScroll2)
-END_EVENT_TABLE()
-
-wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag )
-        : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ),
-          m_titleStaticText( NULL )
-{
-    m_xUnitsPerValue = 1.0;
-    m_xZoom = 1.0;
-
-    m_enlargeAroundWindowCentre = false;
-    m_scrollOnThumbRelease = false;
-
-    m_area = new wxPlotArea( this );
-    wxBoxSizer *mainsizer = new wxBoxSizer( wxHORIZONTAL );
-
-    if ((GetWindowStyleFlag() & wxPLOT_BUTTON_ALL) != 0)
-    {
-        wxBoxSizer *buttonlist = new wxBoxSizer( wxVERTICAL );
-        if ((GetWindowStyleFlag() & wxPLOT_BUTTON_ENLARGE) != 0)
-        {
-            buttonlist->Add( new wxBitmapButton( this, ID_ENLARGE, *GetEnlargeBitmap() ), 0, wxEXPAND|wxALL, 2 );
-            buttonlist->Add( new wxBitmapButton( this, ID_SHRINK, *GetShrinkBitmap() ), 0, wxEXPAND|wxALL, 2 );
-            buttonlist->Add( 20,10, 0 );
-        }
-        if ((GetWindowStyleFlag() & wxPLOT_BUTTON_MOVE) != 0)
-        {
-            buttonlist->Add( new wxBitmapButton( this, ID_MOVE_UP, *GetUpBitmap() ), 0, wxEXPAND|wxALL, 2 );
-            buttonlist->Add( new wxBitmapButton( this, ID_MOVE_DOWN, *GetDownBitmap() ), 0, wxEXPAND|wxALL, 2 );
-            buttonlist->Add( 20,10, 0 );
-        }
-        if ((GetWindowStyleFlag() & wxPLOT_BUTTON_ZOOM) != 0)
-        {
-            buttonlist->Add( new wxBitmapButton( this, ID_ZOOM_IN, *GetZoomInBitmap() ), 0, wxEXPAND|wxALL, 2 );
-            buttonlist->Add( new wxBitmapButton( this, ID_ZOOM_OUT, *GetZoomOutBitmap() ), 0, wxEXPAND|wxALL, 2 );
-        }
-        mainsizer->Add( buttonlist, 0, wxEXPAND|wxALL, 4 );
-    }
-
-    wxBoxSizer *plotsizer = new wxBoxSizer( wxHORIZONTAL );
-
-    //Add sizer to hold the title and plot.
-    //Title to be added later.
-    m_plotAndTitleSizer = new wxBoxSizer( wxVERTICAL );
-    m_plotAndTitleSizer->Add( plotsizer, 1, wxEXPAND | wxTOP, 10 );
-
-    if ((GetWindowStyleFlag() & wxPLOT_Y_AXIS) != 0)
-    {
-        m_yaxis = new wxPlotYAxisArea( this );
-
-        wxBoxSizer *vert1 = new wxBoxSizer( wxVERTICAL );
-        plotsizer->Add( vert1, 1, wxEXPAND|wxTOP,10 );
-        vert1->Add( m_yaxis, 1 );
-        if ((GetWindowStyleFlag() & wxPLOT_X_AXIS) != 0)
-            vert1->Add( 60, 40 );
-    }
-    else
-    {
-        m_yaxis = (wxPlotYAxisArea*) NULL;
-    }
-
-    if ((GetWindowStyleFlag() & wxPLOT_X_AXIS) != 0)
-    {
-        m_xaxis = new wxPlotXAxisArea( this );
-
-        wxBoxSizer *vert2 = new wxBoxSizer( wxVERTICAL );
-        plotsizer->Add( vert2, 5, wxEXPAND);
-        vert2->Add( m_area, 1, wxEXPAND|wxTOP,10 );
-        vert2->Add( m_xaxis, 0, wxEXPAND );
-    }
-    else
-    {
-        plotsizer->Add( m_area, 1, wxEXPAND );
-        m_xaxis = (wxPlotXAxisArea*) NULL;
-    }
-
-    mainsizer->Add( m_plotAndTitleSizer, 1, wxEXPAND );
-
-    SetSizerAndFit( mainsizer );
-
-    SetTargetWindow( m_area );
-
-    SetBackgroundColour( *wxWHITE );
-
-    m_current = (wxPlotCurve*) NULL;
-}
-
-wxPlotWindow::~wxPlotWindow()
-{
-}
-
-void wxPlotWindow::Add( wxPlotCurve *curve )
-{
-    m_curves.Append( curve );
-    if (!m_current) m_current = curve;
-
-    ResetScrollbar();
-}
-
-size_t wxPlotWindow::GetCount()
-{
-    return m_curves.GetCount();
-}
-
-wxPlotCurve *wxPlotWindow::GetAt( size_t n )
-{
-    wxList::compatibility_iterator node = m_curves.Item( n );
-    if (!node)
-        return (wxPlotCurve*) NULL;
-
-    return (wxPlotCurve*) node->GetData();
-}
-
-void wxPlotWindow::SetCurrentCurve( wxPlotCurve* current )
-{
-    m_current = current;
-    m_area->Refresh( false );
-
-    RedrawYAxis();
-
-    wxPlotEvent event( wxEVT_PLOT_SEL_CHANGED, GetId() );
-    event.SetEventObject( this );
-    event.SetZoom( GetZoom() );
-    event.SetCurve( m_current );
-    GetEventHandler()->ProcessEvent( event );
-}
-
-void wxPlotWindow::Delete( wxPlotCurve* curve )
-{
-    wxList::compatibility_iterator node = m_curves.Find( curve );
-    if (!node) return;
-
-    m_curves.DeleteObject( curve );
-
-    m_area->DeleteCurve( curve );
-    m_area->Refresh( false );
-
-    if (curve == m_current) m_current = (wxPlotCurve *) NULL;
-}
-
-wxPlotCurve *wxPlotWindow::GetCurrentCurve()
-{
-    return m_current;
-}
-
-void wxPlotWindow::Add( wxPlotOnOffCurve *curve )
-{
-    m_onOffCurves.Append( curve );
-}
-
-void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
-{
-    wxList::compatibility_iterator node = m_onOffCurves.Find( curve );
-    if (!node) return;
-
-    m_onOffCurves.DeleteObject( curve );
-}
-
-size_t wxPlotWindow::GetOnOffCurveCount()
-{
-    return m_onOffCurves.GetCount();
-}
-
-wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
-{
-    wxList::compatibility_iterator node = m_onOffCurves.Item( n );
-    if (!node)
-        return (wxPlotOnOffCurve*) NULL;
-
-    return (wxPlotOnOffCurve*) node->GetData();
-}
-
-void wxPlotWindow::Move( wxPlotCurve* curve, int pixels_up )
-{
-    m_area->DeleteCurve( curve );
-
-    curve->SetOffsetY( curve->GetOffsetY() + pixels_up );
-
-    m_area->Refresh( false );
-
-    RedrawYAxis();
-}
-
-void wxPlotWindow::OnMoveUp( wxCommandEvent& WXUNUSED(event) )
-{
-    if (!m_current) return;
-
-    Move( m_current, 25 );
-}
-
-void wxPlotWindow::OnMoveDown( wxCommandEvent& WXUNUSED(event) )
-{
-    if (!m_current) return;
-
-    Move( m_current, -25 );
-}
-
-void wxPlotWindow::Enlarge( wxPlotCurve *curve, double factor )
-{
-    m_area->DeleteCurve( curve );
-
-    int client_width;
-    int client_height;
-    m_area->GetClientSize( &client_width, &client_height);
-    double offset = (double)curve->GetOffsetY() / (double)client_height;
-
-    double range = curve->GetEndY() - curve->GetStartY();
-    offset *= range;
-
-    double new_range = range / factor;
-    double new_offset = offset / factor;
-
-    if (m_enlargeAroundWindowCentre)
-    {
-        double middle = curve->GetStartY() - offset + range/2;
-
-        curve->SetStartY( middle - new_range / 2 + new_offset );
-        curve->SetEndY( middle + new_range / 2 + new_offset  );
-    }
-    else
-    {
-        curve->SetStartY( (curve->GetStartY() - offset)/factor + new_offset );
-        curve->SetEndY( (curve->GetEndY() - offset)/factor + new_offset );
-    }
-
-    m_area->Refresh( false );
-    RedrawYAxis();
-}
-
-void wxPlotWindow::SetUnitsPerValue( double upv )
-{
-    m_xUnitsPerValue = upv;
-
-    RedrawXAxis();
-}
-
-void wxPlotWindow::SetZoom( double zoom )
-{
-    double old_zoom = m_xZoom;
-    m_xZoom = zoom;
-
-    int view_x = 0;
-    int view_y = 0;
-    GetViewStart( &view_x, &view_y );
-
-    wxInt32 max = 0;
-    wxList::compatibility_iterator node = m_curves.GetFirst();
-    while (node)
-    {
-        wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
-        if (curve->GetEndX() > max)
-            max = curve->GetEndX();
-        node = node->GetNext();
-    }
-    SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP,
-                   (int)((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1, 0,
-                   (int)(view_x*zoom/old_zoom), 0,
-                   true );
-
-    RedrawXAxis();
-    m_area->Refresh( true );
-}
-
-void wxPlotWindow::ResetScrollbar()
-{
-    wxInt32 max = 0;
-    wxList::compatibility_iterator node = m_curves.GetFirst();
-    while (node)
-    {
-        wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
-        if (curve->GetEndX() > max)
-            max = curve->GetEndX();
-        node = node->GetNext();
-    }
-
-    SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP,
-                   (int)(((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1), 0 );
-}
-
-void wxPlotWindow::AddChartTitle(const wxString& title, wxFont font,
-                                 wxColour colour)
-{
-    m_title = title;
-    m_titleFont = font;
-    m_titleColour = colour;
-    DrawChartTitle();
-}
-
-void wxPlotWindow::DrawChartTitle()
-{
-    if(m_title.size() != 0)
-    {
-        //If it is already added, remove child and delete
-        if(m_titleStaticText)
-        {
-            RemoveChild( m_titleStaticText );
-            m_titleStaticText->Destroy();
-        }
-
-        //Create the text control and set the font, colour
-        m_titleStaticText = new wxStaticText( this, -1, m_title );
-        m_titleStaticText->SetFont( m_titleFont );
-        m_titleStaticText->SetForegroundColour( m_titleColour );
-
-        //Create a sizer for the title. Prepend it to the Plot + Title sizer.
-        wxBoxSizer* titleSizer = new wxBoxSizer( wxHORIZONTAL );
-        titleSizer->Add( m_titleStaticText, 0, wxALIGN_CENTER | wxALL, 10 );
-        m_plotAndTitleSizer->Prepend( titleSizer, 0, wxALIGN_CENTER_HORIZONTAL );
-
-        //Finally, force layout
-        m_plotAndTitleSizer->Layout();
-    }
-}
-
-void wxPlotWindow::RedrawXAxis()
-{
-    if (m_xaxis)
-        m_xaxis->Refresh( true );
-}
-
-void wxPlotWindow::RedrawYAxis()
-{
-    if (m_yaxis)
-       m_yaxis->Refresh( true );
-}
-
-void wxPlotWindow::RedrawEverything()
-{
-    if (m_xaxis)
-        m_xaxis->Refresh( true );
-    if (m_yaxis)
-        m_yaxis->Refresh( true );
-    m_area->Refresh( true );
-
-    DrawChartTitle();
-}
-
-void wxPlotWindow::OnZoomIn( wxCommandEvent& WXUNUSED(event) )
-{
-    SetZoom( m_xZoom * 1.5 );
-}
-
-void wxPlotWindow::OnZoomOut( wxCommandEvent& WXUNUSED(event) )
-{
-    SetZoom( m_xZoom * 0.6666 );
-}
-
-void wxPlotWindow::OnEnlarge( wxCommandEvent& WXUNUSED(event) )
-{
-    if (!m_current) return;
-
-    Enlarge( m_current, 1.5 );
-}
-
-void wxPlotWindow::OnShrink( wxCommandEvent& WXUNUSED(event) )
-{
-    if (!m_current) return;
-
-    Enlarge( m_current, 0.6666666 );
-}
-
-void wxPlotWindow::OnScroll2( wxScrollWinEvent& event )
-{
-    if ((!m_scrollOnThumbRelease) || (event.GetEventType() != wxEVT_SCROLLWIN_THUMBTRACK))
-    {
-        wxScrolledWindow::OnScroll( event );
-        RedrawXAxis();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-// FIXME MT-UNSAFE
-static wxBitmap *GetEnlargeBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_enl_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_enl_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-
-static wxBitmap *GetShrinkBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_shr_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_shr_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-
-static wxBitmap *GetZoomInBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_zin_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_zin_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-
-static wxBitmap *GetZoomOutBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_zot_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_zot_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-
-static wxBitmap *GetUpBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_up_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_up_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-
-static wxBitmap *GetDownBitmap()
-{
-    static wxBitmap* s_bitmap = (wxBitmap *) NULL;
-    static bool s_loaded = false;
-
-    if ( !s_loaded )
-    {
-        s_loaded = true; // set it to true anyhow, we won't try again
-
-        #if defined(__WXMSW__) || defined(__WXPM__)
-            s_bitmap = new wxBitmap(_T("plot_dwn_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
-            s_bitmap = new wxBitmap( plot_dwn_xpm );
-        #endif
-    }
-
-    return s_bitmap;
-}
-