diff --git a/contrib/build/animate/animate_animatedll.dsp b/contrib/build/animate/animate_animatedll.dsp
deleted file mode 100644
index f57686ce8e..0000000000
--- a/contrib/build/animate/animate_animatedll.dsp
+++ /dev/null
@@ -1,266 +0,0 @@
-# Microsoft Developer Studio Project File - Name="animatedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=animatedll - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "animate_animatedll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "animate_animatedll.mak" CFG="animatedll - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "animatedll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "animatedll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw25d_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw25d_animate.lib" /debug
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw25_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw25_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw25ud_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw25ud_animate.lib" /debug
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw25u_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw25u_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_animate.lib" /debug
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv25_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv25_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_animate.lib" /debug
-
-!ELSEIF "$(CFG)" == "animatedll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_animate.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "animatedll - Win32 DLL Debug"
-# Name "animatedll - Win32 DLL Release"
-# Name "animatedll - Win32 DLL Unicode Debug"
-# Name "animatedll - Win32 DLL Unicode Release"
-# Name "animatedll - Win32 DLL Universal Debug"
-# Name "animatedll - Win32 DLL Universal Release"
-# Name "animatedll - Win32 DLL Universal Unicode Debug"
-# Name "animatedll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/animate\animate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/animate/animate_animatelib.dsp b/contrib/build/animate/animate_animatelib.dsp
deleted file mode 100644
index 29c5d673d9..0000000000
--- a/contrib/build/animate/animate_animatelib.dsp
+++ /dev/null
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="animatelib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=animatelib - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "animate_animatelib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "animate_animatelib.mak" CFG="animatelib - Win32 Unicode Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "animatelib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "animatelib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_msw" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_msw" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuniv" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuniv" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.lib"
-
-!ELSEIF "$(CFG)" == "animatelib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "animatelib - Win32 Debug"
-# Name "animatelib - Win32 Release"
-# Name "animatelib - Win32 Unicode Debug"
-# Name "animatelib - Win32 Unicode Release"
-# Name "animatelib - Win32 Universal Debug"
-# Name "animatelib - Win32 Universal Release"
-# Name "animatelib - Win32 Universal Unicode Debug"
-# Name "animatelib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/animate\animate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/fl/fl_fldll.dsp b/contrib/build/fl/fl_fldll.dsp
deleted file mode 100644
index 899e49dfe6..0000000000
--- a/contrib/build/fl/fl_fldll.dsp
+++ /dev/null
@@ -1,330 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=fldll - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fl_fldll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fl_fldll.mak" CFG="fldll - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fldll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fldll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw25d_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw25d_fl.lib" /debug
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw25_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw25_fl.lib"
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw25ud_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw25ud_fl.lib" /debug
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw25u_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw25u_fl.lib"
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_fl.lib" /debug
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_fl.lib"
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_fl.lib" /debug
-
-!ELSEIF "$(CFG)" == "fldll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_fl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fldll - Win32 DLL Debug"
-# Name "fldll - Win32 DLL Release"
-# Name "fldll - Win32 DLL Unicode Debug"
-# Name "fldll - Win32 DLL Unicode Release"
-# Name "fldll - Win32 DLL Universal Debug"
-# Name "fldll - Win32 DLL Universal Release"
-# Name "fldll - Win32 DLL Universal Unicode Debug"
-# Name "fldll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/fl\antiflickpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\bardragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\barhintspl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\cbcustom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\controlbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbarhnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\frmview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\garbagec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\gcupdatesmgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\hintanimpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\newbmpbtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\panedrawpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowdragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowlayoutpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\toolwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\updatesmgr.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/fl/fl_fllib.dsp b/contrib/build/fl/fl_fllib.dsp
deleted file mode 100644
index cb52972bba..0000000000
--- a/contrib/build/fl/fl_fllib.dsp
+++ /dev/null
@@ -1,313 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fllib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=fllib - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fl_fllib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fl_fllib.mak" CFG="fllib - Win32 Unicode Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fllib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fllib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_msw" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_msw" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuniv" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuniv" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.lib"
-
-!ELSEIF "$(CFG)" == "fllib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fllib - Win32 Debug"
-# Name "fllib - Win32 Release"
-# Name "fllib - Win32 Unicode Debug"
-# Name "fllib - Win32 Unicode Release"
-# Name "fllib - Win32 Universal Debug"
-# Name "fllib - Win32 Universal Release"
-# Name "fllib - Win32 Universal Unicode Debug"
-# Name "fllib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/fl\antiflickpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\bardragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\barhintspl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\cbcustom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\controlbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbarhnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\frmview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\garbagec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\gcupdatesmgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\hintanimpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\newbmpbtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\panedrawpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowdragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowlayoutpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\toolwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\updatesmgr.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/net/netutils.dsp b/contrib/build/net/netutils.dsp
deleted file mode 100644
index 14e8e27738..0000000000
--- a/contrib/build/net/netutils.dsp
+++ /dev/null
@@ -1,474 +0,0 @@
-# Microsoft Developer Studio Project File - Name="netutils" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=netutils - Win32 DLL Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "netutils.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "netutils.mak" CFG="netutils - Win32 DLL Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "netutils - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "netutils - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25d_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25d_netutils.lib" /debug
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25ud_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25ud_netutils.lib" /debug
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25u_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25u_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25d_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25d_netutils.lib" /debug
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25_netutils.lib"
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25ud_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25ud_netutils.lib" /debug
-
-!ELSEIF "$(CFG)" == "netutils - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25u_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25u_netutils.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "netutils - Win32 Debug"
-# Name "netutils - Win32 Release"
-# Name "netutils - Win32 Unicode Debug"
-# Name "netutils - Win32 Unicode Release"
-# Name "netutils - Win32 Universal Debug"
-# Name "netutils - Win32 Universal Release"
-# Name "netutils - Win32 Universal Unicode Debug"
-# Name "netutils - Win32 Universal Unicode Release"
-# Name "netutils - Win32 DLL Debug"
-# Name "netutils - Win32 DLL Release"
-# Name "netutils - Win32 DLL Unicode Debug"
-# Name "netutils - Win32 DLL Unicode Release"
-# Name "netutils - Win32 DLL Universal Debug"
-# Name "netutils - Win32 DLL Universal Release"
-# Name "netutils - Win32 DLL Universal Unicode Debug"
-# Name "netutils - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\email.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\smapi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\web.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/ogl/ogl_ogldll.dsp b/contrib/build/ogl/ogl_ogldll.dsp
deleted file mode 100644
index 5dfa984e7d..0000000000
--- a/contrib/build/ogl/ogl_ogldll.dsp
+++ /dev/null
@@ -1,310 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ogldll - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ogl_ogldll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ogl_ogldll.mak" CFG="ogldll - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ogldll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ogldll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw25d_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw25d_ogl.lib" /debug
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw25_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw25_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw25ud_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw25ud_ogl.lib" /debug
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw25u_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw25u_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_ogl.lib" /debug
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_ogl.lib" /debug
-
-!ELSEIF "$(CFG)" == "ogldll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_ogl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogldll - Win32 DLL Debug"
-# Name "ogldll - Win32 DLL Release"
-# Name "ogldll - Win32 DLL Unicode Debug"
-# Name "ogldll - Win32 DLL Unicode Release"
-# Name "ogldll - Win32 DLL Universal Debug"
-# Name "ogldll - Win32 DLL Universal Release"
-# Name "ogldll - Win32 DLL Universal Unicode Debug"
-# Name "ogldll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/ogl\basic.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\basic2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\bmpshape.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\composit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\constrnt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\divided.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\drawn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\lines.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\mfutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\ogldiag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\oglmisc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/ogl/ogl_ogllib.dsp b/contrib/build/ogl/ogl_ogllib.dsp
deleted file mode 100644
index f15f18d6f9..0000000000
--- a/contrib/build/ogl/ogl_ogllib.dsp
+++ /dev/null
@@ -1,293 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogllib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ogllib - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ogl_ogllib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ogl_ogllib.mak" CFG="ogllib - Win32 Unicode Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ogllib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ogllib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_msw" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_msw" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuniv" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuniv" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.lib"
-
-!ELSEIF "$(CFG)" == "ogllib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogllib - Win32 Debug"
-# Name "ogllib - Win32 Release"
-# Name "ogllib - Win32 Unicode Debug"
-# Name "ogllib - Win32 Unicode Release"
-# Name "ogllib - Win32 Universal Debug"
-# Name "ogllib - Win32 Universal Release"
-# Name "ogllib - Win32 Universal Unicode Debug"
-# Name "ogllib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/ogl\basic.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\basic2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\bmpshape.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\composit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\constrnt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\divided.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\drawn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\lines.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\mfutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\ogldiag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\oglmisc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/stc/stc_stcdll.dsp b/contrib/build/stc/stc_stcdll.dsp
deleted file mode 100644
index 6c609728c8..0000000000
--- a/contrib/build/stc/stc_stcdll.dsp
+++ /dev/null
@@ -1,452 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stcdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=stcdll - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "stc_stcdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "stc_stcdll.mak" CFG="stcdll - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "stcdll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "stcdll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw25d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw25d_stc.lib" /debug
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw25_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw25_stc.lib"
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw25ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw25ud_stc.lib" /debug
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw25u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw25u_stc.lib"
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_stc.lib" /debug
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv25_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv25_stc.lib"
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_stc.lib" /debug
-
-!ELSEIF "$(CFG)" == "stcdll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_stc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "stcdll - Win32 DLL Debug"
-# Name "stcdll - Win32 DLL Release"
-# Name "stcdll - Win32 DLL Unicode Debug"
-# Name "stcdll - Win32 DLL Unicode Release"
-# Name "stcdll - Win32 DLL Universal Debug"
-# Name "stcdll - Win32 DLL Universal Release"
-# Name "stcdll - Win32 DLL Universal Unicode Debug"
-# Name "stcdll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ExternalLexer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAVE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAda.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBaan.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBullant.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexConf.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCrontab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEScript.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEiffel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLisp.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLout.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLua.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexMatlab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPascal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexRuby.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\RESearch.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\StyleContext.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\UniConversion.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\WindowAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\XPM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\stc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/stc/stc_stclib.dsp b/contrib/build/stc/stc_stclib.dsp
deleted file mode 100644
index 5e90a35aa0..0000000000
--- a/contrib/build/stc/stc_stclib.dsp
+++ /dev/null
@@ -1,435 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stclib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=stclib - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "stc_stclib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "stc_stclib.mak" CFG="stclib - Win32 Unicode Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "stclib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "stclib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_msw" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_msw" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuniv" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuniv" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.lib"
-
-!ELSEIF "$(CFG)" == "stclib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "stclib - Win32 Debug"
-# Name "stclib - Win32 Release"
-# Name "stclib - Win32 Unicode Debug"
-# Name "stclib - Win32 Unicode Release"
-# Name "stclib - Win32 Universal Debug"
-# Name "stclib - Win32 Universal Release"
-# Name "stclib - Win32 Universal Unicode Debug"
-# Name "stclib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ExternalLexer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAVE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAda.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBaan.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBullant.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexConf.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCrontab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEScript.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEiffel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLisp.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLout.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLua.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexMatlab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPascal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexRuby.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\RESearch.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\StyleContext.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\UniConversion.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\WindowAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\XPM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\stc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/svg/svg_svgdll.dsp b/contrib/build/svg/svg_svgdll.dsp
deleted file mode 100644
index 867f3db1b8..0000000000
--- a/contrib/build/svg/svg_svgdll.dsp
+++ /dev/null
@@ -1,266 +0,0 @@
-# Microsoft Developer Studio Project File - Name="svgdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=svgdll - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "svg_svgdll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "svg_svgdll.mak" CFG="svgdll - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "svgdll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "svgdll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw25d_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw25d_svg.lib" /debug
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw25_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw25_svg.lib"
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw25ud_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw25ud_svg.lib" /debug
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw25u_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw25u_svg.lib"
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_svg.lib" /debug
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv25_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv25_svg.lib"
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_svg.lib" /debug
-
-!ELSEIF "$(CFG)" == "svgdll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_svg.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "svgdll - Win32 DLL Debug"
-# Name "svgdll - Win32 DLL Release"
-# Name "svgdll - Win32 DLL Unicode Debug"
-# Name "svgdll - Win32 DLL Unicode Release"
-# Name "svgdll - Win32 DLL Universal Debug"
-# Name "svgdll - Win32 DLL Universal Release"
-# Name "svgdll - Win32 DLL Universal Unicode Debug"
-# Name "svgdll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/svg\dcsvg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/svg/svg_svglib.dsp b/contrib/build/svg/svg_svglib.dsp
deleted file mode 100644
index 135662f173..0000000000
--- a/contrib/build/svg/svg_svglib.dsp
+++ /dev/null
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="svglib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=svglib - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "svg_svglib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "svg_svglib.mak" CFG="svglib - Win32 Unicode Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "svglib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "svglib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_msw" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_msw" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuniv" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuniv" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.lib"
-
-!ELSEIF "$(CFG)" == "svglib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "svglib - Win32 Debug"
-# Name "svglib - Win32 Release"
-# Name "svglib - Win32 Unicode Debug"
-# Name "svglib - Win32 Unicode Release"
-# Name "svglib - Win32 Universal Debug"
-# Name "svglib - Win32 Universal Release"
-# Name "svglib - Win32 Universal Unicode Debug"
-# Name "svglib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/svg\dcsvg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/demos/dbbrowse/makefile.gtk b/demos/dbbrowse/makefile.gtk
deleted file mode 100644
index cd8a960812..0000000000
--- a/demos/dbbrowse/makefile.gtk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Top dir of wxWindows
-top_builddir = /gtm/bart/wxGTK
-
-PROGRAM=dbbrowser_gtk
-
-
-OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
- browsedb.o dbtree.o dbgrid.o dlguser.o
-
-
-
-
-include $(top_builddir)/src/makeprog.env
-
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
deleted file mode 100644
index 31dbb9e7f8..0000000000
--- a/samples/aui/Makefile.in
+++ /dev/null
@@ -1,209 +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.8
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
- $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
- -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
-AUIDEMO_OBJECTS = \
- $(__auidemo___win32rc) \
- $(__auidemo_os2_lib_res) \
- auidemo_auidemo.o
-
-### 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@__auidemo___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@ $(SETFILE) -a C auidemo$(EXEEXT)
-@COND_PLATFORM_MAC_1@__auidemo___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___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
- grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___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@__auidemo___win32rc = auidemo_sample_rc.o
-@COND_PLATFORM_OS2_1@__auidemo_os2_lib_res = \
-@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
-@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@ auidemo.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@ auidemo.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_AUI_p = \
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_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_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_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_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_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 -o \
- auidemo$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: auidemo$(EXEEXT) $(__auidemo_bundle___depname)
-
-install: all
-
-uninstall:
-
-install-strip: install
-
-clean:
- rm -rf ./.deps ./.pch
- rm -f ./*.o
- rm -f auidemo$(EXEEXT)
- rm -rf auidemo.app
-
-distclean: clean
- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
- $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
- $(__auidemo___mac_rezcmd)
- $(__auidemo___mac_setfilecmd)
- $(__auidemo___os2_emxbindcmd)
- $(SAMPLES_RPATH_POSTLINK)
-
-auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
- mkdir -p auidemo.app/Contents
- mkdir -p auidemo.app/Contents/MacOS
- mkdir -p auidemo.app/Contents/Resources
-
-
- sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
- -e "s/EXECUTABLE/auidemo/" \
- -e "s/VERSION/$(WX_VERSION)/" \
- $(top_srcdir)/src/mac/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
-
-
- echo -n "APPL????" >auidemo.app/Contents/PkgInfo
-
-
- ln -f auidemo$(EXEEXT) auidemo.app/Contents/MacOS/auidemo
-
-
- cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns auidemo.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@auidemo_bundle: $(____auidemo_BUNDLE_TGT_REF_DEP)
-
-auidemo_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
-
-auidemo_auidemo.o: $(srcdir)/auidemo.cpp
- $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean auidemo_bundle
diff --git a/samples/aui/auidemo.bkl b/samples/aui/auidemo.bkl
deleted file mode 100644
index b4a2fff4fd..0000000000
--- a/samples/aui/auidemo.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
wxAUI is an Advanced User Interface library for the wxWidgets toolkit " - "that allows developers to create high-quality, cross-platform user " - "interfaces quickly and easily.
" - "Features
" - "With wxAUI, developers can create application frameworks with:
" - "What's new in 0.9.2?
" - "The following features/fixes have been added since the last version of wxAUI:
" - "What changed in 0.9.1?
" - "The following features/fixes were added in wxAUI 0.9.1:
" - "See README.txt for more information.
" - ""; - - return wxString::FromAscii(text); -} diff --git a/samples/aui/auidemo.dsp b/samples/aui/auidemo.dsp deleted file mode 100644 index 843db5b8ff..0000000000 --- a/samples/aui/auidemo.dsp +++ /dev/null @@ -1,480 +0,0 @@ -# Microsoft Developer Studio Project File - Name="auidemo" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=auidemo - 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 "auidemo.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 "auidemo.mak" CFG="auidemo - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "auidemo - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 DLL Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "auidemo - 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)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivudll" -# PROP Intermediate_Dir "vc_mswunivudll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28u_aui.lib wxmswuniv28u_html.lib wxmswuniv28u_adv.lib wxmswuniv28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv28u_aui.lib wxmswuniv28u_html.lib wxmswuniv28u_adv.lib wxmswuniv28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivuddll" -# PROP Intermediate_Dir "vc_mswunivuddll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28ud_aui.lib wxmswuniv28ud_html.lib wxmswuniv28ud_adv.lib wxmswuniv28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv28ud_aui.lib wxmswuniv28ud_html.lib wxmswuniv28ud_adv.lib wxmswuniv28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivdll" -# PROP Intermediate_Dir "vc_mswunivdll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28_aui.lib wxmswuniv28_html.lib wxmswuniv28_adv.lib wxmswuniv28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv28_aui.lib wxmswuniv28_html.lib wxmswuniv28_adv.lib wxmswuniv28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivddll" -# PROP Intermediate_Dir "vc_mswunivddll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28d_aui.lib wxmswuniv28d_html.lib wxmswuniv28d_adv.lib wxmswuniv28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv28d_aui.lib wxmswuniv28d_html.lib wxmswuniv28d_adv.lib wxmswuniv28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswudll" -# PROP Intermediate_Dir "vc_mswudll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_adv.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_adv.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswuddll" -# PROP Intermediate_Dir "vc_mswuddll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_adv.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_adv.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswdll" -# PROP Intermediate_Dir "vc_mswdll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswdll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\auidemo.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswddll" -# PROP Intermediate_Dir "vc_mswddll\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\auidemo.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswunivu" -# PROP Intermediate_Dir "vc_mswunivu\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28u_aui.lib wxmswuniv28u_html.lib wxmswuniv28u_adv.lib wxmswuniv28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv28u_aui.lib wxmswuniv28u_html.lib wxmswuniv28u_adv.lib wxmswuniv28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivud" -# PROP Intermediate_Dir "vc_mswunivud\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28ud_aui.lib wxmswuniv28ud_html.lib wxmswuniv28ud_adv.lib wxmswuniv28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv28ud_aui.lib wxmswuniv28ud_html.lib wxmswuniv28ud_adv.lib wxmswuniv28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswuniv" -# PROP Intermediate_Dir "vc_mswuniv\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28_aui.lib wxmswuniv28_html.lib wxmswuniv28_adv.lib wxmswuniv28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv28_aui.lib wxmswuniv28_html.lib wxmswuniv28_adv.lib wxmswuniv28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivd" -# PROP Intermediate_Dir "vc_mswunivd\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv28d_aui.lib wxmswuniv28d_html.lib wxmswuniv28d_adv.lib wxmswuniv28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv28d_aui.lib wxmswuniv28d_html.lib wxmswuniv28d_adv.lib wxmswuniv28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_mswu" -# PROP Intermediate_Dir "vc_mswu\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_adv.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_adv.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswud" -# PROP Intermediate_Dir "vc_mswud\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# 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 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_adv.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_adv.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "vc_msw" -# PROP Intermediate_Dir "vc_msw\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Fdvc_msw\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\auidemo.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "auidemo - 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\auidemo" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswd" -# PROP Intermediate_Dir "vc_mswd\auidemo" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\auidemo.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /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 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\auidemo.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ENDIF - -# Begin Target - -# Name "auidemo - Win32 DLL Universal Unicode Release" -# Name "auidemo - Win32 DLL Universal Unicode Debug" -# Name "auidemo - Win32 DLL Universal Release" -# Name "auidemo - Win32 DLL Universal Debug" -# Name "auidemo - Win32 DLL Unicode Release" -# Name "auidemo - Win32 DLL Unicode Debug" -# Name "auidemo - Win32 DLL Release" -# Name "auidemo - Win32 DLL Debug" -# Name "auidemo - Win32 Universal Unicode Release" -# Name "auidemo - Win32 Universal Unicode Debug" -# Name "auidemo - Win32 Universal Release" -# Name "auidemo - Win32 Universal Debug" -# Name "auidemo - Win32 Unicode Release" -# Name "auidemo - Win32 Unicode Debug" -# Name "auidemo - Win32 Release" -# Name "auidemo - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\auidemo.cpp -# End Source File -# Begin Source File - -SOURCE=.\..\..\samples\sample.rc -# End Source File -# End Group -# End Target -# End Project - diff --git a/samples/aui/descrip.mms b/samples/aui/descrip.mms deleted file mode 100755 index 8f387355cf..0000000000 --- a/samples/aui/descrip.mms +++ /dev/null @@ -1,47 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 15 June 2006 * -# * -#***************************************************************************** -.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) auidemo.exe -.else -.ifdef __WXGTK__ - $(MMS)$(MMSQUALIFIERS) auidemo_gtk.exe -.endif -.endif - -.ifdef __WXMOTIF__ -auidemo.exe : auidemo.obj - cxxlink auidemo,[--.lib]vms/opt -.else -.ifdef __WXGTK__ -auidemo_gtk.exe : auidemo.obj - cxxlink/exec=auidemo_gtk.exe auidemo,[--.lib]vms_gtk/opt -.endif -.endif - -auidemo.obj : auidemo.cpp diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc deleted file mode 100644 index 106f96da61..0000000000 --- a/samples/aui/makefile.bcc +++ /dev/null @@ -1,250 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = \ - bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_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 $(CPPFLAGS) $(CXXFLAGS) -AUIDEMO_OBJECTS = \ - $(OBJS)\auidemo_auidemo.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_AUI_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.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_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.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)\auidemo.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)\auidemo.exe del $(OBJS)\auidemo.exe - -if exist $(OBJS)\auidemo.tds del $(OBJS)\auidemo.tds - -if exist $(OBJS)\auidemo.ilc del $(OBJS)\auidemo.ilc - -if exist $(OBJS)\auidemo.ild del $(OBJS)\auidemo.ild - -if exist $(OBJS)\auidemo.ilf del $(OBJS)\auidemo.ilf - -if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils - -$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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)\auidemo_sample.res -| - -$(OBJS)\auidemo_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)\auidemo_auidemo.obj: .\auidemo.cpp - $(CXX) -q -c -P -o$@ $(AUIDEMO_CXXFLAGS) $** - diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc deleted file mode 100644 index 0eee88ea9f..0000000000 --- a/samples/aui/makefile.gcc +++ /dev/null @@ -1,248 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -WX_RELEASE_NODOT = 28 -OBJS = \ - gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_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 $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -AUIDEMO_OBJECTS = \ - $(OBJS)\auidemo_sample_rc.o \ - $(OBJS)\auidemo_auidemo.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_AUI_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_ADV_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_XML_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -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)\auidemo.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe - -$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o - $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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)\auidemo_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)\auidemo_auidemo.o: ./auidemo.cpp - $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all clean - - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx deleted file mode 100644 index d6acac215d..0000000000 --- a/samples/aui/makefile.unx +++ /dev/null @@ -1,71 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C++ compiler -CXX = g++ - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# Location and arguments of wx-config script -WX_CONFIG = wx-config - -# C++ flags to use with wxWidgets code -WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags` - - - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -AUIDEMO_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -AUIDEMO_OBJECTS = \ - auidemo_auidemo.o - -### Conditionally set variables: ### - - - -### Targets: ### - -all: auidemo - -install: all - -uninstall: - -clean: - rm -f ./*.o - rm -f ./*.d - rm -f auidemo - -auidemo: $(AUIDEMO_OBJECTS) - $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs aui,html,adv,core,xml,base` - -auidemo_auidemo.o: ./auidemo.cpp - $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all install uninstall clean - - -# Dependencies tracking: --include ./*.d diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc deleted file mode 100644 index f9a3bc358a..0000000000 --- a/samples/aui/makefile.vc +++ /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.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.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 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -AUIDEMO_OBJECTS = \ - $(OBJS)\auidemo_sample.res \ - $(OBJS)\auidemo_auidemo.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_AUI_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.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_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.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)\auidemo.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)\auidemo.exe del $(OBJS)\auidemo.exe - -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk - -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb - -$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< - $(AUIDEMO_OBJECTS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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)\auidemo_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)\auidemo_auidemo.obj: .\auidemo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) $** - diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat deleted file mode 100644 index 0f14624310..0000000000 --- a/samples/aui/makefile.wat +++ /dev/null @@ -1,282 +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_AUI_p = -!ifeq MONOLITHIC 0 -__WXLIB_AUI_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.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_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.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_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = & - wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_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 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -AUIDEMO_OBJECTS = & - $(OBJS)\auidemo_auidemo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\auidemo.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)\auidemo.exe del $(OBJS)\auidemo.exe - -$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - @%create $(OBJS)\auidemo.lbc - @%append $(OBJS)\auidemo.lbc option quiet - @%append $(OBJS)\auidemo.lbc name $^@ - @%append $(OBJS)\auidemo.lbc option caseexact - @%append $(OBJS)\auidemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' - @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i - @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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)\auidemo.lbc library %i - @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res - @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i - wlink @$(OBJS)\auidemo.lbc - -$(OBJS)\auidemo_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)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< - diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in deleted file mode 100644 index 9f3cdc06dc..0000000000 --- a/samples/power/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.8 -WX_VERSION = $(WX_RELEASE).0 -LIBDIRNAME = $(wx_top_builddir)/lib -POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - $(__power___win32rc) \ - $(__power_os2_lib_res) \ - power_power.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@__power___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C power$(EXEEXT) -@COND_PLATFORM_MAC_1@__power___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___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q \ - pmwin.763 ; then emxbind -ep power$(EXEEXT) ; fi -@COND_PLATFORM_OS2_1@__power___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___power___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@__power___win32rc = power_sample_rc.o -@COND_PLATFORM_OS2_1@__power_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res -@COND_PLATFORM_MACOSX_1@__power_bundle___depname = power_bundle -@COND_TOOLKIT_COCOA@____power_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ power.app/Contents/PkgInfo -@COND_TOOLKIT_MAC@____power_BUNDLE_TGT_REF_DEP = power.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 -o \ - power$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) - -### Targets: ### - -all: power$(EXEEXT) $(__power_bundle___depname) - -install: all - -uninstall: - -install-strip: install - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f power$(EXEEXT) - rm -rf power.app - -distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile - -power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__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) - $(__power___mac_rezcmd) - $(__power___mac_setfilecmd) - $(__power___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) - -power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns - mkdir -p power.app/Contents - mkdir -p power.app/Contents/MacOS - mkdir -p power.app/Contents/Resources - - - sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ - -e "s/EXECUTABLE/power/" \ - -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/carbon/Info.plist.in >power.app/Contents/Info.plist - - - echo -n "APPL????" >power.app/Contents/PkgInfo - - - ln -f power$(EXEEXT) power.app/Contents/MacOS/power - - - cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns - -@COND_PLATFORM_MACOSX_1@power_bundle: $(____power_BUNDLE_TGT_REF_DEP) - -power_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 - -power_power.o: $(srcdir)/power.cpp - $(CXXC) -c -o $@ $(POWER_CXXFLAGS) $(srcdir)/power.cpp - - -# Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d - -.PHONY: all install uninstall clean distclean power_bundle diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc deleted file mode 100644 index b288bfe4d5..0000000000 --- a/samples/power/makefile.bcc +++ /dev/null @@ -1,234 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = \ - bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_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 $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - $(OBJS)\power_power.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)\power.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)\power.exe del $(OBJS)\power.exe - -if exist $(OBJS)\power.tds del $(OBJS)\power.tds - -if exist $(OBJS)\power.ilc del $(OBJS)\power.ilc - -if exist $(OBJS)\power.ild del $(OBJS)\power.ild - -if exist $(OBJS)\power.ilf del $(OBJS)\power.ilf - -if exist $(OBJS)\power.ils del $(OBJS)\power.ils - -$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(POWER_OBJECTS),$@,, $(__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)\power_sample.res -| - -$(OBJS)\power_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)\power_power.obj: .\power.cpp - $(CXX) -q -c -P -o$@ $(POWER_CXXFLAGS) $** - diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc deleted file mode 100644 index 8844454e26..0000000000 --- a/samples/power/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 = 28 -OBJS = \ - gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_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 $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - $(OBJS)\power_sample_rc.o \ - $(OBJS)\power_power.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)\power.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\power.exe del $(OBJS)\power.exe - -$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__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)\power_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)\power_power.o: ./power.cpp - $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all clean - - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx deleted file mode 100644 index c1cdd4923b..0000000000 --- a/samples/power/makefile.unx +++ /dev/null @@ -1,71 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C++ compiler -CXX = g++ - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# Location and arguments of wx-config script -WX_CONFIG = wx-config - -# C++ flags to use with wxWidgets code -WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags` - - - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -POWER_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - power_power.o - -### Conditionally set variables: ### - - - -### Targets: ### - -all: power - -install: all - -uninstall: - -clean: - rm -f ./*.o - rm -f ./*.d - rm -f power - -power: $(POWER_OBJECTS) - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs core,base` - -power_power.o: ./power.cpp - $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all install uninstall clean - - -# Dependencies tracking: --include ./*.d diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc deleted file mode 100644 index f36c5d0b05..0000000000 --- a/samples/power/makefile.vc +++ /dev/null @@ -1,309 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\power.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 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - $(OBJS)\power_sample.res \ - $(OBJS)\power_power.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)\power.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)\power.exe del $(OBJS)\power.exe - -if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk - -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb - -$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< - $(POWER_OBJECTS) $(__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)\power_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)\power_power.obj: .\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) $** - diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat deleted file mode 100644 index ff16de6349..0000000000 --- a/samples/power/makefile.wat +++ /dev/null @@ -1,262 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.1 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! loaddll wlink wlink -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -WXDEBUGFLAG = d -!endif -!endif -!ifeq DEBUG_FLAG 1 -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 28 -OBJS = & - wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_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 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -POWER_OBJECTS = & - $(OBJS)\power_power.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\power.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)\power.exe del $(OBJS)\power.exe - -$(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res - @%create $(OBJS)\power.lbc - @%append $(OBJS)\power.lbc option quiet - @%append $(OBJS)\power.lbc name $^@ - @%append $(OBJS)\power.lbc option caseexact - @%append $(OBJS)\power.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' - @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i - @for %i in ( $(__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)\power.lbc library %i - @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res - @for %i in () do @%append $(OBJS)\power.lbc option stack=%i - wlink @$(OBJS)\power.lbc - -$(OBJS)\power_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)\power_power.obj : .AUTODEPEND .\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $< - diff --git a/samples/power/power.bkl b/samples/power/power.bkl deleted file mode 100644 index 89150a13ae..0000000000 --- a/samples/power/power.bkl +++ /dev/null @@ -1,13 +0,0 @@ - - - -\n") + doc + _T("\n"); - return doc2; -} - - - - - -//-------------------------------------------------------------------------------- -// wxHtmlFilterImage -// filter for image/* -//-------------------------------------------------------------------------------- - -class wxHtmlFilterImage : public wxHtmlFilter -{ - DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage) - - public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter) - - - -bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const -{ - return (file.GetMimeType().Left(6) == "image/"); -} - - - -wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const -{ - return ("
Sketch! |
-
Sketch is a demonstration program for wxPython In Action -Chapter 7. It is based on the SuperDoodle demo included with wxPython, -available at http://www.wxpython.org/ -
- -SuperDoodle and wxPython are brought to you by -Robin Dunn and Total Control Software, Copyright -© 1997-2006.
- - -''' - - def __init__(self, parent): - wx.Dialog.__init__(self, parent, -1, 'About Sketch', - size=(440, 400) ) - - html = wx.html.HtmlWindow(self) - html.SetPage(self.text) - button = wx.Button(self, wx.ID_OK, "Okay") - - sizer = wx.BoxSizer(wx.VERTICAL) - sizer.Add(html, 1, wx.EXPAND|wx.ALL, 5) - sizer.Add(button, 0, wx.ALIGN_CENTER|wx.ALL, 5) - - self.SetSizer(sizer) - self.Layout() - - - -class ControlPanel(wx.Panel): - - BMP_SIZE = 16 - BMP_BORDER = 3 - NUM_COLS = 4 - SPACING = 4 - - colorList = ('Black', 'Yellow', 'Red', 'Green', 'Blue', 'Purple', - 'Brown', 'Aquamarine', 'Forest Green', 'Light Blue', - 'Goldenrod', 'Cyan', 'Orange', 'Navy', 'Dark Grey', - 'Light Grey') - maxThickness = 16 - - def __init__(self, parent, ID, sketch): - wx.Panel.__init__(self, parent, ID, style=wx.RAISED_BORDER) - self.sketch = sketch - buttonSize = (self.BMP_SIZE + 2 * self.BMP_BORDER, - self.BMP_SIZE + 2 * self.BMP_BORDER) - colorGrid = self.createColorGrid(parent, buttonSize) - thicknessGrid = self.createThicknessGrid(buttonSize) - self.layout(colorGrid, thicknessGrid) - - def createColorGrid(self, parent, buttonSize): - self.colorMap = {} - self.colorButtons = {} - colorGrid = wx.GridSizer(cols=self.NUM_COLS, hgap=2, vgap=2) - for eachColor in self.colorList: - bmp = parent.MakeBitmap(eachColor) - b = buttons.GenBitmapToggleButton(self, -1, bmp, size=buttonSize) - b.SetBezelWidth(1) - b.SetUseFocusIndicator(False) - self.Bind(wx.EVT_BUTTON, self.OnSetColour, b) - colorGrid.Add(b, 0) - self.colorMap[b.GetId()] = eachColor - self.colorButtons[eachColor] = b - self.colorButtons[self.colorList[0]].SetToggle(True) - return colorGrid - - def createThicknessGrid(self, buttonSize): - self.thicknessIdMap = {} - self.thicknessButtons = {} - thicknessGrid = wx.GridSizer(cols=self.NUM_COLS, hgap=2, vgap=2) - for x in range(1, self.maxThickness + 1): - b = buttons.GenToggleButton(self, -1, str(x), size=buttonSize) - b.SetBezelWidth(1) - b.SetUseFocusIndicator(False) - self.Bind(wx.EVT_BUTTON, self.OnSetThickness, b) - thicknessGrid.Add(b, 0) - self.thicknessIdMap[b.GetId()] = x - self.thicknessButtons[x] = b - self.thicknessButtons[1].SetToggle(True) - return thicknessGrid - - def layout(self, colorGrid, thicknessGrid): - box = wx.BoxSizer(wx.VERTICAL) - box.Add(colorGrid, 0, wx.ALL, self.SPACING) - box.Add(thicknessGrid, 0, wx.ALL, self.SPACING) - self.SetSizer(box) - box.Fit(self) - - def OnSetColour(self, event): - color = self.colorMap[event.GetId()] - if color != self.sketch.color: - self.colorButtons[self.sketch.color].SetToggle(False) - self.sketch.SetColor(color) - - def OnSetThickness(self, event): - thickness = self.thicknessIdMap[event.GetId()] - if thickness != self.sketch.thickness: - self.thicknessButtons[self.sketch.thickness].SetToggle(False) - self.sketch.SetThickness(thickness) - - -class SketchApp(wx.App): - - def OnInit(self): - bmp = wx.Image("splash.png").ConvertToBitmap() - wx.SplashScreen(bmp, wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT, - 1000, None, -1) - wx.Yield() - - frame = SketchFrame(None) - frame.Show(True) - self.SetTopWindow(frame) - return True - -if __name__ == '__main__': - app = SketchApp(False) - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-06/new.bmp b/wxPython/samples/wxPIA_book/Chapter-06/new.bmp deleted file mode 100644 index d66feb2384..0000000000 Binary files a/wxPython/samples/wxPIA_book/Chapter-06/new.bmp and /dev/null differ diff --git a/wxPython/samples/wxPIA_book/Chapter-06/open.bmp b/wxPython/samples/wxPIA_book/Chapter-06/open.bmp deleted file mode 100644 index 1c38e97b59..0000000000 Binary files a/wxPython/samples/wxPIA_book/Chapter-06/open.bmp and /dev/null differ diff --git a/wxPython/samples/wxPIA_book/Chapter-06/save.bmp b/wxPython/samples/wxPIA_book/Chapter-06/save.bmp deleted file mode 100644 index 9217b496c3..0000000000 Binary files a/wxPython/samples/wxPIA_book/Chapter-06/save.bmp and /dev/null differ diff --git a/wxPython/samples/wxPIA_book/Chapter-06/splash.png b/wxPython/samples/wxPIA_book/Chapter-06/splash.png deleted file mode 100644 index a2ae34cdb1..0000000000 Binary files a/wxPython/samples/wxPIA_book/Chapter-06/splash.png and /dev/null differ diff --git a/wxPython/samples/wxPIA_book/Chapter-07/bitmap.bmp b/wxPython/samples/wxPIA_book/Chapter-07/bitmap.bmp deleted file mode 100644 index b7eb51c966..0000000000 Binary files a/wxPython/samples/wxPIA_book/Chapter-07/bitmap.bmp and /dev/null differ diff --git a/wxPython/samples/wxPIA_book/Chapter-07/bitmap_button.py b/wxPython/samples/wxPIA_book/Chapter-07/bitmap_button.py deleted file mode 100644 index 15a17773bd..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/bitmap_button.py +++ /dev/null @@ -1,25 +0,0 @@ -import wx - -class BitmapButtonFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Bitmap Button Example', - size=(200, 150)) - panel = wx.Panel(self, -1) - bmp = wx.Image("bitmap.bmp", wx.BITMAP_TYPE_BMP).ConvertToBitmap() - self.button = wx.BitmapButton(panel, -1, bmp, pos=(10, 20)) - self.Bind(wx.EVT_BUTTON, self.OnClick, self.button) - self.button.SetDefault() - self.button2 = wx.BitmapButton(panel, -1, bmp, pos=(100, 20), - style=0) - self.Bind(wx.EVT_BUTTON, self.OnClick, self.button2) - - def OnClick(self, event): - self.Destroy() - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = BitmapButtonFrame() - frame.Show() - app.MainLoop() - - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/button.py b/wxPython/samples/wxPIA_book/Chapter-07/button.py deleted file mode 100644 index 009789af65..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/button.py +++ /dev/null @@ -1,21 +0,0 @@ -import wx - -class ButtonFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Button Example', - size=(300, 100)) - panel = wx.Panel(self, -1) - self.button = wx.Button(panel, -1, "Hello", pos=(50, 20)) - self.Bind(wx.EVT_BUTTON, self.OnClick, self.button) - self.button.SetDefault() - - def OnClick(self, event): - self.button.SetLabel("Clicked") - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = ButtonFrame() - frame.Show() - app.MainLoop() - - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/checkbox.py b/wxPython/samples/wxPIA_book/Chapter-07/checkbox.py deleted file mode 100644 index d03ab83c87..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/checkbox.py +++ /dev/null @@ -1,16 +0,0 @@ -import wx - -class CheckBoxFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Checkbox Example', - size=(150, 200)) - panel = wx.Panel(self, -1) - wx.CheckBox(panel, -1, "Alpha", (35, 40), (150, 20)) - wx.CheckBox(panel, -1, "Beta", (35, 60), (150, 20)) - wx.CheckBox(panel, -1, "Gamma", (35, 80), (150, 20)) - -if __name__ == '__main__': - app = wx.PySimpleApp() - CheckBoxFrame().Show() - app.MainLoop() - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/choice.py b/wxPython/samples/wxPIA_book/Chapter-07/choice.py deleted file mode 100644 index 704fd3b74b..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/choice.py +++ /dev/null @@ -1,16 +0,0 @@ -import wx - -class ChoiceFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Choice Example', - size=(250, 200)) - panel = wx.Panel(self, -1) - sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', - 'six', 'seven', 'eight'] - wx.StaticText(panel, -1, "Select one:", (15, 20)) - wx.Choice(panel, -1, (85, 18), choices=sampleList) - -if __name__ == '__main__': - app = wx.PySimpleApp() - ChoiceFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/combo_box.py b/wxPython/samples/wxPIA_book/Chapter-07/combo_box.py deleted file mode 100644 index 3e36f2517c..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/combo_box.py +++ /dev/null @@ -1,19 +0,0 @@ -import wx - -class ComboBoxFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Combo Box Example', - size=(350, 300)) - panel = wx.Panel(self, -1) - sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', - 'six', 'seven', 'eight'] - wx.StaticText(panel, -1, "Select one:", (15, 15)) - wx.ComboBox(panel, -1, "default value", (15, 30), wx.DefaultSize, - sampleList, wx.CB_DROPDOWN) - wx.ComboBox(panel, -1, "default value", (150, 30), wx.DefaultSize, - sampleList, wx.CB_SIMPLE) - -if __name__ == '__main__': - app = wx.PySimpleApp() - ComboBoxFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/gauge.py b/wxPython/samples/wxPIA_book/Chapter-07/gauge.py deleted file mode 100644 index 9a3b5cf91d..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/gauge.py +++ /dev/null @@ -1,23 +0,0 @@ -import wx - -class GaugeFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Gauge Example', - size=(350, 150)) - panel = wx.Panel(self, -1) - self.count = 0 - self.gauge = wx.Gauge(panel, -1, 50, (20, 50), (250, 25)) - self.gauge.SetBezelFace(3) - self.gauge.SetShadowWidth(3) - self.Bind(wx.EVT_IDLE, self.OnIdle) - - def OnIdle(self, event): - self.count = self.count + 1 - if self.count >= 50: - self.count = 0 - self.gauge.SetValue(self.count) - -if __name__ == '__main__': - app = wx.PySimpleApp() - GaugeFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/generic_button.py b/wxPython/samples/wxPIA_book/Chapter-07/generic_button.py deleted file mode 100644 index 49c9d51fbd..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/generic_button.py +++ /dev/null @@ -1,56 +0,0 @@ -import wx -import wx.lib.buttons as buttons - -class GenericButtonFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Generic Button Example', - size=(500, 350)) - panel = wx.Panel(self, -1) - - sizer = wx.FlexGridSizer(1, 3, 20, 20) - b = wx.Button(panel, -1, "A wx.Button") - b.SetDefault() - sizer.Add(b) - - b = wx.Button(panel, -1, "non-default wx.Button") - sizer.Add(b) - sizer.Add((10,10)) - - b = buttons.GenButton(panel, -1, 'Generic Button') - sizer.Add(b) - - b = buttons.GenButton(panel, -1, 'disabled Generic') - b.Enable(False) - sizer.Add(b) - - b = buttons.GenButton(panel, -1, 'bigger') - b.SetFont(wx.Font(20, wx.SWISS, wx.NORMAL, wx.BOLD, False)) - b.SetBezelWidth(5) - b.SetBackgroundColour("Navy") - b.SetForegroundColour("white") - b.SetToolTipString("This is a BIG button...") - sizer.Add(b) - - bmp = wx.Image("bitmap.bmp", wx.BITMAP_TYPE_BMP).ConvertToBitmap() - b = buttons.GenBitmapButton(panel, -1, bmp) - sizer.Add(b) - - b = buttons.GenBitmapToggleButton(panel, -1, bmp) - sizer.Add(b) - - b = buttons.GenBitmapTextButton(panel, -1, bmp, "Bitmapped Text", - size=(175, 75)) - b.SetUseFocusIndicator(False) - sizer.Add(b) - - b = buttons.GenToggleButton(panel, -1, "Toggle Button") - sizer.Add(b) - - panel.SetSizer(sizer) - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = GenericButtonFrame() - frame.Show() - app.MainLoop() - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/list_box.py b/wxPython/samples/wxPIA_book/Chapter-07/list_box.py deleted file mode 100644 index e7438d7d3a..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/list_box.py +++ /dev/null @@ -1,21 +0,0 @@ -import wx - -class ListBoxFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'List Box Example', - size=(250, 200)) - panel = wx.Panel(self, -1) - - sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', - 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', - 'twelve', 'thirteen', 'fourteen'] - - listBox = wx.ListBox(panel, -1, (20, 20), (80, 120), sampleList, - wx.LB_SINGLE) - listBox.SetSelection(3) - -if __name__ == '__main__': - app = wx.PySimpleApp() - ListBoxFrame().Show() - app.MainLoop() - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/radio.py b/wxPython/samples/wxPIA_book/Chapter-07/radio.py deleted file mode 100644 index beb0efdd2d..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/radio.py +++ /dev/null @@ -1,32 +0,0 @@ -import wx - -class RadioButtonFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Radio Example', - size=(200, 200)) - panel = wx.Panel(self, -1) - radio1 = wx.RadioButton(panel, -1, "Elmo", pos=(20, 50), style=wx.RB_GROUP) - radio2 = wx.RadioButton(panel, -1, "Ernie", pos=(20, 80)) - radio3 = wx.RadioButton(panel, -1, "Bert", pos=(20, 110)) - text1 = wx.TextCtrl(panel, -1, "", pos=(80, 50)) - text2 = wx.TextCtrl(panel, -1, "", pos=(80, 80)) - text3 = wx.TextCtrl(panel, -1, "", pos=(80, 110)) - self.texts = {"Elmo": text1, "Ernie": text2, "Bert": text3} - for eachText in [text2, text3]: - eachText.Enable(False) - for eachRadio in [radio1, radio2, radio3]: - self.Bind(wx.EVT_RADIOBUTTON, self.OnRadio, eachRadio) - self.selectedText = text1 - - def OnRadio(self, event): - if self.selectedText: - self.selectedText.Enable(False) - radioSelected = event.GetEventObject() - text = self.texts[radioSelected.GetLabel()] - text.Enable(True) - self.selectedText = text - -if __name__ == '__main__': - app = wx.PySimpleApp() - RadioButtonFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/radio_box.py b/wxPython/samples/wxPIA_book/Chapter-07/radio_box.py deleted file mode 100644 index c7ae037b91..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/radio_box.py +++ /dev/null @@ -1,19 +0,0 @@ -import wx - -class RadioBoxFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Radio Box Example', - size=(350, 200)) - panel = wx.Panel(self, -1) - sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', - 'six', 'seven', 'eight'] - wx.RadioBox(panel, -1, "A Radio Box", (10, 10), wx.DefaultSize, - sampleList, 2, wx.RA_SPECIFY_COLS) - - wx.RadioBox(panel, -1, "", (150, 10), wx.DefaultSize, - sampleList, 3, wx.RA_SPECIFY_COLS | wx.NO_BORDER) - -if __name__ == '__main__': - app = wx.PySimpleApp() - RadioBoxFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/slider.py b/wxPython/samples/wxPIA_book/Chapter-07/slider.py deleted file mode 100644 index 65945b9d3e..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/slider.py +++ /dev/null @@ -1,22 +0,0 @@ -import wx - -class SliderFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Slider Example', - size=(300, 350)) - panel = wx.Panel(self, -1) - self.count = 0 - slider = wx.Slider(panel, 100, 25, 1, 100, pos=(10, 10), - size=(250, -1), - style=wx.SL_HORIZONTAL | wx.SL_AUTOTICKS | wx.SL_LABELS ) - slider.SetTickFreq(5, 1) - slider = wx.Slider(panel, 100, 25, 1, 100, pos=(125, 70), - size=(-1, 250), - style=wx.SL_VERTICAL | wx.SL_AUTOTICKS | wx.SL_LABELS ) - slider.SetTickFreq(20, 1) - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = SliderFrame() - frame.Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/spinner.py b/wxPython/samples/wxPIA_book/Chapter-07/spinner.py deleted file mode 100644 index 92995fa0ef..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/spinner.py +++ /dev/null @@ -1,15 +0,0 @@ -import wx - -class SpinnerFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Spinner Example', - size=(100, 100)) - panel = wx.Panel(self, -1) - sc = wx.SpinCtrl(panel, -1, "", (30, 20), (80, -1)) - sc.SetRange(1,100) - sc.SetValue(5) - -if __name__ == '__main__': - app = wx.PySimpleApp() - SpinnerFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/static_text.py b/wxPython/samples/wxPIA_book/Chapter-07/static_text.py deleted file mode 100644 index 66ae3df849..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/static_text.py +++ /dev/null @@ -1,38 +0,0 @@ -import wx - -class StaticTextFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Static Text Example', - size=(400, 300)) - panel = wx.Panel(self, -1) - wx.StaticText(panel, -1, "This is an example of static text", - (100, 10)) - rev = wx.StaticText(panel, -1, "Static Text With Reversed Colors", - (100, 30)) - rev.SetForegroundColour('white') - rev.SetBackgroundColour('black') - center = wx.StaticText(panel, -1, "align center", (100, 50), - (160, -1), wx.ALIGN_CENTER) - center.SetForegroundColour('white') - center.SetBackgroundColour('black') - right = wx.StaticText(panel, -1, "align right", (100, 70), - (160, -1), wx.ALIGN_RIGHT) - right.SetForegroundColour('white') - right.SetBackgroundColour('black') - str = "You can also change the font." - text = wx.StaticText(panel, -1, str, (20, 100)) - font = wx.Font(18, wx.DECORATIVE, wx.ITALIC, wx.NORMAL) - text.SetFont(font) - wx.StaticText(panel, -1, "Your text\ncan be split\n" - "over multiple lines\n\neven blank ones", (20,150)) - wx.StaticText(panel, -1, "Multi-line text\ncan also\n" - "be right aligned\n\neven with a blank", (220,150), - style=wx.ALIGN_RIGHT) - - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = StaticTextFrame() - frame.Show() - app.MainLoop() - diff --git a/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl.py b/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl.py deleted file mode 100644 index ada733b200..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl.py +++ /dev/null @@ -1,25 +0,0 @@ -import wx - -class TextFrame(wx.Frame): - - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Text Entry Example', - size=(300, 100)) - panel = wx.Panel(self, -1) - basicLabel = wx.StaticText(panel, -1, "Basic Control:") - basicText = wx.TextCtrl(panel, -1, "I've entered some text!", - size=(175, -1)) - basicText.SetInsertionPoint(0) - - pwdLabel = wx.StaticText(panel, -1, "Password:") - pwdText = wx.TextCtrl(panel, -1, "password", size=(175, -1), - style=wx.TE_PASSWORD) - sizer = wx.FlexGridSizer(cols=2, hgap=6, vgap=6) - sizer.AddMany([basicLabel, basicText, pwdLabel, pwdText]) - panel.SetSizer(sizer) - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = TextFrame() - frame.Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl_multiple.py b/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl_multiple.py deleted file mode 100644 index 04abf7f7cc..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-07/text_ctrl_multiple.py +++ /dev/null @@ -1,33 +0,0 @@ -import wx - -class TextFrame(wx.Frame): - - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Text Entry Example', - size=(300, 250)) - panel = wx.Panel(self, -1) - multiLabel = wx.StaticText(panel, -1, "Multi-line") - multiText = wx.TextCtrl(panel, -1, - "Here is a looooooooooooooong line of text set in the control.\n\n" - "See that it wrapped, and that this line is after a blank", - size=(200, 100), style=wx.TE_MULTILINE) - multiText.SetInsertionPoint(0) - - richLabel = wx.StaticText(panel, -1, "Rich Text") - richText = wx.TextCtrl(panel, -1, - "If supported by the native control, this is reversed, and this is a different font.", - size=(200, 100), style=wx.TE_MULTILINE|wx.TE_RICH2) - richText.SetInsertionPoint(0) - richText.SetStyle(44, 52, wx.TextAttr("white", "black")) - points = richText.GetFont().GetPointSize() - f = wx.Font(points + 3, wx.ROMAN, wx.ITALIC, wx.BOLD, True) - richText.SetStyle(68, 82, wx.TextAttr("blue", wx.NullColour, f)) - sizer = wx.FlexGridSizer(cols=2, hgap=6, vgap=6) - sizer.AddMany([multiLabel, multiText, richLabel, richText]) - panel.SetSizer(sizer) - -if __name__ == '__main__': - app = wx.PySimpleApp() - frame = TextFrame() - frame.Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-08/frame_subclass.py b/wxPython/samples/wxPIA_book/Chapter-08/frame_subclass.py deleted file mode 100644 index 66627208ac..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-08/frame_subclass.py +++ /dev/null @@ -1,21 +0,0 @@ -import wx - -class SubclassFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, -1, 'Frame Subclass', - size=(300, 100)) - panel = wx.Panel(self, -1) - button = wx.Button(panel, -1, "Close Me", pos=(15, 15)) - self.Bind(wx.EVT_BUTTON, self.OnCloseMe, button) - self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - - def OnCloseMe(self, event): - self.Close(True) - - def OnCloseWindow(self, event): - self.Destroy() - -if __name__ == '__main__': - app = wx.PySimpleApp() - SubclassFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-08/help_context.py b/wxPython/samples/wxPIA_book/Chapter-08/help_context.py deleted file mode 100644 index 3a7aed9b7a..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-08/help_context.py +++ /dev/null @@ -1,16 +0,0 @@ -import wx - -class HelpFrame(wx.Frame): - - def __init__(self): - pre = wx.PreFrame() - pre.SetExtraStyle(wx.FRAME_EX_CONTEXTHELP) - pre.Create(None, -1, "Help Context", size=(300, 100), - style=wx.DEFAULT_FRAME_STYLE ^ - (wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX)) - self.PostCreate(pre) - -if __name__ == '__main__': - app = wx.PySimpleApp() - HelpFrame().Show() - app.MainLoop() diff --git a/wxPython/samples/wxPIA_book/Chapter-08/images.py b/wxPython/samples/wxPIA_book/Chapter-08/images.py deleted file mode 100644 index 19d7806586..0000000000 --- a/wxPython/samples/wxPIA_book/Chapter-08/images.py +++ /dev/null @@ -1,1424 +0,0 @@ -#---------------------------------------------------------------------- -# This file was generated by encode_bitmaps.py -# -from wx import ImageFromStream, BitmapFromImage -from wx import EmptyIcon -import cStringIO - - -def getVippiData(): - return \ -'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x01^\x00\x00\x01O\x08\x06\x00\ -\x00\x00\x05\xa1\xa6$\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00 \ -\x00IDATx\x9c\xec\x9dy`T\xd5\xd9\xff?\xe7\xced%!\x0b\x81@ \x10@\xf6M\x84\x80\ -"(\xae\x05\x14\x85\xba\xaf\xa8m\xad\xbb\xb5\xaf\xbe\xb6\xda\xfe\xaa]\xb4X\ -\xdf\xd6\xd6\xd6\x05\xad\xadR\xb7\x96\x8a\xe2\x8e; \n\x02\x82 \n\xc8\x1e aMH\ -B\x96\x99{\xcf\xef\x8fsg\xcdd\x9b\xcc\x96\xe4|tH\xe6n\xe7\xdc\x9b\xb9\xdfy\ -\xees\x9e\xe79B\x18\x0e:\x13\xd22\xa5\xff{a8D\xac\xda\x8cE[\x1a\x8d&\xf1q\ -\xc6\xbb\x03\xb1"Xp!\xf6B\xa8\x05X\xa3\xd1@\'\x10\xdeD\x10\xdc`\xb4\x00k4\ -\x9d\x1b\xd1Q]\r\x89,\xb8\xfe\xc4\xbbO\x1a\x8d&\xf6t8\xe1\r%n\x908\x02\xa7\ -\xc5W\xa3\xd1t\x18\xe1Mt\xc1\r&\x1e\x83|\x1a\x8d&1\xe8\x10\xc2\xdb^\xadH-\ -\xbe\x1aM\xe7\xa4]\x0bo{\xb3rC\xa1\xc5W\xa3\xe9|\xb4[\xe1m\xafVn(:\xd2\xb9h4\ -\x9a\xe6iw\xc2\xdb\x11\xac\xdc\xc6\xd0\xd6\xafF\xd390\xe2\xdd\x81\xd6\xd0\ -\x91E\x17\x1a\x9eGc\xe7\xab\xd1h\xda7\xedFx;\xba\xe8z\xd0\xe2\xab\xd1t|\xda\ -\x8d\xf0\x06#\x0c\x87\xe8h\xa2\xeb\xa1\xa3\x9e\x97F\xa3Q\xb4\x0b\xe1\xed\x8c\ -\xbeO\xffs\xd4V\xafF\xd3\xb1hW\xb5\x1a:\x83\xe0\xfa\xe39_-\xbc\x1aM\xc7\xa2\ -\xddE5h4\x1aM{\xa7]Y\xbc\xe1\xd2\x1a\x8b1ZVug\x19\x1c\xd4h4\xcd\xd3\xa1-\xde\ -\xb6>\xa2\x87#\x8a\x91v\x0bha\xd6h:\x1e\x1dNx\xa3\xe5\x0fmJ\x00c\xe9\x83\xd5\ -B\xac\xd1\xb4\x7f:\x8c\xf0\xb6D\xfcrss\xb9\xf8\xe2\x8b9\xfd\xf4\xd3\xc9\xc9\ -\xc9\x01\xa0\xb6\xb6\x96g\x9f}\x96\xf7\xde{\x8f\x8a\x8a\x8a&\xf7O\xb4\x18[-\ -\xc2\x1aM\xfb\xa4\xdd\x0bos\xe2\x97\x9b\x9b\xcb\xe5\x97_\xce\xa9\xa7\x9e\xca\ -I\'\x9dDAA\x01\x00B(\xcd\x92R\xed~\xe8\xd0!^~\xf9e^x\xe1\x05V\xacX\x81i\x9a\ -\x11\xebcff&III\x8c\x1e=\x9a^\xbdz1b\xc4\x08\x00\n\n\n(**b\xd7\xae]\x94\x94\ -\x94\xb0y\xf3fv\xed\xda\xc5\xa1C\x87\xd8\xb2e\x0b\xb5\xb5\xb5-:\xbe\x16`\x8d\ -\xa6}\xd1n\x85\xb7)\xc1\x15B0f\xcc\x18\xae\xbb\xee:\xe6\xcc\x99Cff\xa6wy\xa3\ -\xc7\xb3\x05\xd8\xb2,\xbe\xf9\xe6\x1b\x96.]\xca\xd2\xa5Ky\xff\xfd\xf79p\xe0@\ -\x8b\xfb\x95\x9c\x9cLZZ\x1a\x93&Mb\xca\x94)\x9cz\xea\xa9\x1c\x7f\xfc\xf1\x18\ -\x86AJJJ@\x1f\xa5\x94\r~\x02\x98\xa6Iii)\x1b7nd\xd1\xa2E,[\xb6\x8c\r\x1b6\ -\xb4\xe8\xcb@\x8b\xb0F\x93\xf8\xb4;\xe1mNp\xc7\x8f\x1f\xcf/~\xf1\x0b\xa6O\ -\x9f\x8e\xd3\xe9lRl\x9bl\xc7\x16\xc1\xd2\xd2R\xa6O\x9f\xce\xbau\xeb\x9a\xdc>\ -%%\x85K.\xb9\x84{\xee\xb9\x87\xa2\xa2"\x92\x93\x93\xbd}j\x0bRJL\xd3d\xd5\xaa\ -U,]\xba\x94\xf9\xf3\xe7\xb3~\xfd\xfa&\xf7\xd1\xe2\xab\xd1$6\xedFx\x9b\x13\ -\xdc\xe2\xe2b\x1e|\xf0AN9\xe5\x14\x1c\x0eG\x9b\x05\xcf\xdb\xae\x94\xbc\xf0\ -\xc2\x0b\\y\xe5\x95!\xd7\xf7\xef\xdf\x9f\x193fp\xf3\xcd73t\xe8Po\x7f\xa2\x81\ -\x94\x12\x97\xcb\xc5\x92%Kx\xe3\x8d7\xf8\xe4\x93O\xd8\xb0a\x03n\xb7\xbb\xc1\ -\xb6Z|5\x9a\xc4\xa5]\x08oS\xa2[TT\xc4}\xf7\xdd\xc7\xe5\x97_\xde&\x0b\xb7)v\ -\xef\xde\xcd\xa8Q\xa3\x1a\x0c\xbe\x15\x17\x17\xf3\xe6\x9bo\x92\x97\x97\x07DO\ -p\x83\xf1wI,^\xbc\x98\x9f\xfc\xe4\'l\xd9\xb2\xa5\xc1vZ|5\x9a\xc4$\xe1k54&\ -\xbaIII\xfc\xf0\x87?d\xe5\xca\x95\\}\xf5\xd5$%%EM\xf8\xfa\xf4\xe9\xc3\x85\ -\x17^\xd8`\xf9\x19g\x9cA^^\x1eB\x88\x98\x89.\xe0m\xcf\xe9t2}\xfat>\xff\xfcsf\ -\xcd\x9a\xd5`;i\x992\xde\x91\x17\x1a\x8d\xa6!\t+\xbcM\x89FQQ\x11\x0b\x17.\ -\xe4\xc9\'\x9f\xf4\n_\xb49\xfb\xec\xb3\x1b,[\xbdzuL\x057\x14B\x08rrrx\xfe\ -\xf9\xe7\x99={v\\\xfb\xa2\xd1hZFB\no\xa3\xe9\xb5Bp\xe5\x95W\xb2b\xc5\nf\xcc\ -\x98\x81a\x181\x11>!\x8472!xy" \x84 --\x8d\x7f\xfd\xeb_\x8dZ\xbeq\xe8\x96F\ -\xa3i\x84\x84\x13\xde\xc6D\xc20\x0c\xfe\xfa\xd7\xbf\xf2\xcc3\xcf\xd0\xbd{\ -\xf7\x98\x8b^QQ\x11\x85\x85\x85\x01\xcb,\xcb\xf2\xfa[\xe3\x8dG|\x9f\x7f\xfey\ --\xbe\x1aM\x82\x93P\xc2\xdb\x988\xe4\xe4\xe4\xb0h\xd1"n\xbc\xf1\xc6\x88\xf9r\ -\x83\x05SJ\xd9\xa4\x88\x86\x8a\x94X\xb9re\x8b\x93\x1cb\x81\xbf\xf8N\x9d:5\ -\xde\xdd\xd1h4\x8d\x900\xd5\xc9\x1a\x13\xdd\xdc\xdc\\^\x7f\xfduN:\xe9\xa46\t\ -\xae\x94\x12\xb7\xdb\xcd\x8a\x15+8z\xf4(G\x8e\x1c\xe1\x9bo\xbe\xf1\xaeOKKc\ -\xec\xd8\xb1\x0c\x1e<\x98\xfe\xfd\xfb{\xdd\nM\xb5\x99H\x16\xaf\x07\x8f\xf8>\ -\xf9\xe4\x93L\x980! \x12CZ\xa6\xd4\x91\x0e\x1aM\xfcI\x08\xe1mLt\xfb\xf4\xe9\ -\xc3\xe2\xc5\x8b\x19:th\x9bE\xf7\xe0\xc1\x83\xdcu\xd7]\xcc\x9f?\x1f\xcb\xb2\ -\x1a\xdd6%%\x85Q\xa3F1c\xc6\x0cf\xcd\x9a\xc5\x88\x11#HJJ\xc20\x0cF\x8e\x1c\ -\xc9\x8e\x1d;\xc2\xeeG\xac\x10B0h\xd0 ~\xf3\x9b\xdfp\xdbm\xb7\x05\xac\xd3\ -\xe2\xab\xd1\xc4\x9f\xb8\xbb\x1a\x1a\x13\xdd!C\x86\xb0p\xe1\xc26\x8b.@EE\x05\ -3f\xcc\xe0\xd9g\x9fmRt\x01\xea\xea\xeaX\xb5j\x15\xbf\xfe\xf5\xaf\x19?~(t\x13\xd0\x0ei\x84\
-\x90\xae\xe7\xa9\xda\x02\xed\xe0\xe8&\xd8\xf1\x05t\xbe\xa2rMQ\n\xda_ \xc9\
-\x14n;\x12:\xe6\xe9\xcb\xd5\x88\xb0\xd1\x01Dky4\xf0\np1\x15#+\x8d\xb8*\xa6!i\
-\xe4\x18\xef\xb7R\xe2j\xd0`\xea\x92\xb7\x1f\xed\x9f\x07\x95\x82\x888\xe8z\
-\xb5\xb8\xad\xb6\xfc\x17\xbe\x9f\x0e\xb9G\xbc\xf7\xfb\xf8\x93M|\xf2\xd9\x9f\
-\xcf4\x1a\xad\x15\xd4k\rY\xfb\xab\xf7\x1cA=\xdf\x18>\xbc^\xf1\xdfZk\x96/\xcf\
-"\xb1\xb5F\x05\xf5\xe3\xc2\x1b\x96\x08H\xac%\xd7H\xb1`\x8a\xc5\x18\xfdV\x1b\
-\xb8\x0b)\xfc`>\xf9O=N\xd1g\x1f\xe2X\xb9\x0c\xe7\xba\xd58\x97\xfdH\xe1k\xb3(\
-|}6\xee-\xbbQ\x11V)\xeb|\nC\xdd\x14\xb1\xf9\xb0\xd0\xc5\xf0t;o\x96E\xba Z\
-\xc7\x19\x94\xf6\x87\x8f\x10o\xc7\xe2\xfb@\x9f\xc2\xf3\xb6a7\xe84\xc6x\xf3\
-\xb3\xcf\xf1MW\xc4U\x88\xc6\xf2~`"\xa2\xa9\xb1\x87\xf2\xfd\xf3v`2\xf0\xa1\
-\xf1>\nI\xa8\xe9\x8f\xb7%\xfa\rD[\xa5DUY\x0f\x0e\xa5 \xb2>\xf4\xf93\xdc\xba\
-\x06\x06\xdd\x06\x16\x9f~\x1e\xcc\xa5lB\x19\xa5\x8a.\xf8\x13\x83\xabb\x045\
-\x85%%\xd9\xbcBh\xf6\xec)$\xba\x9e\xac\x10\x87\n4\xd0\xb4\x17\xec\xfe\xa6f\
-\xcf\xeb\xc6-\xdc\xa2\xadh\xa5\r\xd9@\x0bX\xa2\xd0\xf6"\x9c_\x7f\x8d\xf3\xa7\
-\x9f\xa1YC,\t\xf5q\xa7\x1e\xc1}2\x13\xe5(\xc0\x12g\xc5\x8d\x0b\xb0\x80V\x95"\
-_\xad5\xbf;\xdd<\x9e\xebd\xa9C\x97\xd6\x05R\x88/\xf7\x1c\xc4\xda\xfc\x10)\
-\x01\xf15p\xad\xcf~-\x81f\x90u\x00\x8em\x86\xc6\x03*g\xf5j\xa0\xef\xcd\xb0m!\
-\x92\xb1\xf6\x03"\xd7i\x1eC!\x84y\x050\x17\xc8\x06^Fb{G\x00\x03\x81\xa1\x88\
-\xbb\xc0\x17s\x80\xf9H\x06\xdc\x10c\xdf\x04\xbc\xef\xd5j`\r4\x19\x011\xc9\
-\xa5\x0f\xe1\x0fJAlS\xb8\xe8eh\xd2\x0b\xbe\xbe\x17\x1c\x1ee\xa7*\x94f\x1c\
-\xc6)#\xaa\x1e\x14\x9c\xac\xfe\xf3\x04-\xf1Z\xad\xd0\xbd\xbb\xa7\xc3L\xb1|y\
-\x96\xffA\x10\xe4\xa8\xdf\xb6v\xce\xabQ(m\xc5\xa2\xdd\xc2\xa1\x16\xc0\xedFk\
-\x85\x1b\ryY\xb0+\x03m\xb1\x81\xcbm\xac\n\x83\xc5\xaa\xb0\xa0*\x15~\xac\xb5\
-\x90\xec{\x05.\x1e\xcau\xfa//\xa7\x80\x7f\x01\xf7\x177P\x08\xee\x0e`\x172\
-\xe5o\x8b71\x1a\xbfw\xeaj!\xde\xca@)\xe8p1\xb4\x1e\x0e\xfb\x7f\x06\x96#q\xb6\
-\xa3}\xce\x91\x00\xdc\x8a$:\xec\x00r\x91E\xb7\xaf\xca8x"\xa2\xd7a\xea3\xfb.\
-\xde\x19\xb1\xddJ\xc1\x05\xff\xae\xdc\xf3\xcb\xac\xd6\xd3\xe7\x16\xe8p\x11|p\
-\x85\\\x7f\xf1\xe1\xc3\xe4[mh\xd2\x0bNl\xab\xfe\xf3\x04\xad\xab!&\xc6Jl\xacw\
-\xf3\xdcA\x9c\x88P\x16Z\x0e+=m\xacnX\x8c\x88\\\xb1v\xc1\xed\xd6\xf2\xb2\xb8\
-\xd1\x16\r\x11\ne\xb5b\xd5\n\x8b\xcb\x89\xb2\x80\xc5f5\x16\xd3L\x96F\xfc\x15\
-e@\x1b\x95\x1fV:\xdc\x8cJ\xb7so \xd2\x8dDH\xf7o\xc6{%\xa7a\x8a\xb1\x1d`\x9f\
-\x9f\xef5\x91\x7f\xb6/\xac\xf8\xb5{BE\xc0\xf8W\xc1\x16\x83\x10\xe2o\x08\xa1\
-\x16\xe1\xed\x12\x88\x06\xaeF\xa2\x1d\xa2}^fbLg\x84l\'#\x0f\x8b\xd1\xf8\'\
-\xdd\xc3\xc0\xdbr\x8eVgC\xd3JZ\xea\xc5mW\x10\xdf\nn\xfe\tz\xfd\xc1\xfb\xb3\
-\xb0\xdb\xa1j\xe0{\x1f\x1b\xb4\x81\xfc\x8c\xd2\xfbU\xf5\x83.h-\xde\xc6\x8d#h\
-\xdc\xd8_\x80lhA)\xd1\x13H\xe9\x06G7\xca\xb6\x9a\xb3X4\x1a\x17n\xa5\x01\xabD\
-8h\x85.\xae<\xab\xd0V+XTq2\x852\n%VD\xbf\xdf\xcc<\xfbw\x9e\x839\x05e<\x15;#S\
-\xf9\xa1\xf8Y]\x02n\x07f#\x0bS\xe7\xe1\xed[5\xa2\x19\x0e\xae\x04\xe5\xa2\xd2\
-=V)H\xea\x06\x17\xfc\x13\xbe\xfe\x8b\xb1q5\xe2z\xb8\x140#d\xccv\x8dA\xd2}}a\
-\xae\x8c\xf9\xae\x90\xf9#\xdd\xf9\x80K\xe2\xbb\xcf\xffg\xe5\xdb\\|8\x89\x04$\
-c\x0fd\x1d\xf2\xf3y\xd8\xf2\xadR(\x0b$4\x01]\x03j\xfaAk\xf1B\x1dJS\xb7A\xef\
-\x1a\x8enQ\xc6\xff4R\xfe\xdb\x02R\x9bK\x83\xc2\x82\x05)\x88\xe8V\xe06\xe2\
-\x1a\xc0\x0c?\xc3(\x13\x8e\xdf\x05&\xb3\xc6\xd9*\x87\x9b\xd1\x19\xf6\xc0\xa4\
-\xab\x10\x12[\x8c\x7f\xd25\x11\x0b\xdc\x80,X\x05\x80#\x0fr\x0e\x97w\xd5\x811\
-\xe0vh\xef\xa9&w\x00\xf1\xd3\xae\xc6\xdb\xf2\r\xd4F\xe5\xf3\xaf/4\xe2*y\x17(\
-\x94\x05\x9a\x91\x0fC\xf3a\xa7\xd1\x8f\xdd\xb0\xec\x9f0g\x10\xec\xf7\x8d\x13\
-7O\x1b\xb6|\xab\x0cq)\xe2j\xa8\t\x045\xf1zBk(,\x0cM_\x83R0\xf0N\xe8ws\xc9\
-\xb6j\x1f0\xda$_+\n+\xca\xb0~\xb5\xc5\x83e\x94l\xd5\xb8\xb1\xa0\x8dD\n\x0b\
-\xaa8u\x18/\xd60\xa3\x15~w\xba\x99\x9a\xe3\xe0\xf2L\x07;\x02]F\n\xf0\x01\xf0\
-1\xa2\x0eV\x1e\xf9t/\xfbcg!\x14\xa4\x97\xbdO (\x05*\x12\xae\xfa\x18:\x8d\xf5\
-hK!\xa2&\xf6-\xa7\x9eahF?l@R\x86\r\x19\xd0\xf3\x1e\x83a\x0f\x9f\x06\xe9jX\
-\xf7\x1a|\xf7\xa8\xf7\xe2\x9a\xdf]\xc3\xe4[%hq\x16\xa4\x06Hd\xa9j\x84\x0c\
-\xf1\x16\x15i6n\xcc\xad\xedf\x9c2\xac10v\x16\x0c\xba\xbdd[u\x0e\x18\xad\x0c\
-\xd5\x05mP\xab\x02\xb0\xa0\xdc\x92\xf5\xe1\xd6n#\xf2A\xa1\xb4\x057\xe0Vn\xdc\
-\xca%\x0boX\x0cn6\x18\xdc\xa8\xe0{w\x8e\x83\xf32\x1c\xbc_\xe8\xa6\xc8\xdf\
-\x89-\xc8\x14\xfew$\xb1\xc0Tl\xabe\x14\xa7y\x7f\x06c_\x02\x9bgB\xc6\n\x84\
-\x80\x0f\x03\'\x91\xe8\x86\x8a\xc2\x0e,\x02\x16\x02\x85\x10\x19/\xd2\xa1\x83\
-\xef\xe5\xb4\xae\xdb\x9e\x05??\x89\xff\x108?\x08\x93o\xe5\xe1y\xcf\xac\x910\
-\xfc\xaf\x90\xb6\xb1f\xce\x1d\xb4>^_X\xad\x18>\xdf\xd0J\xa00\xa1\x14`\x85\
-\xb6#a\xe5\xff\xd5\xc0\xf9\xb4\x067X\xdcF,\xaf\x06\x0b\x16\xdc\xda\xed?\xe3\
-\xc9s\x9b\x87?S\xf2\x044\xef\x14\xbay*\xdf\x15\xb8\n\x84B\x08\xf7.$R\xc1\xac\
-2^Q\x04\x98JW%\x94\x02"\xa0\xff\x1d\x90\xd8\x1c\xbe\xf9;\x9c\xdci\xc8R\xac1^\
-\xc6\xef\x84\x99\xa9nE\xa4?\x03\xe1(R\x0e\x08\x89\x9e\x18\xff\xaa\xc4\x0f\
-\x9f\x0e\x0bj\r?>\x06\x99\xfb\x81\x86@+$\xda\xc3\xd0\x1d&\r\x89}^\x82\x97\
-\xf2]\xd8\xe7{\xeah\xda\x07\x1a\xf5\x94\xfeP\x13\x08\x19\xe2\x8d\x88P\xb4n\
-\x1dMZ\x88\x12\xaf\xab\x08V\xbe\x08\xdf<\xe8\xbd\xbd\xba\x06\x8b\xbb\xb0\x08\
-\xb7]\xa3\x9c\x0eSJ\xdb\x88\xcd\xd5~y\xb74\x14\x0e4\xffqj\xde\xd6\x92\xdf\
-\x10\x10]\x81\x07\x908\\k\xb9\x07\xf6w*\t\xf3\xf2\x85\x99\x1d\x86D\x85\xd8b\
-\xfc\xecs\nP\n:^\n\xedF\xc3\xd1u\xf0\xcb\x0b\xf0\xfbg\xa0\xcd"\xa6N \xc7\xe3\
-\x0beTGW\x16H\xea n\xa4\x81w\x82-^\xae\xe7\x94=\x0c\x1a\xf2Sa\xcd\xbbHB\xc6Y\
-\xc8=\xf5\\\xdc\x8bE\xdc8~ -\xdcS\x80R\xa2\x9a\xd4\xefv\x98\xb6S\xea\xa1\
-\xf5\xbfI2\x88\x8a\x93\x08\xf3\x90iU\x1a\xd2\x99W \xa1b\xe66\x0f\xd2\x8dL\
-\x80\xcb\xde\xa8;\xa4[x\x12\xbe{\x00\x16\xdd\t\x99\xfb\xe1\xc2\x0b\x1b\xb0dI\
-\xefb\xd2\xcd\xcbs3}\xfa~z\xf6\\\xc5\x9c9\xa9\x15"]e\xb1*\xf3U\x95\xed\xad\
-\xe81\x0f\x1d*\xe2\xaa\xab\xb6p\xe3\x8d\xdb\xc8\xcar\x11\x1fo\xe1\xde{\x9b\
-\xb3`AO\xec\x9b\xa2y\xed,\xd8\xfa>\x94*\x9a\x1adp\x16A\xf6!?\x1f\xd8\x91\xac\
-8\x85\x7f\x15\xb4S\xc1\t?\xdb\xf2\xa8P\xddAw!|\xfaG\x98|cs\x86\x0eM\xe4\xc9\
-\'\x0f\x96"\xdd\xdaFm\x07]U\n\xcabU\xfe\xac\x8c\x83\x07\x8b\xb8\xe5\x96\x1d|\
-\xf0A7/\xab\xe1\xfe\xfb[\xf2\xe5\x88\x13\xacz\xa9\x80A\xf7\x10T\xc4\xa4\x94(\
-z\xb5\xbbX^\xa3s 7\x15R\xd7\xc8j\xf1\t\xa3\x8a\x84=\x1b\xd2\x02)h\xf5\x87Q3\
-\x0c?W\x10]\xdb)A\xc3\xd1\xb5\xb0\xe0fQ\xe3\x8a\x8cT\xdcs_K\x9ex\xa2M\xb1ka\
-\xdd\xba<\xa6N\xdd\xc9\xf2\xe5\xa5\xb3\x8e\xfc\xa1\xa6,\x1a\xcf\xf3\x04\xb2\
-\x82\xddnx\xef\xbdc\xacY\x93\xc3\xacY\x9d\x191"\x91\x0b/\xac\xcf\xaaU\xfd\
-\xb9\xf4\xd2\xcd|\xf2\xc7,\x8em\x11\xbd\x01\x82\xd4\xf5`\xcf\x81\xbc\xe3\xc6\
-\x9b\x86\x94\xf8_#\x90\x99\x99\x85\xd2V\xea\xa9\xc2\xdf\xf5\x17"\xba\xc4\x06\
-l~\xca\x18i\r[?\x06\xc7\xde\x08\xfe\xf1Ekv\xee,\xe0\xa3\x8fJO+k[o"\xa4\x88\
-\x17\x02\x93\xef\x82\x05\'x\xe9\xa5\xc3L\x9b\xd6\xac8\x1f?%\xc5\xc6\x92%\xbd\
-\x19 Please click HERE
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/contents.hhc b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/contents.hhc
deleted file mode 100644
index 9ecf3537b6..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/contents.hhc
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-\xd7\x06D\xa3F\x11\
-\xdcyg\x0b\xae\xbe:\x85\x8e\x1d\xa3\x8b\tx\xf7\xee"f\xcfN\xe5\xf9\xe7\x0f\
-\x12\xddP\xaa\xda\xf6\x98\x14X\x0b\xb9*P\x9c\x1c\xa2\xfc\xbf\xaf\x8a\xe3\xbb\
-s\xe1\xe5^\x90\xb9\xafj\x8eY."\x11\r\xeb_(\xd6\x9a\xb8\xf4u\xe8us\xf9\xd7\
-\xe5.\x84Wz\xc2u\x175g\xec\xd8\x86\x8c\x19\xb3\xb1\xd4>\xb5\x11\xa5\x11\xb2\
-\xc4\x0b\x92@1gNG\xaf\xe9\xde\xfc\xf9\xc7y\xf4\xf5\xad\xfc\xe1\x0b#\xe8\xbd\
-\x96\xa15d\xef\x85E\xb7\xc3\xae\xff\x19\x1b\xa3\x10\xab\xb5\x0b%.\x85\xf2B\
-\x81\xca\xfal=\xc5\xd5\x1f:\x8f\x87\xab?\xab\x98\xef+d\xa0!\xff(,\xbe\x076\
-\x7f\x08\xb11\x16f\xcf\xee\xcc\x95W&\x13\x11\xa1\x8a\x89NkX\xbd:\x97\xf7\xdf\
-?\xc6\xec\xd9\xa9\x14\x14T#\xdb\xfaA\x83\x066\xa6Nm\xc1\xf8\xf1\r\xe9\xd3\'\
-\x0e\x8bE~\xff\r\x1b\xf2x\xf0\xc1\xbd\xfc\xef\x7f\xe9\xb49\x07\xc6\xbd\n\r:\
-\x87\xe6\x83Qk\xd8\xf46|v3\xd5k\xf1Z\x90Yb\x1fd\x9cD \x95N~\x94\x8f\x9b\xf6\
-\x85)+\xcb\x9e\xd9j\r\xab^\x84uOE\xb2a\xc3\x00\xa6L\xd9\xce\x17_\x9c,\xb5_\
-\x98x\xcb\x80?\xf2\x8d\x89\xb1\xb0jU\x7f\xbau\x8b)&_\x87C3q\xe2\x16\xec\xc3O\
-r\xd6}\x04M\xaa\xaa3_\\\x0f?\xfe\x0b\x1cf\xc2\x8cB\x02\xdfG I\x10\x95\xf9)\
-\xcc\xbb\xf1;\x12\xb7\xeb\x12\xcd\x84)\xbf@B\xeb\xd0\x1c\xd4\xbe0}\x99kg\xc3\
-\xb7\x0fK\x12\xc1y\xe75\xe0\xc9\'\xdb\xd2\xbf\x7f|1\xe1\x82b\xc5\x8alf\xce<\
-\xccG\x1f\x1d;%\xeb6\xd0\xe0;\x15\xcd\x02\xab\x15&Nl\xc4c\x8f\xb5\xa1S\'\x89\
-9\xb7\xdb5O=u\x90W_M\xa50\xd2\xce\x95\x1f@\xd3\xb3B\xefw\xca9\x08\xaf\xf6\
-\x85\x82\x91\x94\xc4\x10\x83\xd4\x82\xfb\x15IS~\x10)\x1be7\xb6\x81\x08\xfa\
-\xecCB\xdb|}\xc4Q\x08\xb9\x0e\x03v#\xeakC\x90H\x1fO\x83#\r\x98#\x7fZ#\xc5\
-\xddPV\xdd\xc5\x8c\xed\xf0\x7f}\xe1\xf1G\xdbq\xc5\x15\xc9t\xeb\xb6\n\x87\xc3\
-\xfb\xe7\xac\xad\x98\xe4\x90&^\x80+\xaeH\xe1\x83\x0f\xbab\xb5\x96X\xbd\xbbv\
-\x15r\xd55[\x1883/h:\xb79\xe5;\xbcL\\\x0f\xa5\n\xec\xc5"\xa1b\x1d\x91\xc5\
-\xb3\xb2|\xd4\x99H\x16\xd3Z\xa4C#.\x86k>\x81\xf6\xe3\x82\xe3zO\x17ZC\x81i\
-\xe5~\x04\xd1\x91\x16\x1e~\xb85\x7f\xfb[\xcbbyP\x80%K2y\xe1\x85C|\xfbm\x06Ng\
-\xc59\xf2T\x07\\e\x8882R\xf1\xc0\x03\xad\xb9\xf3\xcef$\'\xcb\x0f\xbacG\x01S\
-\xa6\xec`\xf9/Y\x0c\xfb\x1b\x9c\xf3\x8fS\xf3\xb9\xd6\x06\xb4\x865/\xc3\x97w\
-\x03\xb7#i\xeaf\xbb\x17#\xba\x11\x0f\x03\x8fQ2\x833\xe1F\x08w;\xdeR\xa6 \xc6\
-\x87\xa9\xa8\xf7
\xbc>S\
-\xa64e\xec\xd8\x86\xc4\xc5\x954\xb6\xb0P\xf3\xfe\xfb\xc7x\xea\xa9\x03\xec\
-\xd8QP\xc6\xc1C\x7f`\x84\x1a\x02\xf5\xe3A\x83\x12x\xe4\x916\x8c\x1d\xdb\x80\
-\xbd{\x8b\x183f#\x873\n\x18\xfd\x0c\xf4\xbc\xa1\x163\xdd(\x89\x92Y\xf6$\xac\
-\x9c%Q2\xf1\xf1V\xfe\xf3\x9f\x0e\xec\xdbW\xc8\xcc\x99\x07\xfd\xce\xa4\xeaB\
-\xdf:\xe3\x89\x17\xca&_\x90\'\xf0\xf9\xe77\xe0\x81\x07Z1lX=\xaf\xa4\x8b\xe2c\
-\x18!h\xbbv\x15\xf2\xe5\x97\xe9|\xf4\xd1Q\xd6\xaf\xcf\x93\x02\x8d\n\xa2\xeb\
-\x89r\x7f\xeba\xd0\xf9\x12\xb1\x86#\xe2\xc0\x12I\x8d\x10\xb1i\xd9\xba\xed\
-\x12\x17\xb9q\x1e\xec\\\x0cG7C\x84E\xd1\xaf_\x02\xc3\x86\xd5\xe3\xfa\xeb\x9b\
-\xd0\xad[,J\xe9b\x0b77\xd7\xcd\xfc\xf9\xc7x\xfe\xf9\x83\xec\xdcYP\xaex|]\x18\
-\x18\xa1\n\x7f}9"Bq\xef\xbd-\xb9\xef\xbe\x16de\xb9\x183f#\xbbv\x170\xf4\x1e\
-\x18\xf1\x88h\xfb\xd6\xb41\xa05\xa4\xfd\n\x0b\xfe\x0c\xc76\xcb\xb6\x0b.h\xc0\
-\xfd\xf7\xb7\xe6\xc5\x17\x0f\xb2pai\xd7\x02\xd4\x9d\xbe\x15&^\x03\xe5\x91/\
-\x885\xd8\xbf\x7f\x02O=\xd5\x8e\x81\x03\x13\x88\x8aR\xa5\x08\x18\x84\x84].)C\
-\xb4xq:\xf3\xe6\x1de\xd5\xaal/Q\x98\xc8\x04\x88o\x0c-\x07C\x83\xb6\xd0l \xb4\
-\x1e\x01\xd6\x08\xb0\xc5\x1a\xc7\x81S\x1e\x10\x9eD\x9b\xb5\x0f\x0e\xae\x80\
-\xbd?\xc0\xc1_%s(&\xc2\xc2\xa0A\xf58\xe7\x9cz\xdcpC\x13Z\xb5\x8a\xf4\xb0\xe8\
-5ZCf\xa6\x8b\xcf>;\xc1\xb3\xcf\x1ed\xeb\xd6\xfcr\xcfYW\x06E(\xa3\xac~|\xd6Y\
-\x89<\xf4P+\xbav\x8d\xe3\x96[v\xf0\xddw\x19\xc45\x82K_\x87\x0e\xe3jf]\xc2\\\
-\xb8\xdd\xf2>|9\r\n3d\r\xe1\xbe\xfbZR\xaf\x9e\x8d\x87\x1f\xdeCjj\xdd\x97\x08\
-\r\x13\xaf\x07*B\xbe \x9d\xb3M\x9bh\x9ex\xa2-\xa3G\'\x19\xf5\xc2t@\x12\xd6\
-\x1a\x8e\x1ds\xf0\xd1G\xc7Y\xba4\x8bM\x9br\xd9\xb7\xaf\x10\x87\xc3\xfbt\xd6H\
-\x88I\x82\x06\xed\xe4}J\x17\x88K\x86\x96C\xc1b\x93\x92\xd6\xf1\xcd\x02\xb7\
-\xab(\x0bNl\x85\xfc\xe3pl\x0b\x9c\xdc%\xff\xa6\xef\x81\xa8\x08E\xbf~\x89\xf4\
-\xe9\x13G\x9f>\xf1\x8c\x19\x93D\x8b\x16Qf+\x8b\xad[\xad\x15\xfb\xf7\x172s\
-\xe6a\xdex#\x8d\xac\xac2\x12\xec=\xefI\x1d\x1a\x14u\x01eE\xee\\\x7f}\x13\x1e\
-~\xb85S\xa7\xee\x14\xcb\xd2\x02\xed\xcf\x83s\x1e\x86\xe6g\x01\xd5\xa0K\xad5\
-\xe0\x84\xdf?\x84eFhb\x84M1aB2\xe3\xc6%\xf3\xfe\xfbG\xf9\xe6\x9b\xf43F"4L\
-\xbc~PQ\x02\x06\x88\x89\xb10th=.\xbb,\x99+\xaeH\xa1Q#)\xda\x18\x88\x84A\xe1t\
-j\x0e\x1c(b\xf3\xe6<\xd6\xac\xc9a\xcb\x96<\xd6\xaf\xcf%\'\xc7Ez\xba\x03W\x00\
-\xaeSV\x08\xf8s)\xc0\r\tq6l6\xc5\x80\x01\t\xf4\xea\x15G\xa3F\x91\xf4\xec\x19\
-G\xd7\xae\xb14k\x16\x89\xc5\xf0\xe9yf\xe9\x81X\xb7_}\x95\xcek\xaf\xa5\xf1\
-\xcb/Y\x01\xd5\xc3J\x9d\xb6\x8e\r\x88\xba\x86@}9%%\x82\xc7\x1fo\xc7\xde\xbd\
-\x85<\xf7\xdc\x01\x1c\x0e\x8d\xb2BJW8\xe7A\xe8\xdeJ\xaf^R7\xa5m\xdb\x18bb,X,r\xdc\xb2\x1e\
-\x00\xb9\xb9.V\xaf\xce\xe1\xbd\xf7\x8e\xf1\xd1G\xc7*l\xddB\xdd\x1c\x0cu\x15e\
-\xf5\xe3n\xddb\x998\xb11\xef\xbf\x7f\x84]\xbbJ\x16L\x13\x9aC\xd7\xf1\xd0\xe3\
-\x0f\xd0\xb4?\xd8\xe2\xca\'a\xd3\xbd\x85\x1brSa\xefR\xf8\xf5EH]\x8b\x99INT\
-\x94\xe2\xd2KS\x88\x8f\xb7\xf1\xfe\xfbG\xc8\xcf?3\xc3\x10\xc3\xc4[\x0e*K\xbe\
-&,\x16\xa9\x1c0~|2\x13&4\xa4A\x03\x1b-ZDa\xb1\xa8Z\xaa\x16 \x97\x91\x9e\xeed\
-\xed\xda<\x16-:\xc1\xa2E\'\xd9\xb3\'p\x9d3\x7f\xa8\xcb\x83\xa1.\xa3\xac~\x1c\
-\x13ca\xf0\xe0D\x92\x93#\xf8\xf6\xdb\x0c23\xbd\x1f\xf6\x89-\xa0\xeb\x04h\xd6\
-\x0f\xea\xb7\x83\xc4V\x12\xb1\x13\x97,\x9fg\x1f\x06\xb7\x0b\xb2\x0f\x88e\xbb\
-\xffg\xb1l\x9d\x1e\x81/\xf1\xf1\x16:t\x88!3\xd3\xc9\xf1\xe3\x8e\x80"\xf8&\
-\xeaz?\x0b\x13o\x05q\xaa\x04\x0cB\xc2V\xab\xa2W\xafx&LhH\x93&\x91\x0c\x1c\
-\x98HB\x82\x95V\xad\xa2\x0c\xab\xb8l\xcb\xb8Rm5H\xd6\xe5\x82\x8c\x0c\'\x1b6\
-\xe4\xb2aC\x1eK\x97f\xb2lY\x16YY\xceJ\x97\xb5\xaf\xeb\x03\xe1LAY\xfd8!\xc1\
-\xca\x88\x11\xf5IM-b\xf7\xee\x02\xb2\xb3\xfd\xcc\x80\x8c\xe4\x8b\x88X\x88m(\
-\x9b\xb2S%\x14Lk\xf0,\xe3\x1e\x15\xa5\x185\xaa\x01n\xb7f\xe7\xce|\xf6\xed+\
-\xaaP\xbf;\x13\xfaZ\x98x+\x81\xd3!_\x7f\x88\x8cT4n\x1cI\xd7\xae\xb1\x8c\x18Q\
-\x9f\x86\r#\x182$\x11\xad\xe5\xb3\xf6\xedc\xd0Zc\xb1(\xfe\xbf\x9d\xbbWM\x18\
-\x8c\xc28\xfe\x18\x89\xa6Z\x89kwQ\x10\x15\x17\xaf\xc7\xdb\x14\\3(^\x80 \xf8\
-\xb5k\xd1P\x8d%\x89\xe9\x10\n\xd6Z\x13\xbfj\xce{\xce\x7f\x16\xcc\xf0\xf3\xe1\
-%\t\xea\xfa\xef\x93r\x10\x00\x9e\x17\xc0\xf7\x038\xce\x1e\xf3\xf9\'f3\x07\
-\xe3\xf1\x0e\xbd\x9e\x8d\xc9\xc4\xc1t\xba\xfb\xf3/\x19\xa3\xe2\xf0\x03\xe0X\
-\x1c\xc7\x95\xca\x0b\x0cC\x83\xe3\xec\xb1X\xb8\xb1nye\xb3)\x94J94\x9b\x05T\
-\xab9x\x1e`Y+t\xbb\xef\xb1\xaf\x8d\x8b9\x19\xde+\xba\xf7\x00\x1f\xf6=\xae\
-\xe9t\n\xc5b\xf8\xa0\xce4\xd3\xa8\xd7_O~~8\xdcb\xb9t\xe1\xba{\xd8\xb6\x7f\
-\xf1I\xf6\xc7w3A/\xc57\\.\xe7\xd0h\xe4aY+\xd4jy\xac\xd7\x1e\x06\x83\x0f\xe8z\
-\n\xed\xf6\x1b\x0cC\x83ah\xc8d4\xb4Z\x05\x8cF[t:K\xf4\xfb\xf6\xd9\xfb\xb7\
-\xc7q\xb3\'\xc3{\xd0#\x075\xe9q\x83\xcf\xbd[\xadk\x1a`\x9a\xe1\xc1`\xb3\xf1c\
-\xbf\x05\x13\x15\x17\x87\xac\x87\x97\xf3\xd0\x1e\xc7\x05<\xd7([W\xd1&\xbb\
-\xe1\xa5\x0c\xf0?S\x11;\xa7TwN\xdd\xa7\x0c\xaftU\xd4\xe1\xab\x94\x98\x0e\xa3\
-d\x92\xdd\xf0\x02\x02\xf5\x91Q\xc2O=q|\xbe$[d9\xbc\xe7\x12\xcc\xb7\x95d\xec\
-\x9c\xe2\xee8\xe9\x0eex/\x88;\xe6\xa8\x92\x8e]\nS\xd91\x15\x832\xbcwLU\xd0T0\
-K\xf7\x8d\x82g\xaa6ex\x9f\xdc3pS\xc5*\xd1\xe9V\xd7\xaa\x1b\xfd\x028\xc0\xaeS\
-5\x9dLZ\x00\x00\x00\x00IEND\xaeB`\x82'
-
-def getVippiBitmap():
- return BitmapFromImage(getVippiImage())
-
-def getVippiImage():
- stream = cStringIO.StringIO(getVippiData())
- return ImageFromStream(stream)
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/mdi.py b/wxPython/samples/wxPIA_book/Chapter-08/mdi.py
deleted file mode 100644
index 5d15900313..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/mdi.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import wx
-
-class MDIFrame(wx.MDIParentFrame):
- def __init__(self):
- wx.MDIParentFrame.__init__(self, None, -1, "MDI Parent",
- size=(600,400))
- menu = wx.Menu()
- menu.Append(5000, "&New Window")
- menu.Append(5001, "E&xit")
- menubar = wx.MenuBar()
- menubar.Append(menu, "&File")
- self.SetMenuBar(menubar)
- self.Bind(wx.EVT_MENU, self.OnNewWindow, id=5000)
- self.Bind(wx.EVT_MENU, self.OnExit, id=5001)
-
- def OnExit(self, evt):
- self.Close(True)
-
- def OnNewWindow(self, evt):
- win = wx.MDIChildFrame(self, -1, "Child Window")
- win.Show(True)
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- frame = MDIFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/miniframe.py b/wxPython/samples/wxPIA_book/Chapter-08/miniframe.py
deleted file mode 100644
index 91080f452c..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/miniframe.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import wx
-
-class MiniFrame(wx.MiniFrame):
- def __init__(self):
- wx.MiniFrame.__init__(self, None, -1, 'Mini Frame',
- size=(300, 100))
- panel = wx.Panel(self, -1, size=(300, 100))
- button = wx.Button(panel, -1, "Close Me", pos=(15, 15))
- self.Bind(wx.EVT_BUTTON, self.OnCloseMe, button)
- self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
-
- def OnCloseMe(self, event):
- self.Close(True)
-
- def OnCloseWindow(self, event):
- self.Destroy()
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- MiniFrame().Show()
- app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/scroll_window.py b/wxPython/samples/wxPIA_book/Chapter-08/scroll_window.py
deleted file mode 100644
index 2ea57a77bf..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/scroll_window.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import wx
-
-class ScrollbarFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, 'Scrollbar Example',
- size=(300, 200))
- self.scroll = wx.ScrolledWindow(self, -1)
- self.scroll.SetScrollbars(1, 1, 600, 400)
- self.button = wx.Button(self.scroll, -1, "Scroll Me", pos=(50, 20))
- self.Bind(wx.EVT_BUTTON, self.OnClickTop, self.button)
- self.button2 = wx.Button(self.scroll, -1, "Scroll Back", pos=(500, 350))
- self.Bind(wx.EVT_BUTTON, self.OnClickBottom, self.button2)
-
- def OnClickTop(self, event):
- self.scroll.Scroll(600, 400)
-
- def OnClickBottom(self, event):
- self.scroll.Scroll(1, 1)
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- frame = ScrollbarFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame.py b/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame.py
deleted file mode 100644
index 513ab464a9..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import wx
-import images
-
-class ShapedFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Shaped Window",
- style = wx.FRAME_SHAPED | wx.SIMPLE_BORDER |
- wx.FRAME_NO_TASKBAR)
- self.hasShape = False
- self.bmp = images.getVippiBitmap()
- self.SetClientSize((self.bmp.GetWidth(), self.bmp.GetHeight()))
- dc = wx.ClientDC(self)
- dc.DrawBitmap(self.bmp, 0,0, True)
- self.SetWindowShape()
- self.Bind(wx.EVT_LEFT_DCLICK, self.OnDoubleClick)
- self.Bind(wx.EVT_RIGHT_UP, self.OnExit)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
- self.Bind(wx.EVT_WINDOW_CREATE, self.SetWindowShape)
-
- def SetWindowShape(self, evt=None):
- r = wx.RegionFromBitmap(self.bmp)
- self.hasShape = self.SetShape(r)
-
- def OnDoubleClick(self, evt):
- if self.hasShape:
- self.SetShape(wx.Region())
- self.hasShape = False
- else:
- self.SetWindowShape()
-
- def OnPaint(self, evt):
- dc = wx.PaintDC(self)
- dc.DrawBitmap(self.bmp, 0,0, True)
-
- def OnExit(self, evt):
- self.Close()
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- ShapedFrame().Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame_mobile.py b/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame_mobile.py
deleted file mode 100644
index 9e592ed460..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/shaped_frame_mobile.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import wx
-import images
-
-class ShapedFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Shaped Window",
- style = wx.FRAME_SHAPED | wx.SIMPLE_BORDER )
- self.hasShape = False
- self.delta = wx.Point(0,0)
- self.bmp = images.getVippiBitmap()
- self.SetClientSize((self.bmp.GetWidth(), self.bmp.GetHeight()))
- dc = wx.ClientDC(self)
- dc.DrawBitmap(self.bmp, 0,0, True)
- self.SetWindowShape()
- self.Bind(wx.EVT_LEFT_DCLICK, self.OnDoubleClick)
- self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
- self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
- self.Bind(wx.EVT_MOTION, self.OnMouseMove)
- self.Bind(wx.EVT_RIGHT_UP, self.OnExit)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
- self.Bind(wx.EVT_WINDOW_CREATE, self.SetWindowShape)
-
- def SetWindowShape(self, evt=None):
- r = wx.RegionFromBitmap(self.bmp)
- self.hasShape = self.SetShape(r)
-
- def OnDoubleClick(self, evt):
- if self.hasShape:
- self.SetShape(wx.Region())
- self.hasShape = False
- else:
- self.SetWindowShape()
-
- def OnPaint(self, evt):
- dc = wx.PaintDC(self)
- dc.DrawBitmap(self.bmp, 0,0, True)
-
- def OnExit(self, evt):
- self.Close()
-
- def OnLeftDown(self, evt):
- self.CaptureMouse()
- pos = self.ClientToScreen(evt.GetPosition())
- origin = self.GetPosition()
- self.delta = wx.Point(pos.x - origin.x, pos.y - origin.y)
-
- def OnMouseMove(self, evt):
- if evt.Dragging() and evt.LeftIsDown():
- pos = self.ClientToScreen(evt.GetPosition())
- newPos = (pos.x - self.delta.x, pos.y - self.delta.y)
- self.Move(newPos)
-
- def OnLeftUp(self, evt):
- if self.HasCapture():
- self.ReleaseMouse()
-
-
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- ShapedFrame().Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/simple_frame.py b/wxPython/samples/wxPIA_book/Chapter-08/simple_frame.py
deleted file mode 100644
index acea15b7ec..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/simple_frame.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import wx
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- frame = wx.Frame(None, -1, "A Frame", style=wx.DEFAULT_FRAME_STYLE,
- size=(200, 100))
- frame.Show()
- app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-08/splitter.py b/wxPython/samples/wxPIA_book/Chapter-08/splitter.py
deleted file mode 100644
index 8699db640e..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-08/splitter.py
+++ /dev/null
@@ -1,101 +0,0 @@
-import wx
-
-class SplitterExampleFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, title=title)
- self.MakeMenuBar()
- self.minpane = 0
- self.initpos = 0
- self.sp = wx.SplitterWindow(self)
- self.p1 = wx.Panel(self.sp, style=wx.SUNKEN_BORDER)
- self.p2 = wx.Panel(self.sp, style=wx.SUNKEN_BORDER)
- self.p1.SetBackgroundColour("pink")
- self.p2.SetBackgroundColour("sky blue")
- self.p1.Hide()
- self.p2.Hide()
-
- self.sp.Initialize(self.p1)
-
- self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGING,
- self.OnSashChanging, self.sp)
- self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED,
- self.OnSashChanged, self.sp)
-
-
- def MakeMenuBar(self):
- menu = wx.Menu()
- item = menu.Append(-1, "Split horizontally")
- self.Bind(wx.EVT_MENU, self.OnSplitH, item)
- self.Bind(wx.EVT_UPDATE_UI, self.OnCheckCanSplit, item)
- item = menu.Append(-1, "Split vertically")
- self.Bind(wx.EVT_MENU, self.OnSplitV, item)
- self.Bind(wx.EVT_UPDATE_UI, self.OnCheckCanSplit, item)
- item = menu.Append(-1, "Unsplit")
- self.Bind(wx.EVT_MENU, self.OnUnsplit, item)
- self.Bind(wx.EVT_UPDATE_UI, self.OnCheckCanUnsplit, item)
-
- menu.AppendSeparator()
- item = menu.Append(-1, "Set initial sash position")
- self.Bind(wx.EVT_MENU, self.OnSetPos, item)
- item = menu.Append(-1, "Set minimum pane size")
- self.Bind(wx.EVT_MENU, self.OnSetMin, item)
-
- menu.AppendSeparator()
- item = menu.Append(wx.ID_EXIT, "E&xit")
- self.Bind(wx.EVT_MENU, self.OnExit, item)
-
- mbar = wx.MenuBar()
- mbar.Append(menu, "Splitter")
- self.SetMenuBar(mbar)
-
-
- def OnSashChanging(self, evt):
- print "OnSashChanging:", evt.GetSashPosition()
-
- def OnSashChanged(self, evt):
- print "OnSashChanged:", evt.GetSashPosition()
-
-
- def OnSplitH(self, evt):
- self.sp.SplitHorizontally(self.p1, self.p2, self.initpos)
-
- def OnSplitV(self, evt):
- self.sp.SplitVertically(self.p1, self.p2, self.initpos)
-
- def OnCheckCanSplit(self, evt):
- evt.Enable(not self.sp.IsSplit())
-
- def OnCheckCanUnsplit(self, evt):
- evt.Enable(self.sp.IsSplit())
-
- def OnUnsplit(self, evt):
- self.sp.Unsplit()
-
- def OnSetMin(self, evt):
- minpane = wx.GetNumberFromUser(
- "Enter the minimum pane size",
- "", "Minimum Pane Size", self.minpane,
- 0, 1000, self)
- if minpane != -1:
- self.minpane = minpane
- self.sp.SetMinimumPaneSize(self.minpane)
-
- def OnSetPos(self, evt):
- initpos = wx.GetNumberFromUser(
- "Enter the initial sash position (to be used in the Split call)",
- "", "Initial Sash Position", self.initpos,
- -1000, 1000, self)
- if initpos != -1:
- self.initpos = initpos
-
-
- def OnExit(self, evt):
- self.Close()
-
-
-app = wx.PySimpleApp(redirect=True)
-frm = SplitterExampleFrame(None, "Splitter Example")
-frm.SetSize((600,500))
-frm.Show()
-app.SetTopWindow(frm)
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/choice_box.py b/wxPython/samples/wxPIA_book/Chapter-09/choice_box.py
deleted file mode 100644
index 17693fc0d1..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/choice_box.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- choices = ["Alpha", "Baker", "Charlie", "Delta"]
- dialog = wx.SingleChoiceDialog(None, "Pick A Word", "Choices",
- choices)
- if dialog.ShowModal() == wx.ID_OK:
- print "You selected: %s\n" % dialog.GetStringSelection()
-
- dialog.Destroy()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/color_box.py b/wxPython/samples/wxPIA_book/Chapter-09/color_box.py
deleted file mode 100644
index 94e709e484..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/color_box.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dialog = wx.ColourDialog(None)
- dialog.GetColourData().SetChooseFull(True)
- if dialog.ShowModal() == wx.ID_OK:
- data = dialog.GetColourData()
- print 'You selected: %s\n' % str(data.GetColour().Get())
- dialog.Destroy()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/dir_box.py b/wxPython/samples/wxPIA_book/Chapter-09/dir_box.py
deleted file mode 100644
index 36cc79b00e..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/dir_box.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dialog = wx.DirDialog(None, "Choose a directory:",
- style=wx.DD_DEFAULT_STYLE | wx.DD_NEW_DIR_BUTTON)
- if dialog.ShowModal() == wx.ID_OK:
- print dialog.GetPath()
- dialog.Destroy()
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/file_box.py b/wxPython/samples/wxPIA_book/Chapter-09/file_box.py
deleted file mode 100644
index ff46e39701..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/file_box.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import wx
-import os
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- wildcard = "Python source (*.py)|*.py|" \
- "Compiled Python (*.pyc)|*.pyc|" \
- "All files (*.*)|*.*"
- dialog = wx.FileDialog(None, "Choose a file", os.getcwd(),
- "", wildcard, wx.OPEN)
- if dialog.ShowModal() == wx.ID_OK:
- print dialog.GetPath()
-
- dialog.Destroy()
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/font_box.py b/wxPython/samples/wxPIA_book/Chapter-09/font_box.py
deleted file mode 100644
index 969e596b9e..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/font_box.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dialog = wx.FontDialog(None, wx.FontData())
- if dialog.ShowModal() == wx.ID_OK:
- data = dialog.GetFontData()
- font = data.GetChosenFont()
- colour = data.GetColour()
- print 'You selected: "%s", %d points\n' % (
- font.GetFaceName(), font.GetPointSize())
- dialog.Destroy()
-
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/image_box.py b/wxPython/samples/wxPIA_book/Chapter-09/image_box.py
deleted file mode 100644
index b425400056..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/image_box.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import wx
-import wx.lib.imagebrowser as imagebrowser
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dialog = imagebrowser.ImageDialog(None)
- if dialog.ShowModal() == wx.ID_OK:
- print "You Selected File: " + dialog.GetFile()
- dialog.Destroy()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/message_box.py b/wxPython/samples/wxPIA_book/Chapter-09/message_box.py
deleted file mode 100644
index db9828eee6..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/message_box.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dlg = wx.MessageDialog(None, "Is this explanation OK?",
- 'A Message Box',
- wx.YES_NO | wx.ICON_QUESTION)
- retCode = dlg.ShowModal()
- if (retCode == wx.ID_YES):
- print "yes"
- else:
- print "no"
- dlg.Destroy()
-
- retCode = wx.MessageBox("Is this way easier?", "Via Function",
- wx.YES_NO | wx.ICON_QUESTION)
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/modal_dialog.py b/wxPython/samples/wxPIA_book/Chapter-09/modal_dialog.py
deleted file mode 100644
index f4dcd71428..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/modal_dialog.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import wx
-
-class SubclassDialog(wx.Dialog):
- def __init__(self):
- wx.Dialog.__init__(self, None, -1, 'Dialog Subclass',
- size=(300, 100))
- okButton = wx.Button(self, wx.ID_OK, "OK", pos=(15, 15))
- okButton.SetDefault()
- cancelButton = wx.Button(self, wx.ID_CANCEL, "Cancel",
- pos=(115, 15))
-
-if __name__ == '__main__':
- app = wx.PySimpleApp()
- app.MainLoop()
- dialog = SubclassDialog()
- result = dialog.ShowModal()
- if result == wx.ID_OK:
- print "OK"
- else:
- print "Cancel"
- dialog.Destroy()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/progress_box.py b/wxPython/samples/wxPIA_book/Chapter-09/progress_box.py
deleted file mode 100644
index f5e0253e11..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/progress_box.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import wx
-
-class Frame(wx.Frame):
- def __init__(self, parent):
- wx.Frame.__init__(self, parent, title="ProgressDialog sample")
- self.progressMax = 100
- self.count = 0
- self.dialog = None
- self.timer = wx.Timer(self)
- self.Bind(wx.EVT_TIMER, self.OnTimer, self.timer)
- self.timer.Start(1000)
-
- def OnTimer(self, evt):
- if not self.dialog:
- self.dialog = wx.ProgressDialog("A progress box", "Time remaining",
- self.progressMax,
- style=wx.PD_CAN_ABORT
- | wx.PD_ELAPSED_TIME
- | wx.PD_REMAINING_TIME)
-
- self.count += 1
- keepGoing = self.dialog.Update(self.count)
- if not keepGoing or self.count == self.progressMax:
- self.dialog.Destroy()
- self.timer.Stop()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = Frame(None)
- frame.Show()
- app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/startup_tip.py b/wxPython/samples/wxPIA_book/Chapter-09/startup_tip.py
deleted file mode 100644
index 8341060c9b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/startup_tip.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- provider = wx.CreateFileTipProvider("tips.txt", 0)
- wx.ShowTip(None, provider, True)
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/text_box.py b/wxPython/samples/wxPIA_book/Chapter-09/text_box.py
deleted file mode 100644
index ebad419c90..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/text_box.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import wx
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- dialog = wx.TextEntryDialog(None,
- "What kind of text would you like to enter?",
- "Text Entry", "Default Value", style=wx.OK|wx.CANCEL)
- if dialog.ShowModal() == wx.ID_OK:
- print "You entered: %s" % dialog.GetValue()
-
- dialog.Destroy()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/tips.txt b/wxPython/samples/wxPIA_book/Chapter-09/tips.txt
deleted file mode 100644
index a3c442529b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/tips.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-You can do startup tips very easily.
-Feel the force, Luke.
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/validator1.py b/wxPython/samples/wxPIA_book/Chapter-09/validator1.py
deleted file mode 100644
index af49ad0bd8..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/validator1.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import wx
-
-about_txt = """\
-The validator used in this example will ensure that the text
-controls are not empty when you press the Ok button, and
-will not let you leave if any of the Validations fail."""
-
-
-class NotEmptyValidator(wx.PyValidator):
- def __init__(self):
- wx.PyValidator.__init__(self)
-
- def Clone(self):
- """
- Note that every validator must implement the Clone() method.
- """
- return NotEmptyValidator()
-
- def Validate(self, win):
- textCtrl = self.GetWindow()
- text = textCtrl.GetValue()
-
- if len(text) == 0:
- wx.MessageBox("This field must contain some text!", "Error")
- textCtrl.SetBackgroundColour("pink")
- textCtrl.SetFocus()
- textCtrl.Refresh()
- return False
- else:
- textCtrl.SetBackgroundColour(
- wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))
- textCtrl.Refresh()
- return True
-
- def TransferToWindow(self):
- return True
-
- def TransferFromWindow(self):
- return True
-
-
-
-class MyDialog(wx.Dialog):
- def __init__(self):
- wx.Dialog.__init__(self, None, -1, "Validators: validating")
-
- # Create the text controls
- about = wx.StaticText(self, -1, about_txt)
- name_l = wx.StaticText(self, -1, "Name:")
- email_l = wx.StaticText(self, -1, "Email:")
- phone_l = wx.StaticText(self, -1, "Phone:")
-
- name_t = wx.TextCtrl(self, validator=NotEmptyValidator())
- email_t = wx.TextCtrl(self, validator=NotEmptyValidator())
- phone_t = wx.TextCtrl(self, validator=NotEmptyValidator())
-
- # Use standard button IDs
- okay = wx.Button(self, wx.ID_OK)
- okay.SetDefault()
- cancel = wx.Button(self, wx.ID_CANCEL)
-
- # Layout with sizers
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(about, 0, wx.ALL, 5)
- sizer.Add(wx.StaticLine(self), 0, wx.EXPAND|wx.ALL, 5)
-
- fgs = wx.FlexGridSizer(3, 2, 5, 5)
- fgs.Add(name_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(name_t, 0, wx.EXPAND)
- fgs.Add(email_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(email_t, 0, wx.EXPAND)
- fgs.Add(phone_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(phone_t, 0, wx.EXPAND)
- fgs.AddGrowableCol(1)
- sizer.Add(fgs, 0, wx.EXPAND|wx.ALL, 5)
-
- btns = wx.StdDialogButtonSizer()
- btns.AddButton(okay)
- btns.AddButton(cancel)
- btns.Realize()
- sizer.Add(btns, 0, wx.EXPAND|wx.ALL, 5)
-
- self.SetSizer(sizer)
- sizer.Fit(self)
-
-
-app = wx.PySimpleApp()
-
-dlg = MyDialog()
-dlg.ShowModal()
-dlg.Destroy()
-
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/validator2.py b/wxPython/samples/wxPIA_book/Chapter-09/validator2.py
deleted file mode 100644
index e14d76045b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/validator2.py
+++ /dev/null
@@ -1,91 +0,0 @@
-import wx
-import pprint
-
-about_txt = """\
-The validator used in this example shows how the validator
-can be used to transfer data to and from each text control
-automatically when the dialog is shown and dismissed."""
-
-
-class DataXferValidator(wx.PyValidator):
- def __init__(self, data, key):
- wx.PyValidator.__init__(self)
- self.data = data
- self.key = key
-
- def Clone(self):
- """
- Note that every validator must implement the Clone() method.
- """
- return DataXferValidator(self.data, self.key)
-
- def Validate(self, win):
- return True
-
- def TransferToWindow(self):
- textCtrl = self.GetWindow()
- textCtrl.SetValue(self.data.get(self.key, ""))
- return True
-
- def TransferFromWindow(self):
- textCtrl = self.GetWindow()
- self.data[self.key] = textCtrl.GetValue()
- return True
-
-
-
-class MyDialog(wx.Dialog):
- def __init__(self, data):
- wx.Dialog.__init__(self, None, -1, "Validators: data transfer")
-
- # Create the text controls
- about = wx.StaticText(self, -1, about_txt)
- name_l = wx.StaticText(self, -1, "Name:")
- email_l = wx.StaticText(self, -1, "Email:")
- phone_l = wx.StaticText(self, -1, "Phone:")
-
- name_t = wx.TextCtrl(self, validator=DataXferValidator(data, "name"))
- email_t = wx.TextCtrl(self, validator=DataXferValidator(data, "email"))
- phone_t = wx.TextCtrl(self, validator=DataXferValidator(data, "phone"))
-
- # Use standard button IDs
- okay = wx.Button(self, wx.ID_OK)
- okay.SetDefault()
- cancel = wx.Button(self, wx.ID_CANCEL)
-
- # Layout with sizers
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(about, 0, wx.ALL, 5)
- sizer.Add(wx.StaticLine(self), 0, wx.EXPAND|wx.ALL, 5)
-
- fgs = wx.FlexGridSizer(3, 2, 5, 5)
- fgs.Add(name_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(name_t, 0, wx.EXPAND)
- fgs.Add(email_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(email_t, 0, wx.EXPAND)
- fgs.Add(phone_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(phone_t, 0, wx.EXPAND)
- fgs.AddGrowableCol(1)
- sizer.Add(fgs, 0, wx.EXPAND|wx.ALL, 5)
-
- btns = wx.StdDialogButtonSizer()
- btns.AddButton(okay)
- btns.AddButton(cancel)
- btns.Realize()
- sizer.Add(btns, 0, wx.EXPAND|wx.ALL, 5)
-
- self.SetSizer(sizer)
- sizer.Fit(self)
-
-
-app = wx.PySimpleApp()
-
-data = { "name" : "Jordyn Dunn" }
-dlg = MyDialog(data)
-dlg.ShowModal()
-dlg.Destroy()
-
-wx.MessageBox("You entered these values:\n\n" +
- pprint.pformat(data))
-
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/validator3.py b/wxPython/samples/wxPIA_book/Chapter-09/validator3.py
deleted file mode 100644
index 12a4a8ea34..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/validator3.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import wx
-import string
-
-about_txt = """\
-The validator used in this example will validate the input on the fly
-instead of waiting until the okay button is pressed. The first field
-will not allow digits to be typed, the second will allow anything
-and the third will not allow alphabetic characters to be entered.
-"""
-
-
-class CharValidator(wx.PyValidator):
- def __init__(self, flag):
- wx.PyValidator.__init__(self)
- self.flag = flag
- self.Bind(wx.EVT_CHAR, self.OnChar)
-
- def Clone(self):
- """
- Note that every validator must implement the Clone() method.
- """
- return CharValidator(self.flag)
-
- def Validate(self, win):
- return True
-
- def TransferToWindow(self):
- return True
-
- def TransferFromWindow(self):
- return True
-
- def OnChar(self, evt):
- key = chr(evt.GetKeyCode())
- if self.flag == "no-alpha" and key in string.letters:
- return
- if self.flag == "no-digit" and key in string.digits:
- return
- evt.Skip()
-
-
-class MyDialog(wx.Dialog):
- def __init__(self):
- wx.Dialog.__init__(self, None, -1, "Validators: behavior modification")
-
- # Create the text controls
- about = wx.StaticText(self, -1, about_txt)
- name_l = wx.StaticText(self, -1, "Name:")
- email_l = wx.StaticText(self, -1, "Email:")
- phone_l = wx.StaticText(self, -1, "Phone:")
-
- name_t = wx.TextCtrl(self, validator=CharValidator("no-digit"))
- email_t = wx.TextCtrl(self, validator=CharValidator("any"))
- phone_t = wx.TextCtrl(self, validator=CharValidator("no-alpha"))
-
- # Use standard button IDs
- okay = wx.Button(self, wx.ID_OK)
- okay.SetDefault()
- cancel = wx.Button(self, wx.ID_CANCEL)
-
- # Layout with sizers
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(about, 0, wx.ALL, 5)
- sizer.Add(wx.StaticLine(self), 0, wx.EXPAND|wx.ALL, 5)
-
- fgs = wx.FlexGridSizer(3, 2, 5, 5)
- fgs.Add(name_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(name_t, 0, wx.EXPAND)
- fgs.Add(email_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(email_t, 0, wx.EXPAND)
- fgs.Add(phone_l, 0, wx.ALIGN_RIGHT)
- fgs.Add(phone_t, 0, wx.EXPAND)
- fgs.AddGrowableCol(1)
- sizer.Add(fgs, 0, wx.EXPAND|wx.ALL, 5)
-
- btns = wx.StdDialogButtonSizer()
- btns.AddButton(okay)
- btns.AddButton(cancel)
- btns.Realize()
- sizer.Add(btns, 0, wx.EXPAND|wx.ALL, 5)
-
- self.SetSizer(sizer)
- sizer.Fit(self)
-
-
-app = wx.PySimpleApp()
-
-dlg = MyDialog()
-dlg.ShowModal()
-dlg.Destroy()
-
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-09/wizard.py b/wxPython/samples/wxPIA_book/Chapter-09/wizard.py
deleted file mode 100644
index 6c7562104f..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-09/wizard.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import wx
-import wx.wizard
-
-class TitledPage(wx.wizard.WizardPageSimple):
- def __init__(self, parent, title):
- wx.wizard.WizardPageSimple.__init__(self, parent)
- self.sizer = wx.BoxSizer(wx.VERTICAL)
- self.SetSizer(self.sizer)
- titleText = wx.StaticText(self, -1, title)
- titleText.SetFont(
- wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
- self.sizer.Add(titleText, 0,
- wx.ALIGN_CENTRE | wx.ALL, 5)
- self.sizer.Add(wx.StaticLine(self, -1), 0,
- wx.EXPAND | wx.ALL, 5)
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- wizard = wx.wizard.Wizard(None, -1, "Simple Wizard")
- page1 = TitledPage(wizard, "Page 1")
- page2 = TitledPage(wizard, "Page 2")
- page3 = TitledPage(wizard, "Page 3")
- page4 = TitledPage(wizard, "Page 4")
- page1.sizer.Add(wx.StaticText(page1, -1,
- "Testing the wizard"))
- page4.sizer.Add(wx.StaticText(page4, -1,
- "This is the last page."))
- wx.wizard.WizardPageSimple_Chain(page1, page2)
- wx.wizard.WizardPageSimple_Chain(page2, page3)
- wx.wizard.WizardPageSimple_Chain(page3, page4)
- wizard.FitToPage(page1)
-
- if wizard.RunWizard(page1):
- print "Success"
-
- wizard.Destroy()
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/add_items.py b/wxPython/samples/wxPIA_book/Chapter-10/add_items.py
deleted file mode 100644
index 2c5efe6ce1..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/add_items.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Add Menu Items")
- p = wx.Panel(self)
- self.txt = wx.TextCtrl(p, -1, "new item")
- btn = wx.Button(p, -1, "Add Menu Item")
- self.Bind(wx.EVT_BUTTON, self.OnAddItem, btn)
-
- sizer = wx.BoxSizer(wx.HORIZONTAL)
- sizer.Add(self.txt, 0, wx.ALL, 20)
- sizer.Add(btn, 0, wx.TOP|wx.RIGHT, 20)
- p.SetSizer(sizer)
-
- self.menu = menu = wx.Menu()
- simple = menu.Append(-1, "Simple menu item")
- menu.AppendSeparator()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnSimple, simple)
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnExit(self, event):
- self.Close()
-
- def OnAddItem(self, event):
- item = self.menu.Append(-1, self.txt.GetValue())
- self.Bind(wx.EVT_MENU, self.OnNewItemSelected, item)
-
- def OnNewItemSelected(self, event):
- wx.MessageBox("You selected a new item")
-
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/create_just_menu.py b/wxPython/samples/wxPIA_book/Chapter-10/create_just_menu.py
deleted file mode 100644
index dd9f207bfc..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/create_just_menu.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Simple Menu Example")
- p = wx.Panel(self)
- menuBar = wx.MenuBar()
- menu = wx.Menu()
- menuBar.Append(menu, "Left Menu")
- menu2 = wx.Menu()
- menuBar.Append(menu2, "Middle Menu")
- menu3 = wx.Menu()
- menuBar.Append(menu3, "Right Menu")
- self.SetMenuBar(menuBar)
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/create_simple_menu.py b/wxPython/samples/wxPIA_book/Chapter-10/create_simple_menu.py
deleted file mode 100644
index 24e3592c5b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/create_simple_menu.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Simple Menu Example")
- p = wx.Panel(self)
- menu = wx.Menu()
- simple = menu.Append(-1, "Simple menu item")
- menu.AppendSeparator()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnSimple, simple)
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Simple Menu")
- self.SetMenuBar(menuBar)
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnExit(self, event):
- self.Close()
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/disable_item.py b/wxPython/samples/wxPIA_book/Chapter-10/disable_item.py
deleted file mode 100644
index 78c753494f..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/disable_item.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import wx
-
-ID_SIMPLE = wx.NewId()
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Enable/Disable Menu Example")
- p = wx.Panel(self)
- self.btn = wx.Button(p, -1, "Disable Item", (20,20))
- self.Bind(wx.EVT_BUTTON, self.OnToggleItem, self.btn)
-
- menu = wx.Menu()
- menu.Append(ID_SIMPLE, "Simple menu item")
- self.Bind(wx.EVT_MENU, self.OnSimple, id=ID_SIMPLE)
-
- menu.AppendSeparator()
- menu.Append(wx.ID_EXIT, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnExit(self, event):
- self.Close()
-
- def OnToggleItem(self, event):
- menubar = self.GetMenuBar()
- enabled = menubar.IsEnabled(ID_SIMPLE)
- menubar.Enable(ID_SIMPLE, not enabled)
- self.btn.SetLabel(
- (enabled and "Enable" or "Disable") + " Item")
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/fancy_items.py b/wxPython/samples/wxPIA_book/Chapter-10/fancy_items.py
deleted file mode 100644
index 8a42df8698..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/fancy_items.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Fancier Menu Example")
- p = wx.Panel(self)
- menu = wx.Menu()
-
- bmp = wx.Bitmap("open.png", wx.BITMAP_TYPE_PNG)
- item = wx.MenuItem(menu, -1, "Has Open Bitmap")
- item.SetBitmap(bmp)
- menu.AppendItem(item)
-
- if True or 'wxMSW' in wx.PlatformInfo:
- font = wx.SystemSettings.GetFont(
- wx.SYS_DEFAULT_GUI_FONT)
- font.SetWeight(wx.BOLD)
- item = wx.MenuItem(menu, -1, "Has Bold Font")
- item.SetFont(font)
- menu.AppendItem(item)
-
- item = wx.MenuItem(menu, -1, "Has Red Text")
- item.SetTextColour("red")
- menu.AppendItem(item)
-
-
- menu.AppendSeparator()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnExit(self, event):
- self.Close()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/find_item.py b/wxPython/samples/wxPIA_book/Chapter-10/find_item.py
deleted file mode 100644
index cf58c359aa..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/find_item.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Find Item Example")
- p = wx.Panel(self)
- self.txt = wx.TextCtrl(p, -1, "new item")
- btn = wx.Button(p, -1, "Add Menu Item")
- self.Bind(wx.EVT_BUTTON, self.OnAddItem, btn)
-
- sizer = wx.BoxSizer(wx.HORIZONTAL)
- sizer.Add(self.txt, 0, wx.ALL, 20)
- sizer.Add(btn, 0, wx.TOP|wx.RIGHT, 20)
- p.SetSizer(sizer)
-
- self.menu = menu = wx.Menu()
- simple = menu.Append(-1, "Simple menu item")
- menu.AppendSeparator()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnSimple, simple)
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnExit(self, event):
- self.Close()
-
- def OnAddItem(self, event):
- item = self.menu.Append(-1, self.txt.GetValue())
- self.Bind(wx.EVT_MENU, self.OnNewItemSelected, item)
-
- def OnNewItemSelected(self, event):
- item = self.GetMenuBar().FindItemById(event.GetId())
- text = item.GetText()
- wx.MessageBox("You selected the '%s' item" % text)
-
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/open.png b/wxPython/samples/wxPIA_book/Chapter-10/open.png
deleted file mode 100644
index c1f11bc59c..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-10/open.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/popupmenu.py b/wxPython/samples/wxPIA_book/Chapter-10/popupmenu.py
deleted file mode 100644
index d26ce9ad36..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/popupmenu.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Popup Menu Example")
- self.panel = p = wx.Panel(self)
- menu = wx.Menu()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
- wx.StaticText(p, -1,
- "Right-click on the panel to show a popup menu",
- (25,25))
-
- self.popupmenu = wx.Menu()
- for text in "one two three four five".split():
- item = self.popupmenu.Append(-1, text)
- self.Bind(wx.EVT_MENU, self.OnPopupItemSelected, item)
- p.Bind(wx.EVT_CONTEXT_MENU, self.OnShowPopup)
-
-
- def OnShowPopup(self, event):
- pos = event.GetPosition()
- pos = self.panel.ScreenToClient(pos)
- self.panel.PopupMenu(self.popupmenu, pos)
-
-
- def OnPopupItemSelected(self, event):
- item = self.popupmenu.FindItemById(event.GetId())
- text = item.GetText()
- wx.MessageBox("You selected item '%s'" % text)
-
-
- def OnExit(self, event):
- self.Close()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/sub_menu.py b/wxPython/samples/wxPIA_book/Chapter-10/sub_menu.py
deleted file mode 100644
index 6021508d84..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/sub_menu.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Sub-menu Example")
- p = wx.Panel(self)
- menu = wx.Menu()
-
- submenu = wx.Menu()
- submenu.Append(-1, "Sub-item 1")
- submenu.Append(-1, "Sub-item 2")
- menu.AppendMenu(-1, "Sub-menu", submenu)
-
- menu.AppendSeparator()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnExit(self, event):
- self.Close()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/toggle_items.py b/wxPython/samples/wxPIA_book/Chapter-10/toggle_items.py
deleted file mode 100644
index 216e4c17ca..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/toggle_items.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Toggle Items Example")
- p = wx.Panel(self)
- menuBar = wx.MenuBar()
- menu = wx.Menu()
- exit = menu.Append(-1, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
- menuBar.Append(menu, "Menu")
-
- menu = wx.Menu()
- menu.AppendCheckItem(-1, "Check Item 1")
- menu.AppendCheckItem(-1, "Check Item 2")
- menu.AppendCheckItem(-1, "Check Item 3")
- menu.AppendSeparator()
- menu.AppendRadioItem(-1, "Radio Item 1")
- menu.AppendRadioItem(-1, "Radio Item 2")
- menu.AppendRadioItem(-1, "Radio Item 3")
- menuBar.Append(menu, "Toggle Items")
-
- self.SetMenuBar(menuBar)
-
- def OnExit(self, event):
- self.Close()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/update_ui.py b/wxPython/samples/wxPIA_book/Chapter-10/update_ui.py
deleted file mode 100644
index a33a6fe629..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/update_ui.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import wx
-
-ID_SIMPLE = wx.NewId()
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "UPDATE_UI Menu Example")
- p = wx.Panel(self)
- self.btn = wx.Button(p, -1, "Disable Item", (20,20))
- self.Bind(wx.EVT_BUTTON, self.OnToggleItem, self.btn)
-
- menu = wx.Menu()
- menu.Append(ID_SIMPLE, "Simple menu item")
- self.enabled = True
- self.Bind(wx.EVT_MENU, self.OnSimple, id=ID_SIMPLE)
- self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateSimple, id=ID_SIMPLE)
-
- menu.AppendSeparator()
- menu.Append(wx.ID_EXIT, "Exit")
- self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "Menu")
- self.SetMenuBar(menuBar)
-
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnExit(self, event):
- self.Close()
-
- def OnToggleItem(self, event):
- self.btn.SetLabel(
- (self.enabled and "Enable" or "Disable") + " Item")
- self.enabled = not self.enabled
-
- def OnUpdateSimple(self, event):
- event.Enable(self.enabled)
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-10/with_accelerator.py b/wxPython/samples/wxPIA_book/Chapter-10/with_accelerator.py
deleted file mode 100644
index 1e2b785f4e..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-10/with_accelerator.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import wx
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Accelerator Example")
- p = wx.Panel(self)
- menu = wx.Menu()
- simple = menu.Append(-1, "Simple &menu item") # with mnemonic
- accel = menu.Append(-1, "&Accelerated\tCtrl-A") # with accelerator
-
- menu.AppendSeparator()
- exit = menu.Append(-1, "E&xit")
-
- self.Bind(wx.EVT_MENU, self.OnSimple, simple)
- self.Bind(wx.EVT_MENU, self.OnAccelerated, accel)
- self.Bind(wx.EVT_MENU, self.OnExit, exit)
-
- menuBar = wx.MenuBar()
- menuBar.Append(menu, "&Menu")
- self.SetMenuBar(menuBar)
-
- # An alternate way to make accelerators
- acceltbl = wx.AcceleratorTable( [
- (wx.ACCEL_CTRL, ord('Q'), exit.GetId())
- ])
- self.SetAcceleratorTable(acceltbl)
-
-
- def OnSimple(self, event):
- wx.MessageBox("You selected the simple menu item")
-
- def OnAccelerated(self, event):
- wx.MessageBox("You selected the accelerated menu item")
-
-
- def OnExit(self, event):
- self.Close()
-
-
-if __name__ == "__main__":
- app = wx.PySimpleApp()
- frame = MyFrame()
- frame.Show()
- app.MainLoop()
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/basicflexgridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/basicflexgridsizer.py
deleted file mode 100644
index 08204bb24c..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/basicflexgridsizer.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "FlexGridSizer")
- sizer = wx.FlexGridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- sizer.Add(bw, 0, 0)
- center = self.FindWindowByName("five")
- center.SetMinSize((150,50))
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/basicgridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/basicgridsizer.py
deleted file mode 100644
index 01e7e4cd75..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/basicgridsizer.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class GridSizerFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Basic Grid Sizer")
- sizer = wx.GridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- sizer.Add(bw, 0, 0)
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-GridSizerFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/blockwindow.py b/wxPython/samples/wxPIA_book/Chapter-11/blockwindow.py
deleted file mode 100644
index c506568c86..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/blockwindow.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import wx
-
-class BlockWindow(wx.Panel):
- def __init__(self, parent, ID=-1, label="",
- pos=wx.DefaultPosition, size=(100, 25)):
- wx.Panel.__init__(self, parent, ID, pos, size,
- wx.RAISED_BORDER, label)
- self.label = label
- self.SetBackgroundColour("white")
- self.SetMinSize(size)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
-
- def OnPaint(self, evt):
- sz = self.GetClientSize()
- dc = wx.PaintDC(self)
- w,h = dc.GetTextExtent(self.label)
- dc.SetFont(self.GetFont())
- dc.DrawText(self.label, (sz.width-w)/2, (sz.height-h)/2)
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/bordergridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/bordergridsizer.py
deleted file mode 100644
index d03ba5badc..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/bordergridsizer.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-flags = {"one": wx.BOTTOM, "two": wx.ALL, "three": wx.TOP,
- "four": wx.LEFT, "five": wx.ALL, "six": wx.RIGHT,
- "seven": wx.BOTTOM | wx.TOP, "eight": wx.ALL,
- "nine": wx.LEFT | wx.RIGHT}
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "GridSizer Borders")
- sizer = wx.GridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- flag = flags.get(label, 0)
- sizer.Add(bw, 0, flag, 10)
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/boxsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/boxsizer.py
deleted file mode 100644
index 45b761cd26..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/boxsizer.py
+++ /dev/null
@@ -1,78 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four".split()
-
-class TestFrame(wx.Frame):
- title = "none"
- def __init__(self):
- wx.Frame.__init__(self, None, -1, self.title)
- sizer = self.CreateSizerAndWindows()
- self.SetSizer(sizer)
- self.Fit()
-
-class VBoxSizerFrame(TestFrame):
- title = "Vertical BoxSizer"
-
- def CreateSizerAndWindows(self):
- sizer = wx.BoxSizer(wx.VERTICAL)
- for label in labels:
- bw = BlockWindow(self, label=label, size=(200,30))
- sizer.Add(bw, flag=wx.EXPAND)
- return sizer
-
-
-class HBoxSizerFrame(TestFrame):
- title = "Horizontal BoxSizer"
-
- def CreateSizerAndWindows(self):
- sizer = wx.BoxSizer(wx.HORIZONTAL)
- for label in labels:
- bw = BlockWindow(self, label=label, size=(75,30))
- sizer.Add(bw, flag=wx.EXPAND)
- return sizer
-
-class VBoxSizerStretchableFrame(TestFrame):
- title = "Stretchable BoxSizer"
-
- def CreateSizerAndWindows(self):
- sizer = wx.BoxSizer(wx.VERTICAL)
- for label in labels:
- bw = BlockWindow(self, label=label, size=(200,30))
- sizer.Add(bw, flag=wx.EXPAND)
-
- # Add an item that takes all the free space
- bw = BlockWindow(self, label="gets all free space", size=(200,30))
- sizer.Add(bw, 1, flag=wx.EXPAND)
- return sizer
-
-class VBoxSizerMultiProportionalFrame(TestFrame):
- title = "Proportional BoxSizer"
-
- def CreateSizerAndWindows(self):
- sizer = wx.BoxSizer(wx.VERTICAL)
- for label in labels:
- bw = BlockWindow(self, label=label, size=(200,30))
- sizer.Add(bw, flag=wx.EXPAND)
-
- # Add an item that takes one share of the free space
- bw = BlockWindow(self,
- label="gets 1/3 of the free space",
- size=(200,30))
- sizer.Add(bw, 1, flag=wx.EXPAND)
-
- # Add an item that takes 2 shares of the free space
- bw = BlockWindow(self,
- label="gets 2/3 of the free space",
- size=(200,30))
- sizer.Add(bw, 2, flag=wx.EXPAND)
- return sizer
-
-app = wx.PySimpleApp()
-frameList = [VBoxSizerFrame, HBoxSizerFrame,
- VBoxSizerStretchableFrame,
- VBoxSizerMultiProportionalFrame]
-for klass in frameList:
- frame = klass()
- frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/gridbagsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/gridbagsizer.py
deleted file mode 100644
index 32f5b7a6b9..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/gridbagsizer.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "GridBagSizer Test")
- sizer = wx.GridBagSizer(hgap=5, vgap=5)
- for col in range(3):
- for row in range(3):
- bw = BlockWindow(self, label=labels[row*3 + col])
- sizer.Add(bw, pos=(row,col))
-
- # add a window that spans several rows
- bw = BlockWindow(self, label="span 3 rows")
- sizer.Add(bw, pos=(0,3), span=(3,1), flag=wx.EXPAND)
-
- # add a window that spans all columns
- bw = BlockWindow(self, label="span all columns")
- sizer.Add(bw, pos=(3,0), span=(1,4), flag=wx.EXPAND)
-
- # make the last row and col be stretchable
- sizer.AddGrowableCol(3)
- sizer.AddGrowableRow(3)
-
- self.SetSizer(sizer)
- self.Fit()
-
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/mingridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/mingridsizer.py
deleted file mode 100644
index dc97915cd9..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/mingridsizer.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "GridSizer Test")
- sizer = wx.GridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- sizer.Add(bw, 0, 0)
- center = self.FindWindowByName("five")
- center.SetMinSize((150,50))
- self.SetSizer(sizer)
- self.Fit()
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/prependgridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/prependgridsizer.py
deleted file mode 100644
index 77b8c19dd2..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/prependgridsizer.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class GridSizerFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Prepend Grid Sizer")
- sizer = wx.GridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- sizer.Prepend(bw, 0, 0)
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-GridSizerFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/realworld.py b/wxPython/samples/wxPIA_book/Chapter-11/realworld.py
deleted file mode 100644
index 0069afa996..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/realworld.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import wx
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Real World Test")
- panel = wx.Panel(self)
-
- # First create the controls
- topLbl = wx.StaticText(panel, -1, "Account Information")
- topLbl.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
-
- nameLbl = wx.StaticText(panel, -1, "Name:")
- name = wx.TextCtrl(panel, -1, "");
-
- addrLbl = wx.StaticText(panel, -1, "Address:")
- addr1 = wx.TextCtrl(panel, -1, "");
- addr2 = wx.TextCtrl(panel, -1, "");
-
- cstLbl = wx.StaticText(panel, -1, "City, State, Zip:")
- city = wx.TextCtrl(panel, -1, "", size=(150,-1));
- state = wx.TextCtrl(panel, -1, "", size=(50,-1));
- zip = wx.TextCtrl(panel, -1, "", size=(70,-1));
-
- phoneLbl = wx.StaticText(panel, -1, "Phone:")
- phone = wx.TextCtrl(panel, -1, "");
-
- emailLbl = wx.StaticText(panel, -1, "Email:")
- email = wx.TextCtrl(panel, -1, "");
-
- saveBtn = wx.Button(panel, -1, "Save")
- cancelBtn = wx.Button(panel, -1, "Cancel")
-
- # Now do the layout.
-
- # mainSizer is the top-level one that manages everything
- mainSizer = wx.BoxSizer(wx.VERTICAL)
- mainSizer.Add(topLbl, 0, wx.ALL, 5)
- mainSizer.Add(wx.StaticLine(panel), 0,
- wx.EXPAND|wx.TOP|wx.BOTTOM, 5)
-
- # addrSizer is a grid that holds all of the address info
- addrSizer = wx.FlexGridSizer(cols=2, hgap=5, vgap=5)
- addrSizer.AddGrowableCol(1)
- addrSizer.Add(nameLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(name, 0, wx.EXPAND)
- addrSizer.Add(addrLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(addr1, 0, wx.EXPAND)
- addrSizer.Add((10,10)) # some empty space
- addrSizer.Add(addr2, 0, wx.EXPAND)
-
- addrSizer.Add(cstLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
-
- # the city, state, zip fields are in a sub-sizer
- cstSizer = wx.BoxSizer(wx.HORIZONTAL)
- cstSizer.Add(city, 1)
- cstSizer.Add(state, 0, wx.LEFT|wx.RIGHT, 5)
- cstSizer.Add(zip)
- addrSizer.Add(cstSizer, 0, wx.EXPAND)
-
- addrSizer.Add(phoneLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(phone, 0, wx.EXPAND)
- addrSizer.Add(emailLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(email, 0, wx.EXPAND)
-
- # now add the addrSizer to the mainSizer
- mainSizer.Add(addrSizer, 0, wx.EXPAND|wx.ALL, 10)
-
- # The buttons sizer will put them in a row with resizeable
- # gaps between and on either side of the buttons
- btnSizer = wx.BoxSizer(wx.HORIZONTAL)
- btnSizer.Add((20,20), 1)
- btnSizer.Add(saveBtn)
- btnSizer.Add((20,20), 1)
- btnSizer.Add(cancelBtn)
- btnSizer.Add((20,20), 1)
-
- mainSizer.Add(btnSizer, 0, wx.EXPAND|wx.BOTTOM, 10)
-
- panel.SetSizer(mainSizer)
-
- # Fit the frame to the needs of the sizer. The frame will
- # automatically resize the panel as needed. Also prevent the
- # frame from getting smaller than this size.
- mainSizer.Fit(self)
- mainSizer.SetSizeHints(self)
-
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/resizeflexgridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/resizeflexgridsizer.py
deleted file mode 100644
index caceae08f5..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/resizeflexgridsizer.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Resizing Flex Grid Sizer")
- sizer = wx.FlexGridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- sizer.Add(bw, 0, 0)
- center = self.FindWindowByName("five")
- center.SetMinSize((150,50))
- sizer.AddGrowableCol(0, 1)
- sizer.AddGrowableCol(1, 2)
- sizer.AddGrowableCol(2, 1)
- sizer.AddGrowableRow(0, 1)
- sizer.AddGrowableRow(1, 5)
- sizer.AddGrowableRow(2, 1)
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/resizegridsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/resizegridsizer.py
deleted file mode 100644
index ca512bfccf..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/resizegridsizer.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-flags = {"one": wx.ALIGN_BOTTOM, "two": wx.ALIGN_CENTER,
- "four": wx.ALIGN_RIGHT, "six": wx.EXPAND, "seven": wx.EXPAND,
- "eight": wx.SHAPED}
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "GridSizer Resizing")
- sizer = wx.GridSizer(rows=3, cols=3, hgap=5, vgap=5)
- for label in labels:
- bw = BlockWindow(self, label=label)
- flag = flags.get(label, 0)
- sizer.Add(bw, 0, flag)
- self.SetSizer(sizer)
- self.Fit()
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-11/staticboxsizer.py b/wxPython/samples/wxPIA_book/Chapter-11/staticboxsizer.py
deleted file mode 100644
index 76cf4f74cc..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-11/staticboxsizer.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import wx
-from blockwindow import BlockWindow
-
-labels = "one two three four five six seven eight nine".split()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "StaticBoxSizer Test")
- self.panel = wx.Panel(self)
-
- # make three static boxes with windows positioned inside them
- box1 = self.MakeStaticBoxSizer("Box 1", labels[0:3])
- box2 = self.MakeStaticBoxSizer("Box 2", labels[3:6])
- box3 = self.MakeStaticBoxSizer("Box 3", labels[6:9])
-
- # We can also use a sizer to manage the placement of other
- # sizers (and therefore the windows and sub-sizers that they
- # manage as well.)
- sizer = wx.BoxSizer(wx.HORIZONTAL)
- sizer.Add(box1, 0, wx.ALL, 10)
- sizer.Add(box2, 0, wx.ALL, 10)
- sizer.Add(box3, 0, wx.ALL, 10)
-
- self.panel.SetSizer(sizer)
- sizer.Fit(self)
-
-
- def MakeStaticBoxSizer(self, boxlabel, itemlabels):
- # first the static box
- box = wx.StaticBox(self.panel, -1, boxlabel)
-
- # then the sizer
- sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
-
- # then add items to it like normal
- for label in itemlabels:
- bw = BlockWindow(self.panel, label=label)
- sizer.Add(bw, 0, wx.ALL, 2)
-
- return sizer
-
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/draw_image.py b/wxPython/samples/wxPIA_book/Chapter-12/draw_image.py
deleted file mode 100644
index 12ae522581..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-12/draw_image.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# This one shows how to draw images on a DC.
-
-import wx
-import random
-random.seed()
-
-class RandomImagePlacementWindow(wx.Window):
- def __init__(self, parent, image):
- wx.Window.__init__(self, parent)
- self.photo = image.ConvertToBitmap()
-
- # choose some random positions to draw the image at:
- self.positions = [(10,10)]
- for x in range(50):
- x = random.randint(0, 1000)
- y = random.randint(0, 1000)
- self.positions.append( (x,y) )
-
- # Bind the Paint event
- self.Bind(wx.EVT_PAINT, self.OnPaint)
-
-
- def OnPaint(self, evt):
- # create and clear the DC
- dc = wx.PaintDC(self)
- brush = wx.Brush("sky blue")
- dc.SetBackground(brush)
- dc.Clear()
-
- # draw the image in random locations
- for x,y in self.positions:
- dc.DrawBitmap(self.photo, x, y, True)
-
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Loading Images",
- size=(640,480))
- img = wx.Image("masked-portrait.png")
- win = RandomImagePlacementWindow(self, img)
-
-
-app = wx.PySimpleApp()
-frm = TestFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/image.bmp b/wxPython/samples/wxPIA_book/Chapter-12/image.bmp
deleted file mode 100644
index bbab4cd3b0..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-12/image.bmp and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/image.gif b/wxPython/samples/wxPIA_book/Chapter-12/image.gif
deleted file mode 100644
index 34b3e03570..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-12/image.gif and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/image.jpg b/wxPython/samples/wxPIA_book/Chapter-12/image.jpg
deleted file mode 100644
index 8ec8f4872e..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-12/image.jpg and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/image.png b/wxPython/samples/wxPIA_book/Chapter-12/image.png
deleted file mode 100644
index 5a4ce74b89..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-12/image.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/images.py b/wxPython/samples/wxPIA_book/Chapter-12/images.py
deleted file mode 100644
index aaa9c5b9f0..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-12/images.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import wx
-
-filenames = ["image.bmp", "image.gif", "image.jpg", "image.png" ]
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Loading Images")
- p = wx.Panel(self)
-
- fgs = wx.FlexGridSizer(cols=2, hgap=10, vgap=10)
- for name in filenames:
- # load the image from the file
- img1 = wx.Image(name, wx.BITMAP_TYPE_ANY)
-
- # Scale the original to another wx.Image
- w = img1.GetWidth()
- h = img1.GetHeight()
- img2 = img1.Scale(w/2, h/2)
-
- # turn them into static bitmap widgets
- sb1 = wx.StaticBitmap(p, -1, wx.BitmapFromImage(img1))
- sb2 = wx.StaticBitmap(p, -1, wx.BitmapFromImage(img2))
-
- # and put them into the sizer
- fgs.Add(sb1)
- fgs.Add(sb2)
-
- p.SetSizerAndFit(fgs)
- self.Fit()
-
-
-app = wx.PySimpleApp()
-frm = TestFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/masked-portrait.png b/wxPython/samples/wxPIA_book/Chapter-12/masked-portrait.png
deleted file mode 100644
index 652da99a83..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-12/masked-portrait.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-12/radargraph.py b/wxPython/samples/wxPIA_book/Chapter-12/radargraph.py
deleted file mode 100644
index 89908fdf84..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-12/radargraph.py
+++ /dev/null
@@ -1,170 +0,0 @@
-import wx
-import math
-import random
-
-class RadarGraph(wx.Window):
- """
- A simple radar graph that plots a collection of values in the
- range of 0-100 onto a polar coordinate system designed to easily
- show outliers, etc. You might use this kind of graph to monitor
- some sort of resource allocation metrics, and a quick glance at
- the graph can tell you when conditions are good (within some
- accepted tolerance level) or approaching critical levels (total
- resource consumption).
- """
- def __init__(self, parent, title, labels):
- wx.Window.__init__(self, parent)
- self.title = title
- self.labels = labels
- self.data = [0.0] * len(labels)
- self.titleFont = wx.Font(14, wx.SWISS, wx.NORMAL, wx.BOLD)
- self.labelFont = wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL)
-
- self.InitBuffer()
-
- self.Bind(wx.EVT_SIZE, self.OnSize)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
-
-
- def OnSize(self, evt):
- # When the window size changes we need a new buffer.
- self.InitBuffer()
-
-
- def OnPaint(self, evt):
- # This automatically Blits self.buffer to a wx.PaintDC when
- # the dc is destroyed, and so nothing else needs done.
- dc = wx.BufferedPaintDC(self, self.buffer)
-
-
- def InitBuffer(self):
- # Create the buffer bitmap to be the same size as the window,
- # then draw our graph to it. Since we use wx.BufferedDC
- # whatever is drawn to the buffer is also drawn to the window.
- w, h = self.GetClientSize()
- self.buffer = wx.EmptyBitmap(w, h)
- dc = wx.BufferedDC(wx.ClientDC(self), self.buffer)
- self.DrawGraph(dc)
-
-
- def GetData(self):
- return self.data
-
- def SetData(self, newData):
- assert len(newData) == len(self.data)
- self.data = newData[:]
-
- # The data has changed, so update the buffer and the window
- dc = wx.BufferedDC(wx.ClientDC(self), self.buffer)
- self.DrawGraph(dc)
-
-
- def PolarToCartesian(self, radius, angle, cx, cy):
- x = radius * math.cos(math.radians(angle))
- y = radius * math.sin(math.radians(angle))
- return (cx+x, cy-y)
-
-
- def DrawGraph(self, dc):
- spacer = 10
- scaledmax = 150.0
-
- dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
- dc.Clear()
- dw, dh = dc.GetSize()
-
- # Find out where to draw the title and do it
- dc.SetFont(self.titleFont)
- tw, th = dc.GetTextExtent(self.title)
- dc.DrawText(self.title, (dw-tw)/2, spacer)
-
- # find the center of the space below the title
- th = th + 2*spacer
- cx = dw/2
- cy = (dh-th)/2 + th
-
- # calculate a scale factor to use for drawing the graph based
- # on the minimum available width or height
- mindim = min(cx, (dh-th)/2)
- scale = mindim/scaledmax
-
- # draw the graph axis and "bulls-eye" with rings at scaled 25,
- # 50, 75 and 100 positions
- dc.SetPen(wx.Pen("black", 1))
- dc.SetBrush(wx.TRANSPARENT_BRUSH)
- dc.DrawCircle(cx,cy, 25*scale)
- dc.DrawCircle(cx,cy, 50*scale)
- dc.DrawCircle(cx,cy, 75*scale)
- dc.DrawCircle(cx,cy, 100*scale)
-
- dc.SetPen(wx.Pen("black", 2))
- dc.DrawLine(cx-110*scale, cy, cx+110*scale, cy)
- dc.DrawLine(cx, cy-110*scale, cx, cy+110*scale)
-
- # Now find the coordinates for each data point, draw the
- # labels, and find the max data point
- dc.SetFont(self.labelFont)
- maxval = 0
- angle = 0
- polypoints = []
- for i, label in enumerate(self.labels):
- val = self.data[i]
- point = self.PolarToCartesian(val*scale, angle, cx, cy)
- polypoints.append(point)
- x, y = self.PolarToCartesian(125*scale, angle, cx,cy)
- dc.DrawText(label, x, y)
- if val > maxval:
- maxval = val
- angle = angle + 360/len(self.labels)
-
- # Set the brush color based on the max value (green is good,
- # red is bad)
- c = "forest green"
- if maxval > 70:
- c = "yellow"
- if maxval > 95:
- c = "red"
-
- # Finally, draw the plot data as a filled polygon
- dc.SetBrush(wx.Brush(c))
- dc.SetPen(wx.Pen("navy", 3))
- dc.DrawPolygon(polypoints)
-
-
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Double Buffered Drawing",
- size=(480,480))
- self.plot = RadarGraph(self, "Sample 'Radar' Plot",
- ["A", "B", "C", "D", "E", "F", "G", "H"])
-
- # Set some random initial data values
- data = []
- for d in self.plot.GetData():
- data.append(random.randint(0, 75))
- self.plot.SetData(data)
-
- # Create a timer to update the data values
- self.Bind(wx.EVT_TIMER, self.OnTimeout)
- self.timer = wx.Timer(self)
- self.timer.Start(500)
-
-
- def OnTimeout(self, evt):
- # simulate the positive or negative growth of each data value
- data = []
- for d in self.plot.GetData():
- val = d + random.uniform(-5, 5)
- if val < 0:
- val = 0
- if val > 110:
- val = 110
- data.append(val)
- self.plot.SetData(data)
-
-
-app = wx.PySimpleApp()
-frm = TestFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/data.py b/wxPython/samples/wxPIA_book/Chapter-13/data.py
deleted file mode 100644
index 76d2231b20..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/data.py
+++ /dev/null
@@ -1,41 +0,0 @@
-
-# Just some simple data structures for the report mode listctrl examples
-
-columns = ["Request ID", "Summary", "Date", "Submitted By"]
-
-rows = [
- ("987441", "additions to RTTI?", "2004-07-08 10:22", "g00fy"),
- ("846368", "wxTextCtrl - disable auto-scrolling", "2003-11-20 21:25", "ryannpcs"),
- ("846367", "Less flicker when resizing a window", "2003-11-20 21:24", "ryannpcs"),
- ("846366", "Wishlist - wxDbGetConnection return value", "2003-11-20 21:23", "ryannpcs"),
- ("846364", "wxPostscriptDC with floating point coordinates", "2003-11-20 21:22", "ryannpcs"),
- ("846363", "Wishlist - Better wxString Formatting", "2003-11-20 21:22", "ryannpcs"),
- ("846362", "Wishlist - Crossplatform wxRichText Widget", "2003-11-20 21:20", "ryannpcs"),
- ("953341", "Support for paper trays when printing", "2004-05-13 08:01", "tonye"),
- ("952466", "mac menu - Window menu", "2004-05-12 03:19", "pimbuur"),
- ("928899", "FloatCanvas demo should work with numarray", "2004-04-03 08:30", "glchapman"),
- ("912714", "wxGrid: Support for Search / Replace", "2004-03-09 05:46", "rclund"),
- ("901061", "wxComboBox - add small icons as in MSW CComboBoxEx ", "2004-02-20 04:04", "tomash"),
- ("900768", "Please add more codepages support to your source built", "2004-02-19 15:49", "jsat66"),
- ("894921", "trigger on event-system creation", "2004-02-11 08:10", "g00fy"),
- ("869808", "HitTest in wxCheckListBox", "2004-01-03 01:22", "dickkniep"),
- ("863306", "wxGrid - Thaw/Freeze column/row", "2003-12-19 17:54", "zinit"),
- ("975435", "wxMenu anchor right position in wxMenuBar", "2004-06-18 08:44", "jmt2715"),
- ("969811", "wxColourEnumerator", "2004-06-09 11:41", "wyo"),
- ("959849", "wx.Grid gridlines past max row/col", "2004-05-24 19:39", "dodywijaya"),
- ("959158", "wxGrid: Arbitrary controls in the grid", "2004-05-23 16:56", "somecoder"),
- ("953824", "mac menu - Window menu", "2004-05-14 02:06", "pimbuur"),
- ("863301", "wxTextCtrl - edit mode", "2003-12-19 17:48", "zinit"),
- ("855902", "virtual window classes", "2003-12-07 12:39", "cursorstar"),
- ("852379", "wxGrid row/col size limits", "2003-12-01 15:47", "jbrouwers"),
- ("846375", "wxGraphicsPath", "2003-11-20 21:30", "ryannpcs"),
- ("846374", "wxToolBar - return tool at position", "2003-11-20 21:29", "ryannpcs"),
- ("846373", "Scrolling improvements", "2003-11-20 21:28", "ryannpcs"),
- ("846372", "Hooks for standard remote events", "2003-11-20 21:27", "ryannpcs"),
- ("846370", "wxDial - dial widget", "2003-11-20 21:27", "ryannpcs"),
- ("846369", "wxGird - auto-scrolling", "2003-11-20 21:26", "ryannpcs"),
- ("846361", "Wishlist - wxStaticText that takes fonts, colors, etc.", "2003-11-20 21:19", "ryannpcs"),
- ("819559", "wxListCtrl column widths in wxLC_ICON mode ", "2003-10-07 13:34", "nwmoriarty"),
- ("817429", "OS X wheel mouse", "2003-10-03 14:05", "mdcowles"),
-]
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon01.png b/wxPython/samples/wxPIA_book/Chapter-13/icon01.png
deleted file mode 100644
index 0825ab7e3c..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon01.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon02.png b/wxPython/samples/wxPIA_book/Chapter-13/icon02.png
deleted file mode 100644
index 171b8b3eae..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon02.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon03.png b/wxPython/samples/wxPIA_book/Chapter-13/icon03.png
deleted file mode 100644
index 2b0e95f26a..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon03.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon04.png b/wxPython/samples/wxPIA_book/Chapter-13/icon04.png
deleted file mode 100644
index 55bf370dcb..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon04.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon05.png b/wxPython/samples/wxPIA_book/Chapter-13/icon05.png
deleted file mode 100644
index e39b52f9ff..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon05.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon06.png b/wxPython/samples/wxPIA_book/Chapter-13/icon06.png
deleted file mode 100644
index 65c9f8b02a..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon06.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon07.png b/wxPython/samples/wxPIA_book/Chapter-13/icon07.png
deleted file mode 100644
index 1459cfbac5..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon07.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/icon08.png b/wxPython/samples/wxPIA_book/Chapter-13/icon08.png
deleted file mode 100644
index 97b4fda643..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/icon08.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_icon.py b/wxPython/samples/wxPIA_book/Chapter-13/list_icon.py
deleted file mode 100644
index 01a6f08a51..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_icon.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import wx
-import sys, glob
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "wx.ListCtrl in wx.LC_ICON mode",
- size=(600,400))
-
- # load some images into an image list
- il = wx.ImageList(32,32, True)
- for name in glob.glob("icon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
-
- # create the list control
- self.list = wx.ListCtrl(self, -1,
- style=wx.LC_ICON | wx.LC_AUTOARRANGE)
-
- # assign the image list to it
- self.list.AssignImageList(il, wx.IMAGE_LIST_NORMAL)
-
- # create some items for the list
- for x in range(25):
- img = x % (il_max+1)
- self.list.InsertImageStringItem(x,
- "This is item %02d" % x, img)
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_list.py b/wxPython/samples/wxPIA_book/Chapter-13/list_list.py
deleted file mode 100644
index 23210dceee..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_list.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import wx
-import sys, glob
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "wx.ListCtrl in wx.LC_LIST mode",
- size=(600,400))
-
- # load some images into an image list
- il = wx.ImageList(16,16, True)
- for name in glob.glob("smicon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
-
- # create the list control
- self.list = wx.ListCtrl(self, -1, style=wx.LC_LIST)
-
- # assign the image list to it
- self.list.AssignImageList(il, wx.IMAGE_LIST_SMALL)
-
- # create some items for the list
- for x in range(25):
- img = x % (il_max+1)
- self.list.InsertImageStringItem(x,
- "This is item %02d" % x,
- img)
-
-
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_report.py b/wxPython/samples/wxPIA_book/Chapter-13/list_report.py
deleted file mode 100644
index 0b20fe9822..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_report.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import wx
-import sys, glob, random
-import data
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "wx.ListCtrl in wx.LC_REPORT mode",
- size=(600,400))
-
- il = wx.ImageList(16,16, True)
- for name in glob.glob("smicon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
- self.list = wx.ListCtrl(self, -1, style=wx.LC_REPORT)
- self.list.AssignImageList(il, wx.IMAGE_LIST_SMALL)
-
- # Add some columns
- for col, text in enumerate(data.columns):
- self.list.InsertColumn(col, text)
-
- # add the rows
- for item in data.rows:
- index = self.list.InsertStringItem(sys.maxint, item[0])
- for col, text in enumerate(item[1:]):
- self.list.SetStringItem(index, col+1, text)
-
- # give each item a random image
- img = random.randint(0, il_max)
- self.list.SetItemImage(index, img, img)
-
- # set the width of the columns in various ways
- self.list.SetColumnWidth(0, 120)
- self.list.SetColumnWidth(1, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(3, wx.LIST_AUTOSIZE_USEHEADER)
-
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_report_colsort.py b/wxPython/samples/wxPIA_book/Chapter-13/list_report_colsort.py
deleted file mode 100644
index fbf98e366d..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_report_colsort.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import wx
-import wx.lib.mixins.listctrl
-import sys, glob, random
-import data
-
-class DemoFrame(wx.Frame, wx.lib.mixins.listctrl.ColumnSorterMixin):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "wx.ListCtrl with ColumnSorterMixin",
- size=(600,400))
-
- # load some images into an image list
- il = wx.ImageList(16,16, True)
- for name in glob.glob("smicon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
-
- # add some arrows for the column sorter
- self.up = il.AddWithColourMask(
- wx.Bitmap("sm_up.bmp", wx.BITMAP_TYPE_BMP), "blue")
- self.dn = il.AddWithColourMask(
- wx.Bitmap("sm_down.bmp", wx.BITMAP_TYPE_BMP), "blue")
-
- # create the list control
- self.list = wx.ListCtrl(self, -1, style=wx.LC_REPORT)
-
- # assign the image list to it
- self.list.AssignImageList(il, wx.IMAGE_LIST_SMALL)
-
- # Add some columns
- for col, text in enumerate(data.columns):
- self.list.InsertColumn(col, text)
-
- # add the rows
- self.itemDataMap = {}
- for item in data.rows:
- index = self.list.InsertStringItem(sys.maxint, item[0])
- for col, text in enumerate(item[1:]):
- self.list.SetStringItem(index, col+1, text)
-
- # give each item a data value, and map it back to the
- # item values, for the column sorter
- self.list.SetItemData(index, index)
- self.itemDataMap[index] = item
-
- # give each item a random image
- img = random.randint(0, il_max)
- self.list.SetItemImage(index, img, img)
-
- # set the width of the columns in various ways
- self.list.SetColumnWidth(0, 120)
- self.list.SetColumnWidth(1, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(3, wx.LIST_AUTOSIZE_USEHEADER)
-
- # initialize the column sorter
- wx.lib.mixins.listctrl.ColumnSorterMixin.__init__(self,
- len(data.columns))
-
- def GetListCtrl(self):
- return self.list
-
- def GetSortImages(self):
- return (self.dn, self.up)
-
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_report_etc.py b/wxPython/samples/wxPIA_book/Chapter-13/list_report_etc.py
deleted file mode 100644
index 92d0529e20..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_report_etc.py
+++ /dev/null
@@ -1,210 +0,0 @@
-import wx
-import sys, glob, random
-import data
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Other wx.ListCtrl Stuff",
- size=(700,500))
- self.list = None
- self.editable = False
- self.MakeMenu()
- self.MakeListCtrl()
-
-
- def MakeListCtrl(self, otherflags=0):
- # if we already have a listctrl then get rid of it
- if self.list:
- self.list.Destroy()
-
- if self.editable:
- otherflags |= wx.LC_EDIT_LABELS
-
- # load some images into an image list
- il = wx.ImageList(16,16, True)
- for name in glob.glob("smicon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
-
- # create the list control
- self.list = wx.ListCtrl(self, -1, style=wx.LC_REPORT|otherflags)
-
- # assign the image list to it
- self.list.AssignImageList(il, wx.IMAGE_LIST_SMALL)
-
- # Add some columns
- for col, text in enumerate(data.columns):
- self.list.InsertColumn(col, text)
-
- # add the rows
- for row, item in enumerate(data.rows):
- index = self.list.InsertStringItem(sys.maxint, item[0])
- for col, text in enumerate(item[1:]):
- self.list.SetStringItem(index, col+1, text)
-
- # give each item a random image
- img = random.randint(0, il_max)
- self.list.SetItemImage(index, img, img)
-
- # set the data value for each item to be its position in
- # the data list
- self.list.SetItemData(index, row)
-
-
- # set the width of the columns in various ways
- self.list.SetColumnWidth(0, 120)
- self.list.SetColumnWidth(1, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE)
- self.list.SetColumnWidth(3, wx.LIST_AUTOSIZE_USEHEADER)
-
- # bind some interesting events
- self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.list)
- self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.OnItemDeselected, self.list)
- self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated, self.list)
-
- # in case we are recreating the list tickle the frame a bit so
- # it will redo the layout
- self.SendSizeEvent()
-
-
- def MakeMenu(self):
- mbar = wx.MenuBar()
- menu = wx.Menu()
- item = menu.Append(-1, "E&xit\tAlt-X")
- self.Bind(wx.EVT_MENU, self.OnExit, item)
- mbar.Append(menu, "&File")
-
- menu = wx.Menu()
- item = menu.Append(-1, "Sort ascending")
- self.Bind(wx.EVT_MENU, self.OnSortAscending, item)
- item = menu.Append(-1, "Sort descending")
- self.Bind(wx.EVT_MENU, self.OnSortDescending, item)
- item = menu.Append(-1, "Sort by submitter")
- self.Bind(wx.EVT_MENU, self.OnSortBySubmitter, item)
-
- menu.AppendSeparator()
- item = menu.Append(-1, "Show selected")
- self.Bind(wx.EVT_MENU, self.OnShowSelected, item)
- item = menu.Append(-1, "Select all")
- self.Bind(wx.EVT_MENU, self.OnSelectAll, item)
- item = menu.Append(-1, "Select none")
- self.Bind(wx.EVT_MENU, self.OnSelectNone, item)
-
- menu.AppendSeparator()
- item = menu.Append(-1, "Set item text colour")
- self.Bind(wx.EVT_MENU, self.OnSetTextColour, item)
- item = menu.Append(-1, "Set item background colour")
- self.Bind(wx.EVT_MENU, self.OnSetBGColour, item)
-
- menu.AppendSeparator()
- item = menu.Append(-1, "Enable item editing", kind=wx.ITEM_CHECK)
- self.Bind(wx.EVT_MENU, self.OnEnableEditing, item)
- item = menu.Append(-1, "Edit current item")
- self.Bind(wx.EVT_MENU, self.OnEditItem, item)
- mbar.Append(menu, "&Demo")
-
- self.SetMenuBar(mbar)
-
-
-
- def OnExit(self, evt):
- self.Close()
-
-
- def OnItemSelected(self, evt):
- item = evt.GetItem()
- print "Item selected:", item.GetText()
-
- def OnItemDeselected(self, evt):
- item = evt.GetItem()
- print "Item deselected:", item.GetText()
-
- def OnItemActivated(self, evt):
- item = evt.GetItem()
- print "Item activated:", item.GetText()
-
- def OnSortAscending(self, evt):
- # recreate the listctrl with a sort style
- self.MakeListCtrl(wx.LC_SORT_ASCENDING)
-
- def OnSortDescending(self, evt):
- # recreate the listctrl with a sort style
- self.MakeListCtrl(wx.LC_SORT_DESCENDING)
-
- def OnSortBySubmitter(self, evt):
- def compare_func(row1, row2):
- # compare the values in the 4th col of the data
- val1 = data.rows[row1][3]
- val2 = data.rows[row2][3]
- if val1 < val2: return -1
- if val1 > val2: return 1
- return 0
-
- self.list.SortItems(compare_func)
-
-
-
- def OnShowSelected(self, evt):
- print "These items are selected:"
- index = self.list.GetFirstSelected()
- if index == -1:
- print "\tNone"
- return
- while index != -1:
- item = self.list.GetItem(index)
- print "\t%s" % item.GetText()
- index = self.list.GetNextSelected(index)
-
- def OnSelectAll(self, evt):
- for index in range(self.list.GetItemCount()):
- self.list.Select(index, True)
-
- def OnSelectNone(self, evt):
- index = self.list.GetFirstSelected()
- while index != -1:
- self.list.Select(index, False)
- index = self.list.GetNextSelected(index)
-
-
- def OnSetTextColour(self, evt):
- dlg = wx.ColourDialog(self)
- if dlg.ShowModal() == wx.ID_OK:
- colour = dlg.GetColourData().GetColour()
- index = self.list.GetFirstSelected()
- while index != -1:
- self.list.SetItemTextColour(index, colour)
- index = self.list.GetNextSelected(index)
- dlg.Destroy()
-
- def OnSetBGColour(self, evt):
- dlg = wx.ColourDialog(self)
- if dlg.ShowModal() == wx.ID_OK:
- colour = dlg.GetColourData().GetColour()
- index = self.list.GetFirstSelected()
- while index != -1:
- self.list.SetItemBackgroundColour(index, colour)
- index = self.list.GetNextSelected(index)
- dlg.Destroy()
-
-
- def OnEnableEditing(self, evt):
- self.editable = evt.IsChecked()
- self.MakeListCtrl()
-
- def OnEditItem(self, evt):
- index = self.list.GetFirstSelected()
- if index != -1:
- self.list.EditLabel(index)
-
-
-class DemoApp(wx.App):
- def OnInit(self):
- frame = DemoFrame()
- self.SetTopWindow(frame)
- print "Program output appears here..."
- frame.Show()
- return True
-
-app = DemoApp(redirect=True)
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_report_virtual.py b/wxPython/samples/wxPIA_book/Chapter-13/list_report_virtual.py
deleted file mode 100644
index caeb26220c..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_report_virtual.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import wx
-import sys, glob, random
-import data
-
-class DataSource:
- """
- A simple data source class that just uses our sample data items.
- A real data source class would manage fetching items from a
- database or similar.
- """
- def GetColumnHeaders(self):
- return data.columns
-
- def GetCount(self):
- return len(data.rows)
-
- def GetItem(self, index):
- return data.rows[index]
-
- def UpdateCache(self, start, end):
- pass
-
-
-class VirtualListCtrl(wx.ListCtrl):
- """
- A generic virtual listctrl that fetches data from a DataSource.
- """
- def __init__(self, parent, dataSource):
- wx.ListCtrl.__init__(self, parent,
- style=wx.LC_REPORT|wx.LC_SINGLE_SEL|wx.LC_VIRTUAL)
- self.dataSource = dataSource
- self.Bind(wx.EVT_LIST_CACHE_HINT, self.DoCacheItems)
- self.SetItemCount(dataSource.GetCount())
-
- columns = dataSource.GetColumnHeaders()
- for col, text in enumerate(columns):
- self.InsertColumn(col, text)
-
-
- def DoCacheItems(self, evt):
- self.dataSource.UpdateCache(
- evt.GetCacheFrom(), evt.GetCacheTo())
-
- def OnGetItemText(self, item, col):
- data = self.dataSource.GetItem(item)
- return data[col]
-
- def OnGetItemAttr(self, item): return None
- def OnGetItemImage(self, item): return -1
-
-
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "Virtual wx.ListCtrl",
- size=(600,400))
-
- self.list = VirtualListCtrl(self, DataSource())
-
-
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/list_smicon.py b/wxPython/samples/wxPIA_book/Chapter-13/list_smicon.py
deleted file mode 100644
index 9a81b0a606..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-13/list_smicon.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import wx
-import sys, glob
-
-class DemoFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1,
- "wx.ListCtrl in wx.LC_SMALL_ICON mode",
- size=(600,400))
-
- # load some images into an image list
- il = wx.ImageList(16,16, True)
- for name in glob.glob("smicon??.png"):
- bmp = wx.Bitmap(name, wx.BITMAP_TYPE_PNG)
- il_max = il.Add(bmp)
-
- # create the list control
- self.list = wx.ListCtrl(self, -1,
- style=wx.LC_SMALL_ICON
- | wx.LC_AUTOARRANGE
- )
-
- # assign the image list to it
- self.list.AssignImageList(il, wx.IMAGE_LIST_SMALL)
-
- # create some items for the list
- for x in range(25):
- img = x % (il_max+1)
- self.list.InsertImageStringItem(x,
- "This is item %02d" % x,
- img)
-
-app = wx.PySimpleApp()
-frame = DemoFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/sm_down.bmp b/wxPython/samples/wxPIA_book/Chapter-13/sm_down.bmp
deleted file mode 100644
index df9e6243d4..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/sm_down.bmp and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/sm_up.bmp b/wxPython/samples/wxPIA_book/Chapter-13/sm_up.bmp
deleted file mode 100644
index 8935c9f4a4..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/sm_up.bmp and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon01.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon01.png
deleted file mode 100644
index fc6bcdb2d9..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon01.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon02.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon02.png
deleted file mode 100644
index 3c112b5dcd..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon02.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon03.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon03.png
deleted file mode 100644
index 752707d850..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon03.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon04.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon04.png
deleted file mode 100644
index 5b734cd3f2..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon04.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon05.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon05.png
deleted file mode 100644
index d67a6c7e64..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon05.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-13/smicon06.png b/wxPython/samples/wxPIA_book/Chapter-13/smicon06.png
deleted file mode 100644
index 7b644d5bcd..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-13/smicon06.png and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_attr.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_attr.py
deleted file mode 100644
index ec4b5be0ca..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_attr.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import wx
-import wx.grid
-
-class TestFrame(wx.Frame):
-
-
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Attributes",
- size=(600,300))
- grid = wx.grid.Grid(self)
- grid.CreateGrid(10,6)
- for row in range(10):
- for col in range(6):
- grid.SetCellValue(row, col, "(%s,%s)" % (row, col))
-
- grid.SetCellTextColour(1, 1, "red")
- grid.SetCellFont(1,1, wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
- grid.SetCellBackgroundColour(2, 2, "light blue")
-
- attr = wx.grid.GridCellAttr()
- attr.SetTextColour("navyblue")
- attr.SetBackgroundColour("pink")
- attr.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
-
- grid.SetAttr(4, 0, attr)
- grid.SetAttr(5, 1, attr)
- grid.SetRowAttr(8, attr)
-
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_basic.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_basic.py
deleted file mode 100644
index 1f52aee0f8..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_basic.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import wx
-import wx.grid
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Simple Grid",
- size=(640,480))
- grid = wx.grid.Grid(self)
- grid.CreateGrid(50,50)
- for row in range(20):
- for col in range(6):
- grid.SetCellValue(row, col,
- "cell (%d,%d)" % (row, col))
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_editor.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_editor.py
deleted file mode 100644
index 98d6296020..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_editor.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import wx
-import wx.grid
-import string
-
-class UpCaseCellEditor(wx.grid.PyGridCellEditor):
- def __init__(self):
- wx.grid.PyGridCellEditor.__init__(self)
-
- def Create(self, parent, id, evtHandler):
- """
- Called to create the control, which must derive from wx.Control.
- *Must Override*
- """
- self._tc = wx.TextCtrl(parent, id, "")
- self._tc.SetInsertionPoint(0)
- self.SetControl(self._tc)
-
- if evtHandler:
- self._tc.PushEventHandler(evtHandler)
-
- self._tc.Bind(wx.EVT_CHAR, self.OnChar)
-
- def SetSize(self, rect):
- """
- Called to position/size the edit control within the cell rectangle.
- If you don't fill the cell (the rect) then be sure to override
- PaintBackground and do something meaningful there.
- """
- self._tc.SetDimensions(rect.x, rect.y, rect.width+2, rect.height+2,
- wx.SIZE_ALLOW_MINUS_ONE)
-
- def BeginEdit(self, row, col, grid):
- """
- Fetch the value from the table and prepare the edit control
- to begin editing. Set the focus to the edit control.
- *Must Override*
- """
- self.startValue = grid.GetTable().GetValue(row, col)
- self._tc.SetValue(self.startValue)
- self._tc.SetInsertionPointEnd()
- self._tc.SetFocus()
- self._tc.SetSelection(0, self._tc.GetLastPosition())
-
- def EndEdit(self, row, col, grid):
- """
- Complete the editing of the current cell. Returns True if the value
- has changed. If necessary, the control may be destroyed.
- *Must Override*
- """
- changed = False
-
- val = self._tc.GetValue()
-
- if val != self.startValue:
- changed = True
- grid.GetTable().SetValue(row, col, val) # update the table
-
- self.startValue = ''
- self._tc.SetValue('')
- return changed
-
- def Reset(self):
- """
- Reset the value in the control back to its starting value.
- *Must Override*
- """
- self._tc.SetValue(self.startValue)
- self._tc.SetInsertionPointEnd()
-
- def Clone(self):
- """
- Create a new object which is the copy of this one
- *Must Override*
- """
- return UpCaseCellEditor()
-
- def StartingKey(self, evt):
- """
- If the editor is enabled by pressing keys on the grid, this will be
- called to let the editor do something about that first key if desired.
- """
- self.OnChar(evt)
- if evt.GetSkipped():
- self._tc.EmulateKeyPress(evt)
-
- def OnChar(self, evt):
- key = evt.GetKeyCode()
- if key > 255:
- evt.Skip()
- return
- char = chr(key)
- if char in string.letters:
- char = char.upper()
- self._tc.WriteText(char)
- else:
- evt.Skip()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Editor",
- size=(640,480))
-
- grid = wx.grid.Grid(self)
- grid.CreateGrid(50,50)
- grid.SetDefaultEditor(UpCaseCellEditor())
-
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_headers.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_headers.py
deleted file mode 100644
index 2c43171ddb..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_headers.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import wx
-import wx.grid
-
-class TestFrame(wx.Frame):
-
- rowLabels = ["uno", "dos", "tres", "quatro", "cinco"]
- colLabels = ["homer", "marge", "bart", "lisa", "maggie"]
-
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Headers",
- size=(500,200))
- grid = wx.grid.Grid(self)
- grid.CreateGrid(5,5)
- for row in range(5):
- grid.SetRowLabelValue(row, self.rowLabels[row])
- grid.SetColLabelValue(row, self.colLabels[row])
- for col in range(5):
- grid.SetCellValue(row, col,
- "(%s,%s)" % (self.rowLabels[row], self.colLabels[col]))
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_renderer.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_renderer.py
deleted file mode 100644
index 415fd50ee2..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_renderer.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import wx
-import wx.grid
-import random
-
-class RandomBackgroundRenderer(wx.grid.PyGridCellRenderer):
- def __init__(self):
- wx.grid.PyGridCellRenderer.__init__(self)
-
-
- def Draw(self, grid, attr, dc, rect, row, col, isSelected):
- text = grid.GetCellValue(row, col)
- hAlign, vAlign = attr.GetAlignment()
- dc.SetFont( attr.GetFont() )
- if isSelected:
- bg = grid.GetSelectionBackground()
- fg = grid.GetSelectionForeground()
- else:
- bg = random.choice(["pink", "sky blue", "cyan", "yellow", "plum"])
- fg = attr.GetTextColour()
-
- dc.SetTextBackground(bg)
- dc.SetTextForeground(fg)
- dc.SetBrush(wx.Brush(bg, wx.SOLID))
- dc.SetPen(wx.TRANSPARENT_PEN)
- dc.DrawRectangleRect(rect)
- grid.DrawTextRectangle(dc, text, rect, hAlign, vAlign)
-
-
- def GetBestSize(self, grid, attr, dc, row, col):
- text = grid.GetCellValue(row, col)
- dc.SetFont(attr.GetFont())
- w, h = dc.GetTextExtent(text)
- return wx.Size(w, h)
-
- def Clone(self):
- return RandomBackgroundRenderer()
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Renderer",
- size=(640,480))
-
- grid = wx.grid.Grid(self)
- grid.CreateGrid(50,50)
-
- # Set this custom renderer just for row 4
- attr = wx.grid.GridCellAttr()
- attr.SetRenderer(RandomBackgroundRenderer())
- grid.SetRowAttr(4, attr)
-
- for row in range(10):
- for col in range(10):
- grid.SetCellValue(row, col,
- "cell (%d,%d)" % (row, col))
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_size.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_size.py
deleted file mode 100644
index d23c21e54b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_size.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import wx
-import wx.grid
-
-class TestFrame(wx.Frame):
-
-
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Sizes",
- size=(600,300))
- grid = wx.grid.Grid(self)
- grid.CreateGrid(5,5)
- for row in range(5):
- for col in range(5):
- grid.SetCellValue(row, col, "(%s,%s)" % (row, col))
-
- grid.SetCellSize(2, 2, 2, 3)
- grid.SetColSize(1, 125)
- grid.SetRowSize(1, 100)
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_table.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_table.py
deleted file mode 100644
index ee1705c1a8..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_table.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import wx
-import wx.grid
-
-class TestTable(wx.grid.PyGridTableBase):
- def __init__(self):
- wx.grid.PyGridTableBase.__init__(self)
- self.data = { (1,1) : "Here",
- (2,2) : "is",
- (3,3) : "some",
- (4,4) : "data",
- }
-
- self.odd=wx.grid.GridCellAttr()
- self.odd.SetBackgroundColour("sky blue")
- self.odd.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
-
- self.even=wx.grid.GridCellAttr()
- self.even.SetBackgroundColour("sea green")
- self.even.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
-
-
- # these five are the required methods
- def GetNumberRows(self):
- return 50
-
- def GetNumberCols(self):
- return 50
-
- def IsEmptyCell(self, row, col):
- return self.data.get((row, col)) is not None
-
- def GetValue(self, row, col):
- value = self.data.get((row, col))
- if value is not None:
- return value
- else:
- return ''
-
- def SetValue(self, row, col, value):
- self.data[(row,col)] = value
-
-
- # the table can also provide the attribute for each cell
- def GetAttr(self, row, col, kind):
- attr = [self.even, self.odd][row % 2]
- attr.IncRef()
- return attr
-
-
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Table",
- size=(640,480))
-
- grid = wx.grid.Grid(self)
-
- table = TestTable()
- grid.SetTable(table, True)
-
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_table_basic.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_table_basic.py
deleted file mode 100644
index 60f017907b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_table_basic.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import wx
-import wx.grid
-
-class TestTable(wx.grid.PyGridTableBase):
- def __init__(self):
- wx.grid.PyGridTableBase.__init__(self)
- self.rowLabels = ["uno", "dos", "tres", "quatro", "cinco"]
- self.colLabels = ["homer", "marge", "bart", "lisa", "maggie"]
-
- def GetNumberRows(self):
- return 5
-
- def GetNumberCols(self):
- return 5
-
- def IsEmptyCell(self, row, col):
- return False
-
- def GetValue(self, row, col):
- return "(%s,%s)" % (self.rowLabels[row], self.colLabels[col])
-
- def SetValue(self, row, col, value):
- pass
-
- def GetColLabelValue(self, col):
- return self.colLabels[col]
-
- def GetRowLabelValue(self, row):
- return self.rowLabels[row]
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Table",
- size=(500,200))
- grid = wx.grid.Grid(self)
- table = TestTable()
- grid.SetTable(table, True)
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-14/grid_table_header.py b/wxPython/samples/wxPIA_book/Chapter-14/grid_table_header.py
deleted file mode 100644
index 8b2e29554c..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-14/grid_table_header.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import wx
-import wx.grid
-
-class TestTable(wx.grid.PyGridTableBase):
- def __init__(self):
- wx.grid.PyGridTableBase.__init__(self)
- self.data = { (1,1) : "Here",
- (2,2) : "is",
- (3,3) : "some",
- (4,4) : "data",
- }
-
- self.odd=wx.grid.GridCellAttr()
- self.odd.SetBackgroundColour("sky blue")
- self.odd.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
-
- self.even=wx.grid.GridCellAttr()
- self.even.SetBackgroundColour("sea green")
- self.even.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD))
-
-
- # these five are the required methods
- def GetNumberRows(self):
- return 50
-
- def GetNumberCols(self):
- return 50
-
- def IsEmptyCell(self, row, col):
- return self.data.get((row, col)) is not None
-
- def GetValue(self, row, col):
- value = self.data.get((row, col))
- if value is not None:
- return value
- else:
- return ''
-
- def SetValue(self, row, col, value):
- self.data[(row,col)] = value
-
-
- # the table can also provide the attribute for each cell
- def GetAttr(self, row, col, kind):
- attr = [self.even, self.odd][row % 2]
- attr.IncRef()
- return attr
-
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Grid Table",
- size=(640,480))
-
- grid = wx.grid.Grid(self)
-
- table = TestTable()
- grid.SetTable(table, True)
-
-
-app = wx.PySimpleApp()
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/data.py b/wxPython/samples/wxPIA_book/Chapter-15/data.py
deleted file mode 100644
index ac5c0cab29..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/data.py
+++ /dev/null
@@ -1,403 +0,0 @@
-
-# Some sample data for the treectrl samples
-
-tree = [
- "wx.AcceleratorTable",
- "wx.BrushList",
- "wx.BusyInfo",
- "wx.Clipboard",
- "wx.Colour",
- "wx.ColourData",
- "wx.ColourDatabase",
- "wx.ContextHelp",
- ["wx.DC", [
- "wx.ClientDC",
- ["wx.MemoryDC", [
- "wx.lib.colourchooser.canvas.BitmapBuffer",
- ["wx.BufferedDC", [
- "wx.BufferedPaintDC", ]]]],
-
- "wx.MetaFileDC",
- "wx.MirrorDC",
- "wx.PaintDC",
- "wx.PostScriptDC",
- "wx.PrinterDC",
- "wx.ScreenDC",
- "wx.WindowDC",]],
- "wx.DragImage",
- "wx.Effects",
- "wx.EncodingConverter",
- ["wx.Event", [
- "wx.ActivateEvent",
- "wx.CalculateLayoutEvent",
- "wx.CloseEvent",
- ["wx.CommandEvent", [
- "wx.calendar.CalendarEvent",
- "wx.ChildFocusEvent",
- "wx.ContextMenuEvent",
- "wx.gizmos.DynamicSashSplitEvent",
- "wx.gizmos.DynamicSashUnifyEvent",
- "wx.FindDialogEvent",
- "wx.grid.GridEditorCreatedEvent",
- "wx.HelpEvent",
- ["wx.NotifyEvent",[
- ["wx.BookCtrlEvent", [
- "wx.ListbookEvent",
- "wx.NotebookEvent ",]],
- "wx.grid.GridEvent",
- "wx.grid.GridRangeSelectEvent",
- "wx.grid.GridSizeEvent",
- "wx.ListEvent",
- "wx.SpinEvent",
- "wx.SplitterEvent",
- "wx.TreeEvent",
- "wx.wizard.WizardEvent ",]],
- ["wx.PyCommandEvent", [
- "wx.lib.colourselect.ColourSelectEvent",
- "wx.lib.buttons.GenButtonEvent",
- "wx.lib.gridmovers.GridColMoveEvent",
- "wx.lib.gridmovers.GridRowMoveEvent",
- "wx.lib.intctrl.IntUpdatedEvent",
- "wx.lib.masked.combobox.MaskedComboBoxSelectEvent",
- "wx.lib.masked.numctrl.NumberUpdatedEvent",
- "wx.lib.masked.timectrl.TimeUpdatedEvent ",]],
- "wx.SashEvent",
- "wx.ScrollEvent",
- "wx.stc.StyledTextEvent",
- "wx.TextUrlEvent",
- "wx.UpdateUIEvent",
- "wx.WindowCreateEvent",
- "wx.WindowDestroyEvent ",]],
- "wx.DisplayChangedEvent",
- "wx.DropFilesEvent",
- "wx.EraseEvent",
- "wx.FocusEvent",
- "wx.IconizeEvent",
- "wx.IdleEvent",
- "wx.InitDialogEvent",
- "wx.JoystickEvent",
- "wx.KeyEvent",
- "wx.MaximizeEvent",
- "wx.MenuEvent",
- "wx.MouseCaptureChangedEvent",
- "wx.MouseEvent",
- "wx.MoveEvent",
- "wx.NavigationKeyEvent",
- "wx.NcPaintEvent",
- "wx.PaintEvent",
- "wx.PaletteChangedEvent",
- "wx.ProcessEvent",
- ["wx.PyEvent", [
- "wx.lib.throbber.UpdateThrobberEvent ",]],
- "wx.QueryLayoutInfoEvent",
- "wx.QueryNewPaletteEvent",
- "wx.ScrollWinEvent",
- "wx.SetCursorEvent",
- "wx.ShowEvent",
- "wx.SizeEvent",
- "wx.SysColourChangedEvent",
- "wx.TaskBarIconEvent",
- "wx.TimerEvent ",]],
- ["wx.EvtHandler", [
- "wx.lib.gridmovers.GridColMover",
- "wx.lib.gridmovers.GridRowMover",
- "wx.html.HtmlHelpController",
- "wx.Menu",
- "wx.Process",
- ["wx.PyApp", [
- ["wx.App", [
- "wx.py.PyAlaCarte.App",
- "wx.py.PyAlaMode.App",
- "wx.py.PyAlaModeTest.App",
- "wx.py.PyCrust.App",
- "wx.py.PyShell.App",
- ["wx.py.filling.App", [
- "wx.py.PyFilling.App ",]],
- ["wx.PySimpleApp", [
- "wx.lib.masked.maskededit.test",]],
- "wx.PyWidgetTester ",]]]],
-
- "wx.TaskBarIcon",
- ["wx.Timer", [
- "wx.PyTimer ",]],
- ["wx.Validator", [
- ["wx.PyValidator",[
- "wx.lib.intctrl.IntValidator",]]]],
- ["wx.Window", [
- ["wx.lib.colourchooser.canvas.Canvas", [
- "wx.lib.colourchooser.pycolourslider.PyColourSlider",
- "wx.lib.colourchooser.pypalette.PyPalette",]],
- "wx.lib.gridmovers.ColDragWindow",
- ["wx.Control",[
- ["wx.BookCtrl", [
- "wx.Listbook",
- ["wx.Notebook",[
- "wx.py.editor.EditorNotebook",
- "wx.py.editor.EditorShellNotebook",]] ]],
- ["wx.Button", [
- ["wx.BitmapButton",[
- "wx.lib.colourselect.ColourSelect",
- "wx.ContextHelpButton",
- "wx.lib.foldmenu.FoldOutMenu ",]] ]],
- "wx.calendar.CalendarCtrl",
- "wx.CheckBox",
- ["wx.ComboBox",[
- ["wx.lib.masked.combobox.BaseMaskedComboBox", [
- "wx.lib.masked.combobox.ComboBox",
- "wx.lib.masked.combobox.PreMaskedComboBox",]] ]],
- ["wx.ControlWithItems", [
- ["wx.Choice",[
- "wx.DirFilterListCtrl ",]],
- "wx.ListBox",
- "wx.CheckListBox ",]],
- "wx.Gauge",
- "wx.GenericDirCtrl",
- "wx.gizmos.LEDNumberCtrl",
- ["wx.ListCtrl",[
- "wx.ListView ",]],
- ["wx.PyControl",[
- "wx.lib.calendar.Calendar",
- ["wx.lib.buttons.GenButton",[
- ["wx.lib.buttons.GenBitmapButton",[
- ["wx.lib.buttons.GenBitmapTextButton",[
- "wx.lib.buttons.GenBitmapTextToggleButton ",]],
- "wx.lib.buttons.GenBitmapToggleButton ",]],
- "wx.lib.buttons.GenToggleButton ",]],
- "wx.lib.statbmp.GenStaticBitmap",
- "wx.lib.stattext.GenStaticText",
- "wx.lib.popupctl.PopButton",
- "wx.lib.popupctl.PopupControl",
- "wx.lib.ticker.Ticker ",]],
- "wx.RadioBox",
- "wx.RadioButton",
- "wx.ScrollBar",
- "wx.Slider",
- "wx.SpinButton",
- "wx.SpinCtrl",
- ["wx.StaticBitmap",[
- "wx.lib.fancytext.StaticFancyText ",]],
- "wx.StaticBox",
- "wx.StaticLine",
- "wx.StaticText",
- ["wx.stc.StyledTextCtrl",[
- ["wx.py.editwindow.EditWindow",[
- "wx.py.crust.Display",
- "wx.py.editor.EditWindow",
- "wx.py.filling.FillingText",
- "wx.py.shell.Shell",]],
- "wx.lib.pyshell.PyShellWindow ",]],
- ["wx.TextCtrl", [
- ["wx.lib.masked.textctrl.BaseMaskedTextCtrl",[
- "wx.lib.masked.ipaddrctrl.IpAddrCtrl",
- "wx.lib.masked.numctrl.NumCtrl",
- "wx.lib.masked.textctrl.PreMaskedTextCtrl",
- "wx.lib.masked.textctrl.TextCtrl",
- "wx.lib.masked.timectrl.TimeCtrl ",]],
- "wx.py.crust.Calltip",
- "wx.lib.sheet.CTextCellEditor",
- "wx.py.crust.DispatcherListing",
- "wx.lib.intctrl.IntCtrl",
- "wx.lib.rightalign.RightTextCtrl",
- "wx.py.crust.SessionListing",]],
- "wx.ToggleButton",
- "wx.ToolBar",
- ["wx.TreeCtrl",[
- "wx.py.filling.FillingTree",
- "wx.gizmos.RemotelyScrolledTreeCtrl ",]],
- "wx.gizmos.TreeListCtrl ",]],
- "wx.gizmos.DynamicSashWindow",
- "wx.lib.multisash.EmptyChild",
- "wx.glcanvas.GLCanvas",
- "wx.lib.imagebrowser.ImageView",
- "wx.MDIClientWindow",
- "wx.MenuBar",
- "wx.lib.multisash.MultiClient",
- "wx.lib.multisash.MultiCloser",
- "wx.lib.multisash.MultiCreator",
- "wx.lib.multisash.MultiSash",
- "wx.lib.multisash.MultiSizer",
- "wx.lib.multisash.MultiSplit",
- "wx.lib.multisash.MultiViewLeaf",
- ["wx.Panel",[
- "wx.gizmos.EditableListBox",
- ["wx.lib.filebrowsebutton.FileBrowseButton",[
- "wx.lib.filebrowsebutton.DirBrowseButton",
- "wx.lib.filebrowsebutton.FileBrowseButtonWithHistory",]],
- "wx.lib.floatcanvas.FloatCanvas.FloatCanvas",
- "wx.lib.floatcanvas.NavCanvas.NavCanvas",
- "wx.NotebookPage",
- ["wx.PreviewControlBar",[
- "wx.PyPreviewControlBar ",]],
- "wx.lib.colourchooser.pycolourbox.PyColourBox",
- "wx.lib.colourchooser.pycolourchooser.PyColourChooser",
- ["wx.PyPanel",[
- "wx.lib.throbber.Throbber",]],
- "wx.lib.shell.PyShell",
- "wx.lib.shell.PyShellInput",
- "wx.lib.shell.PyShellOutput",
- ["wx.ScrolledWindow",[
- "wx.lib.editor.editor.Editor",
- ["wx.grid.Grid",[
- "wx.lib.sheet.CSheet ",]],
- ["wx.html.HtmlWindow",[
- "wx.lib.ClickableHtmlWindow.PyClickableHtmlWindow",]],
- "wx.PreviewCanvas",
- "wx.lib.printout.PrintTableDraw",
- ["wx.PyScrolledWindow",[
- "wx.lib.scrolledpanel.ScrolledPanel",]],
- "wx.lib.ogl.ShapeCanvas",
- "wx.gizmos.SplitterScrolledWindow ",]],
- ["wx.VScrolledWindow",[
- ["wx.VListBox", [
- "wx.HtmlListBox ",]] ]],
- ["wx.wizard.WizardPage", [
- "wx.wizard.PyWizardPage",
- "wx.wizard.WizardPageSimple ",]],
- "wx.lib.plot.PlotCanvas",
- "wx.lib.wxPlotCanvas.PlotCanvas",
- ["wx.PopupWindow",[
- "wx.lib.foldmenu.FoldOutWindow",
- ["wx.PopupTransientWindow",[
- "wx.TipWindow ",]] ]],
- ["wx.PyWindow", [
- "wx.lib.analogclock.AnalogClockWindow",]],
- "wx.lib.gridmovers.RowDragWindow",
- ["wx.SashWindow",[
- "wx.SashLayoutWindow ",]],
- "wx.SplashScreenWindow",
- ["wx.SplitterWindow",[
- "wx.py.crust.Crust",
- "wx.py.filling.Filling",
- "wx.gizmos.ThinSplitterWindow ",]],
- "wx.StatusBar",
- ["wx.TopLevelWindow",[
- ["wx.Dialog",[
- "wx.lib.calendar.CalenDlg",
- "wx.ColourDialog",
- "wx.DirDialog",
- "wx.FileDialog",
- "wx.FindReplaceDialog",
- "wx.FontDialog",
- "wx.lib.imagebrowser.ImageDialog",
- "wx.MessageDialog",
- "wx.MultiChoiceDialog",
- "wx.lib.dialogs.MultipleChoiceDialog",
- "wx.PageSetupDialog",
- "wx.lib.popupctl.PopupDialog",
- "wx.PrintDialog",
- "wx.lib.dialogs.ScrolledMessageDialog",
- "wx.SingleChoiceDialog",
- "wx.TextEntryDialog",
- "wx.wizard.Wizard ",]],
- ["wx.Frame", [
- "wx.lib.analogclockopts.ACCustomizationFrame",
- "wx.py.filling.FillingFrame",
- ["wx.py.frame.Frame",[
- "wx.py.crust.CrustFrame",
- ["wx.py.editor.EditorFrame",[
- "wx.py.editor.EditorNotebookFrame",]],
- "wx.py.shell.ShellFrame",]],
- "wx.html.HtmlHelpFrame",
- "wx.MDIChildFrame",
- "wx.MDIParentFrame",
- "wx.MiniFrame",
- ["wx.PreviewFrame",[
- "wx.PyPreviewFrame ",]],
- "wx.ProgressDialog",
- "wx.SplashScreen",
- "wx.lib.splashscreen.SplashScreen",
- "wx.lib.masked.maskededit.test2",
- "wx.lib.plot.TestFrame ",]] ]],
- "wx.gizmos.TreeCompanionWindow ",]] ]] ]],
- "wx.FileHistory",
- "wx.FileSystem",
- "wx.FindReplaceData",
- "wx.FontData",
- "wx.FontList",
- "wx.FSFile",
- ["wx.GDIObject",[
- "wx.Bitmap",
- "wx.Brush",
- "wx.Cursor",
- "wx.Font",
- "wx.Icon",
- "wx.Palette",
- "wx.Pen",
- "wx.Region ",]],
- "wx.glcanvas.GLContext",
- ["wx.grid.GridTableBase", [
- "wx.grid.GridStringTable",
- "wx.grid.PyGridTableBase ",]],
- ["wx.html.HtmlCell", [
- "wx.html.HtmlColourCell",
- "wx.html.HtmlContainerCell",
- "wx.html.HtmlFontCell",
- "wx.html.HtmlWidgetCell",
- "wx.html.HtmlWordCell ",]],
- "wx.html.HtmlDCRenderer",
- "wx.html.HtmlEasyPrinting",
- "wx.html.HtmlFilter",
- "wx.html.HtmlLinkInfo",
- ["wx.html.HtmlParser", [
- "wx.html.HtmlWinParser ",]],
- "wx.html.HtmlTag",
- ["wx.html.HtmlTagHandler", [
- ["wx.html.HtmlWinTagHandler", [
- "wx.lib.wxpTag.wxpTagHandler ",]] ]],
- "wx.Image",
- ["wx.ImageHandler", [
- ["wx.BMPHandler", [
- ["wx.ICOHandler", [
- ["wx.CURHandler", [
- "wx.ANIHandler ",]] ]] ]],
- "wx.GIFHandler",
- "wx.JPEGHandler",
- "wx.PCXHandler",
- "wx.PNGHandler",
- "wx.PNMHandler",
- "wx.TIFFHandler",
- "wx.XPMHandler ",]],
- "wx.ImageList",
- "wx.IndividualLayoutConstraint",
- "wx.LayoutAlgorithm",
- ["wx.LayoutConstraints", [
- "wx.lib.anchors.LayoutAnchors",
- "wx.lib.layoutf.Layoutf",]],
- "wx.ListItem",
- "wx.Mask",
- "wx.MenuItem",
- "wx.MetaFile",
- "wx.PageSetupDialogData",
- "wx.PenList",
- "wx.PrintData",
- "wx.PrintDialogData",
- "wx.Printer",
- ["wx.Printout", [
- "wx.html.HtmlPrintout",
- "wx.lib.plot.PlotPrintout",
- "wx.lib.printout.SetPrintout ",]],
- ["wx.PrintPreview", [
- "wx.PyPrintPreview ",]],
- "wx.RegionIterator",
- ["wx.Sizer", [
- "wx.BookCtrlSizer",
- ["wx.BoxSizer", [
- "wx.StaticBoxSizer", ]],
- ["wx.GridSizer", [
- ["wx.FlexGridSizer", [
- "wx.GridBagSizer",]] ]],
- "wx.NotebookSizer",
- "wx.PySizer",]],
- ["wx.SizerItem", [
- "wx.GBSizerItem",]],
- "wx.SystemOptions",
- "wx.ToolBarToolBase",
- "wx.ToolTip",
- "wx.gizmos.TreeListColumnInfo",
- "wx.xrc.XmlDocument",
- "wx.xrc.XmlResource",
- "wx.xrc.XmlResourceHandler ",
-]
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/tree_icons.py b/wxPython/samples/wxPIA_book/Chapter-15/tree_icons.py
deleted file mode 100644
index c7730b847f..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/tree_icons.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import wx
-import data
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None,
- title="simple tree with icons", size=(400,500))
-
- # Create an image list
- il = wx.ImageList(16,16)
-
- # Get some standard images from the art provider and add them
- # to the image list
- self.fldridx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FOLDER,
- wx.ART_OTHER, (16,16)))
- self.fldropenidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN,
- wx.ART_OTHER, (16,16)))
- self.fileidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE,
- wx.ART_OTHER, (16,16)))
-
-
- # Create the tree
- self.tree = wx.TreeCtrl(self)
- # Give it the image list
- self.tree.AssignImageList(il)
- root = self.tree.AddRoot("wx.Object")
- self.tree.SetItemImage(root, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(root, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- self.AddTreeNodes(root, data.tree)
- self.tree.Expand(root)
-
-
- def AddTreeNodes(self, parentItem, items):
- for item in items:
- if type(item) == str:
- newItem = self.tree.AppendItem(parentItem, item)
- self.tree.SetItemImage(newItem, self.fileidx,
- wx.TreeItemIcon_Normal)
- else:
- newItem = self.tree.AppendItem(parentItem, item[0])
- self.tree.SetItemImage(newItem, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(newItem, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- self.AddTreeNodes(newItem, item[1])
-
-
- def GetItemText(self, item):
- if item:
- return self.tree.GetItemText(item)
- else:
- return ""
-
-app = wx.PySimpleApp(redirect=True)
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/tree_misc.py b/wxPython/samples/wxPIA_book/Chapter-15/tree_misc.py
deleted file mode 100644
index 2df8e00fdc..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/tree_misc.py
+++ /dev/null
@@ -1,155 +0,0 @@
-import wx
-import data
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="tree: misc tests", size=(400,500))
-
- # Create an image list
- il = wx.ImageList(16,16)
-
- # Get some standard images from the art provider and add them
- # to the image list
- self.fldridx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16,16)))
- self.fldropenidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, (16,16)))
- self.fileidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, (16,16)))
-
-
- # Create the tree
- self.tree = wx.TreeCtrl(self, style=wx.TR_DEFAULT_STYLE | wx.TR_EDIT_LABELS)
-
- # Give it the image list
- self.tree.AssignImageList(il)
-
-
- # Add a root node and assign it some images
- root = self.tree.AddRoot("wx.Object")
- self.tree.SetItemPyData(root, None)
- self.tree.SetItemImage(root, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(root, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- # Add nodes from our data set
- self.AddTreeNodes(root, data.tree)
-
- # Bind some interesting events
- self.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.OnItemExpanded, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed, self.tree)
- self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivated, self.tree)
-
- self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnBeginEdit, self.tree)
-
-
- # Expand the first level
- self.tree.Expand(root)
-
-
- menu = wx.Menu()
- mi = menu.Append(-1, "Edit Item")
- self.Bind(wx.EVT_MENU, self.OnEditItem, mi)
- mi = menu.Append(-1, "Sort Children")
- self.Bind(wx.EVT_MENU, self.OnSortChildren, mi)
- mi = menu.Append(-1, "Delete Children")
- self.Bind(wx.EVT_MENU, self.OnDeleteChildren, mi)
- mi = menu.Append(-1, "Find all Children")
- self.Bind(wx.EVT_MENU, self.OnFindChildren, mi)
- mb = wx.MenuBar()
- mb.Append(menu, "Tests")
- self.SetMenuBar(mb)
-
-
- def AddTreeNodes(self, parentItem, items):
- """
- Recursively traverses the data structure, adding tree nodes to
- match it.
- """
- for item in items:
- if type(item) == str:
- newItem = self.tree.AppendItem(parentItem, item)
- self.tree.SetItemPyData(newItem, None)
- self.tree.SetItemImage(newItem, self.fileidx,
- wx.TreeItemIcon_Normal)
- else:
- newItem = self.tree.AppendItem(parentItem, item[0])
- self.tree.SetItemPyData(newItem, None)
- self.tree.SetItemImage(newItem, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(newItem, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- self.AddTreeNodes(newItem, item[1])
-
-
- def GetItemText(self, item):
- if item:
- return self.tree.GetItemText(item)
- else:
- return ""
-
- def OnItemExpanded(self, evt):
- print "OnItemExpanded: ", self.GetItemText(evt.GetItem())
-
- def OnItemCollapsed(self, evt):
- print "OnItemCollapsed:", self.GetItemText(evt.GetItem())
-
- def OnSelChanged(self, evt):
- print "OnSelChanged: ", self.GetItemText(evt.GetItem())
-
- def OnActivated(self, evt):
- print "OnActivated: ", self.GetItemText(evt.GetItem())
-
-
- def OnBeginEdit(self, evt):
- print "OnBeginEdit: ", self.GetItemText(evt.GetItem())
- # we can prevent nodes from being edited, for example let's
- # not let the root node be edited...
- item = evt.GetItem()
- if item == self.tree.GetRootItem():
- evt.Veto()
- print "*** Edit was vetoed!"
-
-
- def OnEditItem(self, evt):
- item = self.tree.GetSelection()
- if item:
- self.tree.EditLabel(item)
-
- def OnSortChildren(self, evt):
- item = self.tree.GetSelection()
- if item:
- self.tree.SortChildren(item)
-
- def OnDeleteChildren(self, evt):
- item = self.tree.GetSelection()
- if item:
- self.tree.DeleteChildren(item)
-
- def OnFindChildren(self, evt):
- item = self.tree.GetSelection()
- if item:
- self.PrintAllItems(item)
-
- def PrintAllItems(self, parent, indent=0):
- text = self.tree.GetItemText(parent)
- print ' ' * indent, text
- indent += 4
- item, cookie = self.tree.GetFirstChild(parent)
- while item:
- if self.tree.ItemHasChildren(item):
- self.PrintAllItems(item, indent)
- else:
- text = self.tree.GetItemText(item)
- print ' ' * indent, text
- item, cookie = self.tree.GetNextChild(parent, cookie)
-
-
-app = wx.PySimpleApp(redirect=True)
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/tree_simple.py b/wxPython/samples/wxPIA_book/Chapter-15/tree_simple.py
deleted file mode 100644
index b04beabbf5..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/tree_simple.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import wx
-import data
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="simple tree", size=(400,500))
-
- # Create the tree
- self.tree = wx.TreeCtrl(self)
-
- # Add a root node
- root = self.tree.AddRoot("wx.Object")
-
- # Add nodes from our data set
- self.AddTreeNodes(root, data.tree)
-
- # Bind some interesting events
- self.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.OnItemExpanded, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed, self.tree)
- self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivated, self.tree)
-
- # Expand the first level
- self.tree.Expand(root)
-
-
- def AddTreeNodes(self, parentItem, items):
- """
- Recursively traverses the data structure, adding tree nodes to
- match it.
- """
- for item in items:
- if type(item) == str:
- self.tree.AppendItem(parentItem, item)
- else:
- newItem = self.tree.AppendItem(parentItem, item[0])
- self.AddTreeNodes(newItem, item[1])
-
- def GetItemText(self, item):
- if item:
- return self.tree.GetItemText(item)
- else:
- return ""
-
- def OnItemExpanded(self, evt):
- print "OnItemExpanded: ", self.GetItemText(evt.GetItem())
-
- def OnItemCollapsed(self, evt):
- print "OnItemCollapsed:", self.GetItemText(evt.GetItem())
-
- def OnSelChanged(self, evt):
- print "OnSelChanged: ", self.GetItemText(evt.GetItem())
-
- def OnActivated(self, evt):
- print "OnActivated: ", self.GetItemText(evt.GetItem())
-
-
-app = wx.PySimpleApp(redirect=True)
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/tree_treelist.py b/wxPython/samples/wxPIA_book/Chapter-15/tree_treelist.py
deleted file mode 100644
index e35bfc1108..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/tree_treelist.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import wx
-import wx.gizmos
-import data
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="TreeListCtrl", size=(400,500))
-
- # Create an image list
- il = wx.ImageList(16,16)
-
- # Get some standard images from the art provider and add them
- # to the image list
- self.fldridx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16,16)))
- self.fldropenidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, (16,16)))
- self.fileidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, (16,16)))
-
-
- # Create the tree
- self.tree = wx.gizmos.TreeListCtrl(self, style =
- wx.TR_DEFAULT_STYLE
- | wx.TR_FULL_ROW_HIGHLIGHT)
-
- # Give it the image list
- self.tree.AssignImageList(il)
-
-
- # create some columns
- self.tree.AddColumn("Class Name")
- self.tree.AddColumn("Description")
- self.tree.SetMainColumn(0) # the one with the tree in it...
- self.tree.SetColumnWidth(0, 200)
- self.tree.SetColumnWidth(1, 200)
-
- # Add a root node and assign it some images
- root = self.tree.AddRoot("wx.Object")
- self.tree.SetItemText(root, "A description of wx.Object", 1)
- self.tree.SetItemImage(root, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(root, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- # Add nodes from our data set
- self.AddTreeNodes(root, data.tree)
-
- # Bind some interesting events
- self.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.OnItemExpanded, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed, self.tree)
- self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivated, self.tree)
-
- # Expand the first level
- self.tree.Expand(root)
-
-
- def AddTreeNodes(self, parentItem, items):
- """
- Recursively traverses the data structure, adding tree nodes to
- match it.
- """
- for item in items:
- if type(item) == str:
- newItem = self.tree.AppendItem(parentItem, item)
- self.tree.SetItemText(newItem, "A description of %s" % item, 1)
- self.tree.SetItemImage(newItem, self.fileidx,
- wx.TreeItemIcon_Normal)
- else:
- newItem = self.tree.AppendItem(parentItem, item[0])
- self.tree.SetItemText(newItem, "A description of %s" % item[0], 1)
- self.tree.SetItemImage(newItem, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(newItem, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- self.AddTreeNodes(newItem, item[1])
-
-
- def GetItemText(self, item):
- if item:
- return self.tree.GetItemText(item)
- else:
- return ""
-
- def OnItemExpanded(self, evt):
- print "OnItemExpanded: ", self.GetItemText(evt.GetItem())
-
- def OnItemCollapsed(self, evt):
- print "OnItemCollapsed:", self.GetItemText(evt.GetItem())
-
- def OnSelChanged(self, evt):
- print "OnSelChanged: ", self.GetItemText(evt.GetItem())
-
- def OnActivated(self, evt):
- print "OnActivated: ", self.GetItemText(evt.GetItem())
-
-
-app = wx.PySimpleApp(redirect=True)
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-15/tree_virtual.py b/wxPython/samples/wxPIA_book/Chapter-15/tree_virtual.py
deleted file mode 100644
index 795596b93f..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-15/tree_virtual.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import wx
-import data
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="virtual tree with icons", size=(400,500))
- il = wx.ImageList(16,16)
- self.fldridx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16,16)))
- self.fldropenidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, (16,16)))
- self.fileidx = il.Add(
- wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, (16,16)))
- self.tree = wx.TreeCtrl(self)
- self.tree.AssignImageList(il)
- root = self.tree.AddRoot("wx.Object")
- self.tree.SetItemImage(root, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(root, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
-
- # Instead of adding nodes for the whole tree, just attach some
- # data to the root node so that it can find and add its child
- # nodes when it is expanded, and mark it as having children so
- # it will be expandable.
- self.tree.SetItemPyData(root, data.tree)
- self.tree.SetItemHasChildren(root, True)
-
- # Bind some interesting events
- self.Bind(wx.EVT_TREE_ITEM_EXPANDED, self.OnItemExpanded, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed, self.tree)
- self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged, self.tree)
- self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivated, self.tree)
-
- self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.OnItemExpanding, self.tree)
- self.tree.Expand(root)
-
-
- def AddTreeNodes(self, parentItem):
- """
- Add nodes for just the children of the parentItem
- """
- items = self.tree.GetItemPyData(parentItem)
- for item in items:
- if type(item) == str:
- # a leaf node
- newItem = self.tree.AppendItem(parentItem, item)
- self.tree.SetItemImage(newItem, self.fileidx,
- wx.TreeItemIcon_Normal)
- else:
- # this item has children
- newItem = self.tree.AppendItem(parentItem, item[0])
- self.tree.SetItemImage(newItem, self.fldridx,
- wx.TreeItemIcon_Normal)
- self.tree.SetItemImage(newItem, self.fldropenidx,
- wx.TreeItemIcon_Expanded)
- self.tree.SetItemPyData(newItem, item[1])
- self.tree.SetItemHasChildren(newItem, True)
-
-
-
- def GetItemText(self, item):
- if item:
- return self.tree.GetItemText(item)
- else:
- return ""
-
- def OnItemExpanded(self, evt):
- print "OnItemExpanded: ", self.GetItemText(evt.GetItem())
-
- def OnItemExpanding(self, evt):
- # When the item is about to be expanded add the first level of child nodes
- print "OnItemExpanding:", self.GetItemText(evt.GetItem())
- self.AddTreeNodes(evt.GetItem())
-
- def OnItemCollapsed(self, evt):
- print "OnItemCollapsed:", self.GetItemText(evt.GetItem())
- # And remove them when collapsed as we don't need them any longer
- self.tree.DeleteChildren(evt.GetItem())
-
- def OnSelChanged(self, evt):
- print "OnSelChanged: ", self.GetItemText(evt.GetItem())
-
- def OnActivated(self, evt):
- print "OnActivated: ", self.GetItemText(evt.GetItem())
-
-
-app = wx.PySimpleApp(redirect=True)
-frame = TestFrame()
-frame.Show()
-app.MainLoop()
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/Index.hhk b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/Index.hhk
deleted file mode 100644
index 1835a2ddcb..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/Index.hhk
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhc b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhc
deleted file mode 100644
index f9dd604508..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhc
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhp b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhp
deleted file mode 100644
index 017ed2427c..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.hhp
+++ /dev/null
@@ -1,6 +0,0 @@
-[OPTIONS]
-Compatibility=1.1
-Contents file=another.hhc
-Display compile progress=No
-Title=Another book
-Default topic=another.htm
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.htm b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.htm
deleted file mode 100644
index 4532dc8c40..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/another.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Another book...
- Here's another book to demonstrate that
-
-
- You can also view the project file for this book.
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book1.htm b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book1.htm
deleted file mode 100644
index fa470e3ec5..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book1.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- Wanna know what a contents file looks like? Click here
- Book 1.
-How do you enjoy book one??
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book2.htm b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book2.htm
deleted file mode 100644
index 828723fc65..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/book2.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-Book 2.
-How do you enjoy book two??
-
-
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/main.htm b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/main.htm
deleted file mode 100644
index ca5275bfd7..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/main.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-This is main page.
-Book 1
-Book 2
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/page2-b.htm b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/page2-b.htm
deleted file mode 100644
index f51dd6d6d6..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/page2-b.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Hello, you're on sub page of page 2 !!!
-
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/testing.hhp b/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/testing.hhp
deleted file mode 100644
index 5f8eb34468..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/helpfiles/testing.hhp
+++ /dev/null
@@ -1,16 +0,0 @@
-[OPTIONS]
-Compatibility=1.1
-Compiled file=testing.chm
-Contents file=contents.hhc
-Display compile progress=No
-Index file=Index.hhk
-Language=0x405 Èesky
-Title=Test HELPFILE
-Default topic=main.htm
-
-[FILES]
-main.htm
-book1.htm
-book2.htm
-page2-b.htm
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/html_help.py b/wxPython/samples/wxPIA_book/Chapter-16/html_help.py
deleted file mode 100644
index ae212aa91d..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/html_help.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-wxPython can use html files for online help or other forms of
-documentation for your application. The help can be organized as a
-collection of books, and there is a help viewer available that enables
-the user to browse by book, via an index or full text search. The
-format of the contents and index files are similar to Microsoft
-HtmlHelp.
-"""
-
-import wx
-import wx.html
-
-class MyHtmlFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, -1, title)
- p = wx.Panel(self)
- b1 = wx.Button(p, -1, "Show Help Contents")
- b2 = wx.Button(p, -1, "Show Help Index")
- b3 = wx.Button(p, -1, "Show Specific Help")
- self.Bind(wx.EVT_BUTTON, self.OnShowHelpContents, b1)
- self.Bind(wx.EVT_BUTTON, self.OnShowHelpIndex, b2)
- self.Bind(wx.EVT_BUTTON, self.OnShowSpecificHelp, b3)
-
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add((10,10))
- sizer.Add(b1, 0, wx.ALL, 10)
- sizer.Add(b2, 0, wx.ALL, 10)
- sizer.Add(b3, 0, wx.ALL, 10)
- p.SetSizer(sizer)
-
- self.InitHelp()
-
-
- def InitHelp(self):
- def _addBook(filename):
- if not self.help.AddBook(filename):
- wx.MessageBox("Unable to open: " + filename,
- "Error", wx.OK|wx.ICON_EXCLAMATION)
-
- self.help = wx.html.HtmlHelpController()
-
- _addBook("helpfiles/testing.hhp")
- _addBook("helpfiles/another.hhp")
-
-
- def OnShowHelpContents(self, evt):
- self.help.DisplayContents()
-
- def OnShowHelpIndex(self, evt):
- self.help.DisplayIndex()
-
- def OnShowSpecificHelp(self, evt):
- self.help.Display("sub book")
-
-
-app = wx.PySimpleApp()
-frm = MyHtmlFrame(None, "HTML Help")
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/html_tag.py b/wxPython/samples/wxPIA_book/Chapter-16/html_tag.py
deleted file mode 100644
index 771bb2a3cb..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/html_tag.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import wx
-import wx.html
-
-page = """
-
-This silly example shows how custom tags can be defined and used in a
-wx.HtmlWindow. We've defined a new tag, <blue> that will change
-the
-
-
-
-"""
-
-
-class BlueTagHandler(wx.html.HtmlWinTagHandler):
- def __init__(self):
- wx.html.HtmlWinTagHandler.__init__(self)
-
- def GetSupportedTags(self):
- return "BLUE"
-
- def HandleTag(self, tag):
- old = self.GetParser().GetActualColor()
- clr = "#0000FF"
- if tag.HasParam("SHADE"):
- shade = tag.GetParam("SHADE")
- if shade.upper() == "SKY":
- clr = "#3299CC"
- if shade.upper() == "MIDNIGHT":
- clr = "#2F2F4F"
- elif shade.upper() == "DARK":
- clr = "#00008B"
- elif shade.upper == "NAVY":
- clr = "#23238E"
-
- self.GetParser().SetActualColor(clr)
- self.GetParser().GetContainer().InsertCell(wx.html.HtmlColourCell(clr))
-
- self.ParseInner(tag)
-
- self.GetParser().SetActualColor(old)
- self.GetParser().GetContainer().InsertCell(wx.html.HtmlColourCell(old))
-
- return True
-
-
-wx.html.HtmlWinParser_AddTagHandler(BlueTagHandler)
-
-
-
-class MyHtmlFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, -1, title)
- html = wx.html.HtmlWindow(self)
- if "gtk2" in wx.PlatformInfo:
- html.SetStandardFonts()
- html.SetPage(page)
-
-
-app = wx.PySimpleApp()
-frm = MyHtmlFrame(None, "Custom HTML Tag Handler")
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/html_window.py b/wxPython/samples/wxPIA_book/Chapter-16/html_window.py
deleted file mode 100644
index 9f73b68122..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/html_window.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import wx
-import wx.html
-
-class MyHtmlFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, -1, title)
- html = wx.html.HtmlWindow(self)
- if "gtk2" in wx.PlatformInfo:
- html.SetStandardFonts()
-
- html.SetPage(
- "Here is some formatted text "
- "loaded from a string.")
-
-
-app = wx.PySimpleApp()
-frm = MyHtmlFrame(None, "Simple HTML")
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/html_window_loadpage.py b/wxPython/samples/wxPIA_book/Chapter-16/html_window_loadpage.py
deleted file mode 100644
index 5789ce4e9b..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/html_window_loadpage.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import wx
-import wx.html
-
-class MyHtmlFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, -1, title, size=(600,400))
- html = wx.html.HtmlWindow(self)
- if "gtk2" in wx.PlatformInfo:
- html.SetStandardFonts()
-
- wx.CallAfter(
- html.LoadPage, "http://wxwidgets.org/manuals/2.6.2/wx_wxbutton.html")
-
-app = wx.PySimpleApp()
-frm = MyHtmlFrame(None, "Simple HTML Browser")
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-16/html_window_related.py b/wxPython/samples/wxPIA_book/Chapter-16/html_window_related.py
deleted file mode 100644
index 4887b71368..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-16/html_window_related.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import wx
-import wx.html
-
-class MyHtmlFrame(wx.Frame):
- def __init__(self, parent, title):
- wx.Frame.__init__(self, parent, -1, title, size=(600,400))
- self.CreateStatusBar()
-
- html = wx.html.HtmlWindow(self)
- if "gtk2" in wx.PlatformInfo:
- html.SetStandardFonts()
- html.SetRelatedFrame(self, self.GetTitle() + " -- %s")
- html.SetRelatedStatusBar(0)
-
- wx.CallAfter(
- html.LoadPage, "http://wxwidgets.org/manuals/2.6.2/wx_wxbutton.html")
-
-app = wx.PySimpleApp()
-frm = MyHtmlFrame(None, "Simple HTML Browser")
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-17/printing.py b/wxPython/samples/wxPIA_book/Chapter-17/printing.py
deleted file mode 100755
index a0481491be..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-17/printing.py
+++ /dev/null
@@ -1,236 +0,0 @@
-import wx
-import os
-
-FONTSIZE = 10
-
-class TextDocPrintout(wx.Printout):
- """
- A printout class that is able to print simple text documents.
- Does not handle page numbers or titles, and it assumes that no
- lines are longer than what will fit within the page width. Those
- features are left as an exercise for the reader. ;-)
- """
- def __init__(self, text, title, margins):
- wx.Printout.__init__(self, title)
- self.lines = text.split('\n')
- self.margins = margins
-
-
- def HasPage(self, page):
- return page <= self.numPages
-
- def GetPageInfo(self):
- return (1, self.numPages, 1, self.numPages)
-
-
- def CalculateScale(self, dc):
- # Scale the DC such that the printout is roughly the same as
- # the screen scaling.
- ppiPrinterX, ppiPrinterY = self.GetPPIPrinter()
- ppiScreenX, ppiScreenY = self.GetPPIScreen()
- logScale = float(ppiPrinterX)/float(ppiScreenX)
-
- # Now adjust if the real page size is reduced (such as when
- # drawing on a scaled wx.MemoryDC in the Print Preview.) If
- # page width == DC width then nothing changes, otherwise we
- # scale down for the DC.
- pw, ph = self.GetPageSizePixels()
- dw, dh = dc.GetSize()
- scale = logScale * float(dw)/float(pw)
-
- # Set the DC's scale.
- dc.SetUserScale(scale, scale)
-
- # Find the logical units per millimeter (for calculating the
- # margins)
- self.logUnitsMM = float(ppiPrinterX)/(logScale*25.4)
-
-
- def CalculateLayout(self, dc):
- # Determine the position of the margins and the
- # page/line height
- topLeft, bottomRight = self.margins
- dw, dh = dc.GetSize()
- self.x1 = topLeft.x * self.logUnitsMM
- self.y1 = topLeft.y * self.logUnitsMM
- self.x2 = dc.DeviceToLogicalXRel(dw) - bottomRight.x * self.logUnitsMM
- self.y2 = dc.DeviceToLogicalYRel(dh) - bottomRight.y * self.logUnitsMM
-
- # use a 1mm buffer around the inside of the box, and a few
- # pixels between each line
- self.pageHeight = self.y2 - self.y1 - 2*self.logUnitsMM
- font = wx.Font(FONTSIZE, wx.TELETYPE, wx.NORMAL, wx.NORMAL)
- dc.SetFont(font)
- self.lineHeight = dc.GetCharHeight()
- self.linesPerPage = int(self.pageHeight/self.lineHeight)
-
-
- def OnPreparePrinting(self):
- # calculate the number of pages
- dc = self.GetDC()
- self.CalculateScale(dc)
- self.CalculateLayout(dc)
- self.numPages = len(self.lines) / self.linesPerPage
- if len(self.lines) % self.linesPerPage != 0:
- self.numPages += 1
-
-
- def OnPrintPage(self, page):
- dc = self.GetDC()
- self.CalculateScale(dc)
- self.CalculateLayout(dc)
-
- # draw a page outline at the margin points
- dc.SetPen(wx.Pen("black", 0))
- dc.SetBrush(wx.TRANSPARENT_BRUSH)
- r = wx.RectPP((self.x1, self.y1),
- (self.x2, self.y2))
- dc.DrawRectangleRect(r)
- dc.SetClippingRect(r)
-
- # Draw the text lines for this page
- line = (page-1) * self.linesPerPage
- x = self.x1 + self.logUnitsMM
- y = self.y1 + self.logUnitsMM
- while line < (page * self.linesPerPage):
- dc.DrawText(self.lines[line], x, y)
- y += self.lineHeight
- line += 1
- if line >= len(self.lines):
- break
- return True
-
-
-class PrintFrameworkSample(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, size=(640, 480),
- title="Print Framework Sample")
- self.CreateStatusBar()
-
- # A text widget to display the doc and let it be edited
- self.tc = wx.TextCtrl(self, -1, "",
- style=wx.TE_MULTILINE|wx.TE_DONTWRAP)
- self.tc.SetFont(wx.Font(FONTSIZE, wx.TELETYPE, wx.NORMAL, wx.NORMAL))
- filename = os.path.join(os.path.dirname(__file__), "sample-text.txt")
- self.tc.SetValue(open(filename).read())
- self.tc.Bind(wx.EVT_SET_FOCUS, self.OnClearSelection)
- wx.CallAfter(self.tc.SetInsertionPoint, 0)
-
- # Create the menu and menubar
- menu = wx.Menu()
- item = menu.Append(-1, "Page Setup...\tF5",
- "Set up page margins and etc.")
- self.Bind(wx.EVT_MENU, self.OnPageSetup, item)
- item = menu.Append(-1, "Print Preview...\tF6",
- "View the printout on-screen")
- self.Bind(wx.EVT_MENU, self.OnPrintPreview, item)
- item = menu.Append(-1, "Print...\tF7", "Print the document")
- self.Bind(wx.EVT_MENU, self.OnPrint, item)
- menu.AppendSeparator()
-## item = menu.Append(-1, "Test other stuff...\tF9", "")
-## self.Bind(wx.EVT_MENU, self.OnPrintTest, item)
-## menu.AppendSeparator()
- item = menu.Append(wx.ID_EXIT, "E&xit\tCtrl-Q", "Close this application")
- self.Bind(wx.EVT_MENU, self.OnExit, item)
-
- menubar = wx.MenuBar()
- menubar.Append(menu, "&File")
- self.SetMenuBar(menubar)
-
- # initialize the print data and set some default values
- self.pdata = wx.PrintData()
- self.pdata.SetPaperId(wx.PAPER_LETTER)
- self.pdata.SetOrientation(wx.PORTRAIT)
- self.margins = (wx.Point(15,15), wx.Point(15,15))
-
-
- def OnExit(self, evt):
- self.Close()
-
-
- def OnClearSelection(self, evt):
- evt.Skip()
- wx.CallAfter(self.tc.SetInsertionPoint,
- self.tc.GetInsertionPoint())
-
-
- def OnPageSetup(self, evt):
- data = wx.PageSetupDialogData()
- data.SetPrintData(self.pdata)
-
- data.SetDefaultMinMargins(True)
- data.SetMarginTopLeft(self.margins[0])
- data.SetMarginBottomRight(self.margins[1])
-
- dlg = wx.PageSetupDialog(self, data)
- if dlg.ShowModal() == wx.ID_OK:
- data = dlg.GetPageSetupData()
- self.pdata = wx.PrintData(data.GetPrintData()) # force a copy
- self.pdata.SetPaperId(data.GetPaperId())
- self.margins = (data.GetMarginTopLeft(),
- data.GetMarginBottomRight())
- dlg.Destroy()
-
-
- def OnPrintPreview(self, evt):
- data = wx.PrintDialogData(self.pdata)
- text = self.tc.GetValue()
- printout1 = TextDocPrintout(text, "title", self.margins)
- printout2 = None #TextDocPrintout(text, "title", self.margins)
- preview = wx.PrintPreview(printout1, printout2, data)
- if not preview.Ok():
- wx.MessageBox("Unable to create PrintPreview!", "Error")
- else:
- # create the preview frame such that it overlays the app frame
- frame = wx.PreviewFrame(preview, self, "Print Preview",
- pos=self.GetPosition(),
- size=self.GetSize())
- frame.Initialize()
- frame.Show()
-
-
- def OnPrint(self, evt):
- data = wx.PrintDialogData(self.pdata)
- printer = wx.Printer(data)
- text = self.tc.GetValue()
- printout = TextDocPrintout(text, "title", self.margins)
- useSetupDialog = True
- if not printer.Print(self, printout, useSetupDialog) \
- and printer.GetLastError() == wx.PRINTER_ERROR:
- wx.MessageBox(
- "There was a problem printing.\n"
- "Perhaps your current printer is not set correctly?",
- "Printing Error", wx.OK)
- else:
- data = printer.GetPrintDialogData()
- self.pdata = wx.PrintData(data.GetPrintData()) # force a copy
- printout.Destroy()
-
-
- def OnPrintTest(self, evt):
- data = wx.PrintDialogData(self.pdata)
- dlg = wx.PrintDialog(self, data)
- if dlg.ShowModal() == wx.ID_OK:
- data = dlg.GetPrintDialogData()
- print
- print "GetFromPage:", data.GetFromPage()
- print "GetToPage:", data.GetToPage()
- print "GetMinPage:", data.GetMinPage()
- print "GetMaxPage:", data.GetMaxPage()
- print "GetNoCopies:", data.GetNoCopies()
- print "GetAllPages:", data.GetAllPages()
- print "GetSelection:", data.GetSelection()
- print "GetCollate:", data.GetCollate()
- print "GetPrintToFile:", data.GetPrintToFile()
-
- self.pdata = wx.PrintData(data.GetPrintData())
- print
- print "GetPrinterName:", self.pdata.GetPrinterName()
-
- dlg.Destroy()
-
-
-app = wx.PySimpleApp()
-frm = PrintFrameworkSample()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-17/sample-text.txt b/wxPython/samples/wxPIA_book/Chapter-17/sample-text.txt
deleted file mode 100755
index 8e902f3399..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-17/sample-text.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-THE BROTHERS GRIMM
-FAIRY TALES
-
-
-
-THE GOLDEN BIRD
-
-A certain king had a beautiful garden, and in the garden stood a tree
-which bore golden apples. These apples were always counted, and about
-the time when they began to grow ripe it was found that every night
-one of them was gone. The king became very angry at this, and ordered
-the gardener to keep watch all night under the tree. The gardener set
-his eldest son to watch; but about twelve o'clock he fell asleep, and
-in the morning another of the apples was missing. Then the second son
-was ordered to watch; and at midnight he too fell asleep, and in the
-morning another apple was gone. Then the third son offered to keep
-watch; but the gardener at first would not let him, for fear some harm
-should come to him: however, at last he consented, and the young man
-laid himself under the tree to watch. As the clock struck twelve he
-heard a rustling noise in the air, and a bird came flying that was of
-pure gold; and as it was snapping at one of the apples with its beak,
-the gardener's son jumped up and shot an arrow at it. But the arrow
-did the bird no harm; only it dropped a golden feather from its tail,
-and then flew away. The golden feather was brought to the king in the
-morning, and all the council was called together. Everyone agreed that
-it was worth more than all the wealth of the kingdom: but the king
-said, 'One feather is of no use to me, I must have the whole bird.'
-
-Then the gardener's eldest son set out and thought to find the golden
-bird very easily; and when he had gone but a little way, he came to a
-wood, and by the side of the wood he saw a fox sitting; so he took his
-bow and made ready to shoot at it. Then the fox said, 'Do not shoot
-me, for I will give you good counsel; I know what your business is,
-and that you want to find the golden bird. You will reach a village in
-the evening; and when you get there, you will see two inns opposite to
-each other, one of which is very pleasant and beautiful to look at: go
-not in there, but rest for the night in the other, though it may
-appear to you to be very poor and mean.' But the son thought to
-himself, 'What can such a beast as this know about the matter?' So he
-shot his arrow at the fox; but he missed it, and it set up its tail
-above its back and ran into the wood. Then he went his way, and in the
-evening came to the village where the two inns were; and in one of
-these were people singing, and dancing, and feasting; but the other
-looked very dirty, and poor. 'I should be very silly,' said he, 'if I
-went to that shabby house, and left this charming place'; so he went
-into the smart house, and ate and drank at his ease, and forgot the
-bird, and his country too.
-
-Time passed on; and as the eldest son did not come back, and no
-tidings were heard of him, the second son set out, and the same thing
-happened to him. He met the fox, who gave him the good advice: but
-when he came to the two inns, his eldest brother was standing at the
-window where the merrymaking was, and called to him to come in; and he
-could not withstand the temptation, but went in, and forgot the golden
-bird and his country in the same manner.
-
-Time passed on again, and the youngest son too wished to set out into
-the wide world to seek for the golden bird; but his father would not
-listen to it for a long while, for he was very fond of his son, and
-was afraid that some ill luck might happen to him also, and prevent
-his coming back. However, at last it was agreed he should go, for he
-would not rest at home; and as he came to the wood, he met the fox,
-and heard the same good counsel. But he was thankful to the fox, and
-did not attempt his life as his brothers had done; so the fox said,
-'Sit upon my tail, and you will travel faster.' So he sat down, and
-the fox began to run, and away they went over stock and stone so quick
-that their hair whistled in the wind.
-
-When they came to the village, the son followed the fox's counsel, and
-without looking about him went to the shabby inn and rested there all
-night at his ease. In the morning came the fox again and met him as he
-was beginning his journey, and said, 'Go straight forward, till you
-come to a castle, before which lie a whole troop of soldiers fast
-asleep and snoring: take no notice of them, but go into the castle and
-pass on and on till you come to a room, where the golden bird sits in
-a wooden cage; close by it stands a beautiful golden cage; but do not
-try to take the bird out of the shabby cage and put it into the
-handsome one, otherwise you will repent it.' Then the fox stretched
-out his tail again, and the young man sat himself down, and away they
-went over stock and stone till their hair whistled in the wind.
-
-Before the castle gate all was as the fox had said: so the son went in
-and found the chamber where the golden bird hung in a wooden cage, and
-below stood the golden cage, and the three golden apples that had been
-lost were lying close by it. Then thought he to himself, 'It will be a
-very droll thing to bring away such a fine bird in this shabby cage';
-so he opened the door and took hold of it and put it into the golden
-cage. But the bird set up such a loud scream that all the soldiers
-awoke, and they took him prisoner and carried him before the king. The
-next morning the court sat to judge him; and when all was heard, it
-sentenced him to die, unless he should bring the king the golden horse
-which could run as swiftly as the wind; and if he did this, he was to
-have the golden bird given him for his own.
-
-So he set out once more on his journey, sighing, and in great despair,
-when on a sudden his friend the fox met him, and said, 'You see now
-what has happened on account of your not listening to my counsel. I
-will still, however, tell you how to find the golden horse, if you
-will do as I bid you. You must go straight on till you come to the
-castle where the horse stands in his stall: by his side will lie the
-groom fast asleep and snoring: take away the horse quietly, but be
-sure to put the old leathern saddle upon him, and not the golden one
-that is close by it.' Then the son sat down on the fox's tail, and
-away they went over stock and stone till their hair whistled in the
-wind.
-
-All went right, and the groom lay snoring with his hand upon the
-golden saddle. But when the son looked at the horse, he thought it a
-great pity to put the leathern saddle upon it. 'I will give him the
-good one,' said he; 'I am sure he deserves it.' As he took up the
-golden saddle the groom awoke and cried out so loud, that all the
-guards ran in and took him prisoner, and in the morning he was again
-brought before the court to be judged, and was sentenced to die. But
-it was agreed, that, if he could bring thither the beautiful princess,
-he should live, and have the bird and the horse given him for his own.
-
-Then he went his way very sorrowful; but the old fox came and said,
-'Why did not you listen to me? If you had, you would have carried away
-both the bird and the horse; yet will I once more give you counsel. Go
-straight on, and in the evening you will arrive at a castle. At twelve
-o'clock at night the princess goes to the bathing-house: go up to her
-and give her a kiss, and she will let you lead her away; but take care
-you do not suffer her to go and take leave of her father and mother.'
-Then the fox stretched out his tail, and so away they went over stock
-and stone till their hair whistled again.
-
-As they came to the castle, all was as the fox had said, and at twelve
-o'clock the young man met the princes going to the bath and gave her
-the kiss, and she agreed to run away with him, but begged with many
-tears that he would let her take leave of her father. At first he
-refused, but she wept still more and more, and fell at his feet, till
-at last he consented; but the moment she came to her father's house
-the guards awoke and he was taken prisoner again.
-
-Then he was brought before the king, and the king said, 'You shall
-never have my daughter unless in eight days you dig away the hill that
-stops the view from my window.' Now this hill was so big that the
-whole world could not take it away: and when he had worked for seven
-days, and had done very little, the fox came and said. 'Lie down and
-go to sleep; I will work for you.' And in the morning he awoke and the
-hill was gone; so he went merrily to the king, and told him that now
-that it was removed he must give him the princess.
-
-Then the king was obliged to keep his word, and away went the young
-man and the princess; and the fox came and said to him, 'We will have
-all three, the princess, the horse, and the bird.' 'Ah!' said the
-young man, 'that would be a great thing, but how can you contrive it?'
-
-'If you will only listen,' said the fox, 'it can be done. When you
-come to the king, and he asks for the beautiful princess, you must
-say, "Here she is!" Then he will be very joyful; and you will mount
-the golden horse that they are to give you, and put out your hand to
-take leave of them; but shake hands with the princess last. Then lift
-her quickly on to the horse behind you; clap your spurs to his side,
-and gallop away as fast as you can.'
-
-All went right: then the fox said, 'When you come to the castle where
-the bird is, I will stay with the princess at the door, and you will
-ride in and speak to the king; and when he sees that it is the right
-horse, he will bring out the bird; but you must sit still, and say
-that you want to look at it, to see whether it is the true golden
-bird; and when you get it into your hand, ride away.'
-
-This, too, happened as the fox said; they carried off the bird, the
-princess mounted again, and they rode on to a great wood. Then the fox
-came, and said, 'Pray kill me, and cut off my head and my feet.' But
-the young man refused to do it: so the fox said, 'I will at any rate
-give you good counsel: beware of two things; ransom no one from the
-gallows, and sit down by the side of no river.' Then away he went.
-'Well,' thought the young man, 'it is no hard matter to keep that
-advice.'
-
-He rode on with the princess, till at last he came to the village
-where he had left his two brothers. And there he heard a great noise
-and uproar; and when he asked what was the matter, the people said,
-'Two men are going to be hanged.' As he came nearer, he saw that the
-two men were his brothers, who had turned robbers; so he said, 'Cannot
-they in any way be saved?' But the people said 'No,' unless he would
-bestow all his money upon the rascals and buy their liberty. Then he
-did not stay to think about the matter, but paid what was asked, and
-his brothers were given up, and went on with him towards their home.
-
-And as they came to the wood where the fox first met them, it was so
-cool and pleasant that the two brothers said, 'Let us sit down by the
-side of the river, and rest a while, to eat and drink.' So he said,
-'Yes,' and forgot the fox's counsel, and sat down on the side of the
-river; and while he suspected nothing, they came behind, and threw him
-down the bank, and took the princess, the horse, and the bird, and
-went home to the king their master, and said. 'All this have we won by
-our labour.' Then there was great rejoicing made; but the horse would
-not eat, the bird would not sing, and the princess wept.
-
-The youngest son fell to the bottom of the river's bed: luckily it was
-nearly dry, but his bones were almost broken, and the bank was so
-steep that he could find no way to get out. Then the old fox came once
-more, and scolded him for not following his advice; otherwise no evil
-would have befallen him: 'Yet,' said he, 'I cannot leave you here, so
-lay hold of my tail and hold fast.' Then he pulled him out of the
-river, and said to him, as he got upon the bank, 'Your brothers have
-set watch to kill you, if they find you in the kingdom.' So he dressed
-himself as a poor man, and came secretly to the king's court, and was
-scarcely within the doors when the horse began to eat, and the bird to
-sing, and princess left off weeping. Then he went to the king, and
-told him all his brothers' roguery; and they were seized and punished,
-and he had the princess given to him again; and after the king's death
-he was heir to his kingdom.
-
-A long while after, he went to walk one day in the wood, and the old
-fox met him, and besought him with tears in his eyes to kill him, and
-cut off his head and feet. And at last he did so, and in a moment the
-fox was changed into a man, and turned out to be the brother of the
-princess, who had been lost a great many many years.
-
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/clipboard.py b/wxPython/samples/wxPIA_book/Chapter-18/clipboard.py
deleted file mode 100644
index 3ddf43cfd9..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/clipboard.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import wx
-
-t1_text = """\
-The whole contents of this control
-will be placed in the system's
-clipboard when you click the copy
-button below.
-"""
-
-t2_text = """\
-If the clipboard contains a text
-data object then it will be placed
-in this control when you click
-the paste button below. Try
-copying to and pasting from
-other applications too!
-"""
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Clipboard",
- size=(500,300))
- p = wx.Panel(self)
-
- # create the controls
- self.t1 = wx.TextCtrl(p, -1, t1_text,
- style=wx.TE_MULTILINE|wx.HSCROLL)
- self.t2 = wx.TextCtrl(p, -1, t2_text,
- style=wx.TE_MULTILINE|wx.HSCROLL)
- copy = wx.Button(p, -1, "Copy")
- paste = wx.Button(p, -1, "Paste")
-
- # setup the layout with sizers
- fgs = wx.FlexGridSizer(2, 2, 5, 5)
- fgs.AddGrowableRow(0)
- fgs.AddGrowableCol(0)
- fgs.AddGrowableCol(1)
- fgs.Add(self.t1, 0, wx.EXPAND)
- fgs.Add(self.t2, 0, wx.EXPAND)
- fgs.Add(copy, 0, wx.EXPAND)
- fgs.Add(paste, 0, wx.EXPAND)
- border = wx.BoxSizer()
- border.Add(fgs, 1, wx.EXPAND|wx.ALL, 5)
- p.SetSizer(border)
-
- # Bind events
- self.Bind(wx.EVT_BUTTON, self.OnDoCopy, copy)
- self.Bind(wx.EVT_BUTTON, self.OnDoPaste, paste)
-
- def OnDoCopy(self, evt):
- data = wx.TextDataObject()
- data.SetText(self.t1.GetValue())
- if wx.TheClipboard.Open():
- wx.TheClipboard.SetData(data)
- wx.TheClipboard.Close()
- else:
- wx.MessageBox("Unable to open the clipboard", "Error")
-
- def OnDoPaste(self, evt):
- success = False
- data = wx.TextDataObject()
- if wx.TheClipboard.Open():
- success = wx.TheClipboard.GetData(data)
- wx.TheClipboard.Close()
-
- if success:
- self.t2.SetValue(data.GetText())
- else:
- wx.MessageBox(
- "There is no data in the clipboard in the required format",
- "Error")
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/customcomposite.py b/wxPython/samples/wxPIA_book/Chapter-18/customcomposite.py
deleted file mode 100644
index c396322c5a..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/customcomposite.py
+++ /dev/null
@@ -1,152 +0,0 @@
-"""
-This sample shows how to put multiple objects in the clipboard, one of
-which uses a custom data format. In this case we use a Python
-dictionary of values for our custom format, and we also put a textual
-representation of the dictionary. To test this, run two instances of
-this program, enter data in one and click the copy button. Then click
-the paste button in the other instance. Also paste into a text editor
-to see the data in the standard text format.
-"""
-
-
-import wx
-import cPickle
-import pprint
-
-class TestFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, -1, "Copy/Paste Test")
- panel = wx.Panel(self)
-
- # First create the controls
- topLbl = wx.StaticText(panel, -1, "Account Information")
- topLbl.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
-
- nameLbl = wx.StaticText(panel, -1, "Name:")
- self.name = wx.TextCtrl(panel, -1, "");
-
- addrLbl = wx.StaticText(panel, -1, "Address:")
- self.addr1 = wx.TextCtrl(panel, -1, "");
- self.addr2 = wx.TextCtrl(panel, -1, "");
-
- cstLbl = wx.StaticText(panel, -1, "City, State, Zip:")
- self.city = wx.TextCtrl(panel, -1, "", size=(150,-1));
- self.state = wx.TextCtrl(panel, -1, "", size=(50,-1));
- self.zip = wx.TextCtrl(panel, -1, "", size=(70,-1));
-
- phoneLbl = wx.StaticText(panel, -1, "Phone:")
- self.phone = wx.TextCtrl(panel, -1, "");
-
- emailLbl = wx.StaticText(panel, -1, "Email:")
- self.email = wx.TextCtrl(panel, -1, "");
-
- copyBtn = wx.Button(panel, -1, "Copy")
- pasteBtn = wx.Button(panel, -1, "Paste")
- self.Bind(wx.EVT_BUTTON, self.OnCopy, copyBtn)
- self.Bind(wx.EVT_BUTTON, self.OnPaste, pasteBtn)
-
- # Now do the layout.
-
- # mainSizer is the top-level one that manages everything
- mainSizer = wx.BoxSizer(wx.VERTICAL)
- mainSizer.Add(topLbl, 0, wx.ALL, 5)
- mainSizer.Add(wx.StaticLine(panel), 0,
- wx.EXPAND|wx.TOP|wx.BOTTOM, 5)
-
- # addrSizer is a grid that holds all of the address info
- addrSizer = wx.FlexGridSizer(cols=2, hgap=5, vgap=5)
- addrSizer.AddGrowableCol(1)
- addrSizer.Add(nameLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(self.name, 0, wx.EXPAND)
- addrSizer.Add(addrLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(self.addr1, 0, wx.EXPAND)
- addrSizer.Add((10,10)) # some empty space
- addrSizer.Add(self.addr2, 0, wx.EXPAND)
-
- addrSizer.Add(cstLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
-
- # the city, state, zip fields are in a sub-sizer
- cstSizer = wx.BoxSizer(wx.HORIZONTAL)
- cstSizer.Add(self.city, 1)
- cstSizer.Add(self.state, 0, wx.LEFT|wx.RIGHT, 5)
- cstSizer.Add(self.zip)
- addrSizer.Add(cstSizer, 0, wx.EXPAND)
-
- addrSizer.Add(phoneLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(self.phone, 0, wx.EXPAND)
- addrSizer.Add(emailLbl, 0,
- wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
- addrSizer.Add(self.email, 0, wx.EXPAND)
-
- # now add the addrSizer to the mainSizer
- mainSizer.Add(addrSizer, 0, wx.EXPAND|wx.ALL, 10)
-
- # The buttons sizer will put them in a row with resizeable
- # gaps between and on either side of the buttons
- btnSizer = wx.BoxSizer(wx.HORIZONTAL)
- btnSizer.Add((20,20), 1)
- btnSizer.Add(copyBtn)
- btnSizer.Add((20,20), 1)
- btnSizer.Add(pasteBtn)
- btnSizer.Add((20,20), 1)
-
- mainSizer.Add(btnSizer, 0, wx.EXPAND|wx.BOTTOM, 10)
-
- panel.SetSizer(mainSizer)
-
- # Fit the frame to the needs of the sizer. The frame will
- # automatically resize the panel as needed. Also prevent the
- # frame from getting smaller than this size.
- mainSizer.Fit(self)
- self.SetMinSize(self.GetSize())
-
-
- fieldNames = ["name", "addr1", "addr2",
- "city", "state", "zip", "phone", "email"]
-
- def OnCopy(self, evt):
- # make a dictionary of values
- fieldData = {}
- for name in self.fieldNames:
- tc = getattr(self, name)
- fieldData[name] = tc.GetValue()
-
- # pickle it and put in a custom data object
- cdo = wx.CustomDataObject("ContactDictFormat")
- cdo.SetData(cPickle.dumps(fieldData))
-
- # also make a text representaion
- tdo = wx.TextDataObject(pprint.pformat(fieldData))
-
- # and put them both in the clipboard
- dataobj = wx.DataObjectComposite()
- dataobj.Add(cdo)
- dataobj.Add(tdo)
- if wx.TheClipboard.Open():
- wx.TheClipboard.SetData(dataobj)
- wx.TheClipboard.Close()
-
-
- def OnPaste(self, evt):
- # Get the custom format object and put it into
- # the entry fields
- cdo = wx.CustomDataObject("ContactDictFormat")
- if wx.TheClipboard.Open():
- success = wx.TheClipboard.GetData(cdo)
- wx.TheClipboard.Close()
- if success:
- data = cdo.GetData()
- fieldData = cPickle.loads(data)
- for name in self.fieldNames:
- tc = getattr(self, name)
- tc.SetValue(fieldData[name])
-
-
-
-app = wx.PySimpleApp()
-TestFrame().Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/drop_source.py b/wxPython/samples/wxPIA_book/Chapter-18/drop_source.py
deleted file mode 100644
index d854947a69..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/drop_source.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import wx
-
-class DragController(wx.Control):
- """
- Just a little control to handle dragging the text from a text
- control. We use a separate control so as to not interfere with
- the native drag-select functionality of the native text control.
- """
- def __init__(self, parent, source, size=(25,25)):
- wx.Control.__init__(self, parent, -1, size=size,
- style=wx.SIMPLE_BORDER)
- self.source = source
- self.SetMinSize(size)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
- self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
-
- def OnPaint(self, evt):
- # draw a simple arrow
- dc = wx.BufferedPaintDC(self)
- dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
- dc.Clear()
- w, h = dc.GetSize()
- y = h/2
- dc.SetPen(wx.Pen("dark blue", 2))
- dc.DrawLine(w/8, y, w-w/8, y)
- dc.DrawLine(w-w/8, y, w/2, h/4)
- dc.DrawLine(w-w/8, y, w/2, 3*h/4)
-
- def OnLeftDown(self, evt):
- text = self.source.GetValue()
- data = wx.TextDataObject(text)
- dropSource = wx.DropSource(self)
- dropSource.SetData(data)
- result = dropSource.DoDragDrop(wx.Drag_AllowMove)
-
- # if the user wants to move the data then we should delete it
- # from the source
- if result == wx.DragMove:
- self.source.SetValue("")
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Drop Source")
- p = wx.Panel(self)
-
- # create the controls
- label1 = wx.StaticText(p, -1, "Put some text in this control:")
- label2 = wx.StaticText(p, -1,
- "Then drag from the neighboring bitmap and\n"
- "drop in an application that accepts dropped\n"
- "text, such as MS Word.")
- text = wx.TextCtrl(p, -1, "Some text")
- dragctl = DragController(p, text)
-
- # setup the layout with sizers
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(label1, 0, wx.ALL, 5)
- hrow = wx.BoxSizer(wx.HORIZONTAL)
- hrow.Add(text, 1, wx.RIGHT, 5)
- hrow.Add(dragctl, 0)
- sizer.Add(hrow, 0, wx.EXPAND|wx.ALL, 5)
- sizer.Add(label2, 0, wx.ALL, 5)
- p.SetSizer(sizer)
- sizer.Fit(self)
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/drop_target.py b/wxPython/samples/wxPIA_book/Chapter-18/drop_target.py
deleted file mode 100644
index bec7653449..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/drop_target.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import wx
-
-class MyFileDropTarget(wx.FileDropTarget):
- def __init__(self, window):
- wx.FileDropTarget.__init__(self)
- self.window = window
-
- def OnDropFiles(self, x, y, filenames):
- self.window.AppendText("\n%d file(s) dropped at (%d,%d):\n" %
- (len(filenames), x, y))
- for file in filenames:
- self.window.AppendText("\t%s\n" % file)
-
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Drop Target",
- size=(500,300))
- p = wx.Panel(self)
-
- # create the controls
- label = wx.StaticText(p, -1, "Drop some files here:")
- text = wx.TextCtrl(p, -1, "",
- style=wx.TE_MULTILINE|wx.HSCROLL)
-
- # setup the layout with sizers
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(label, 0, wx.ALL, 5)
- sizer.Add(text, 1, wx.EXPAND|wx.ALL, 5)
- p.SetSizer(sizer)
-
- # make the text control be a drop target
- dt = MyFileDropTarget(text)
- text.SetDropTarget(dt)
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/sound.py b/wxPython/samples/wxPIA_book/Chapter-18/sound.py
deleted file mode 100644
index 9242fc97ee..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/sound.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import wx
-from wx.lib.filebrowsebutton import FileBrowseButton
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="wx.Sound",
- size=(500,100))
- p = wx.Panel(self)
-
- # create the controls
- self.fbb = FileBrowseButton(p,
- labelText="Select WAV file:",
- fileMask="*.wav")
- btn = wx.Button(p, -1, "Play")
- self.Bind(wx.EVT_BUTTON, self.OnPlaySound, btn)
-
- # setup the layout with sizers
- sizer = wx.BoxSizer(wx.HORIZONTAL)
- sizer.Add(self.fbb, 1, wx.ALIGN_CENTER_VERTICAL)
- sizer.Add(btn, 0, wx.ALIGN_CENTER_VERTICAL)
- border = wx.BoxSizer(wx.VERTICAL)
- border.Add(sizer, 0, wx.EXPAND|wx.ALL, 15)
- p.SetSizer(border)
-
-
- def OnPlaySound(self, evt):
- filename = self.fbb.GetValue()
- self.sound = wx.Sound(filename)
- if self.sound.IsOk():
- self.sound.Play(wx.SOUND_ASYNC)
- else:
- wx.MessageBox("Invalid sound file", "Error")
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/sound1.wav b/wxPython/samples/wxPIA_book/Chapter-18/sound1.wav
deleted file mode 100644
index c8bdd59f2e..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-18/sound1.wav and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/sound2.wav b/wxPython/samples/wxPIA_book/Chapter-18/sound2.wav
deleted file mode 100644
index 4236138114..0000000000
Binary files a/wxPython/samples/wxPIA_book/Chapter-18/sound2.wav and /dev/null differ
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/timer.py b/wxPython/samples/wxPIA_book/Chapter-18/timer.py
deleted file mode 100644
index 879a40cba5..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/timer.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import wx
-import time
-
-class ClockWindow(wx.Window):
- def __init__(self, parent):
- wx.Window.__init__(self, parent)
- self.Bind(wx.EVT_PAINT, self.OnPaint)
- self.timer = wx.Timer(self)
- self.Bind(wx.EVT_TIMER, self.OnTimer, self.timer)
- self.timer.Start(1000)
-
- def Draw(self, dc):
- t = time.localtime(time.time())
- st = time.strftime("%I:%M:%S", t)
- w, h = self.GetClientSize()
- dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
- dc.Clear()
- dc.SetFont(wx.Font(30, wx.SWISS, wx.NORMAL, wx.NORMAL))
- tw, th = dc.GetTextExtent(st)
- dc.DrawText(st, (w-tw)/2, (h)/2 - th/2)
-
- def OnTimer(self, evt):
- dc = wx.BufferedDC(wx.ClientDC(self))
- self.Draw(dc)
-
- def OnPaint(self, evt):
- dc = wx.BufferedPaintDC(self)
- self.Draw(dc)
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="wx.Timer")
- ClockWindow(self)
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/worker_threads.py b/wxPython/samples/wxPIA_book/Chapter-18/worker_threads.py
deleted file mode 100644
index 0ae091c3d0..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/worker_threads.py
+++ /dev/null
@@ -1,101 +0,0 @@
-import wx
-import threading
-import random
-
-class WorkerThread(threading.Thread):
- """
- This just simulates some long-running task that periodically sends
- a message to the GUI thread.
- """
- def __init__(self, threadNum, window):
- threading.Thread.__init__(self)
- self.threadNum = threadNum
- self.window = window
- self.timeToQuit = threading.Event()
- self.timeToQuit.clear()
- self.messageCount = random.randint(10,20)
- self.messageDelay = 0.1 + 2.0 * random.random()
-
- def stop(self):
- self.timeToQuit.set()
-
- def run(self):
- msg = "Thread %d iterating %d times with a delay of %1.4f\n" \
- % (self.threadNum, self.messageCount, self.messageDelay)
- wx.CallAfter(self.window.LogMessage, msg)
-
- for i in range(1, self.messageCount+1):
- self.timeToQuit.wait(self.messageDelay)
- if self.timeToQuit.isSet():
- break
- msg = "Message %d from thread %d\n" % (i, self.threadNum)
- wx.CallAfter(self.window.LogMessage, msg)
- else:
- wx.CallAfter(self.window.ThreadFinished, self)
-
-
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Multi-threaded GUI")
- self.threads = []
- self.count = 0
-
- panel = wx.Panel(self)
- startBtn = wx.Button(panel, -1, "Start a thread")
- stopBtn = wx.Button(panel, -1, "Stop all threads")
- self.tc = wx.StaticText(panel, -1, "Worker Threads: 00")
- self.log = wx.TextCtrl(panel, -1, "",
- style=wx.TE_RICH|wx.TE_MULTILINE)
-
- inner = wx.BoxSizer(wx.HORIZONTAL)
- inner.Add(startBtn, 0, wx.RIGHT, 15)
- inner.Add(stopBtn, 0, wx.RIGHT, 15)
- inner.Add(self.tc, 0, wx.ALIGN_CENTER_VERTICAL)
- main = wx.BoxSizer(wx.VERTICAL)
- main.Add(inner, 0, wx.ALL, 5)
- main.Add(self.log, 1, wx.EXPAND|wx.ALL, 5)
- panel.SetSizer(main)
-
- self.Bind(wx.EVT_BUTTON, self.OnStartButton, startBtn)
- self.Bind(wx.EVT_BUTTON, self.OnStopButton, stopBtn)
- self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
-
- self.UpdateCount()
-
- def OnStartButton(self, evt):
- self.count += 1
- thread = WorkerThread(self.count, self)
- self.threads.append(thread)
- self.UpdateCount()
- thread.start()
-
- def OnStopButton(self, evt):
- self.StopThreads()
- self.UpdateCount()
-
- def OnCloseWindow(self, evt):
- self.StopThreads()
- self.Destroy()
-
- def StopThreads(self):
- while self.threads:
- thread = self.threads[0]
- thread.stop()
- self.threads.remove(thread)
-
- def UpdateCount(self):
- self.tc.SetLabel("Worker Threads: %d" % len(self.threads))
-
- def LogMessage(self, msg):
- self.log.AppendText(msg)
-
- def ThreadFinished(self, thread):
- self.threads.remove(thread)
- self.UpdateCount()
-
-
-app = wx.PySimpleApp()
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.py b/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.py
deleted file mode 100644
index 6dc1dcfb41..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-XRC is an XML-based resource format for wxPython. With it you can
-define the layout of widgets, and then load that XRC at runtime to
-create the layout. There are several GUI designers available that
-understand the XRC format, a simple one called XRCed comes with
-wxPython.
-"""
-
-import wx
-import wx.xrc
-
-
-class MyFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="XRC Sample",
- size=(400,225))
- res = wx.xrc.XmlResource("xrcsample.xrc")
- panel = res.LoadPanel(self, "ID_PANEL")
-
- self.Bind(wx.EVT_BUTTON, self.OnOk,
- wx.xrc.XRCCTRL(self, "ID_OK"))
- self.Bind(wx.EVT_BUTTON, self.OnCancel,
- wx.xrc.XRCCTRL(self, "ID_CANCEL"))
-
-
- def OnOk(self, evt):
- namectrl = wx.xrc.XRCCTRL(self, "ID_NAME")
- name = namectrl.GetValue()
- emailctrl = wx.xrc.XRCCTRL(self, "ID_EMAIL")
- email = emailctrl.GetValue()
- phonectrl = wx.xrc.XRCCTRL(self, "ID_PHONE")
- phone = phonectrl.GetValue()
- print "You entered:\n name: %s\n email: %s\n phone: %s\n" \
- % (name, email, phone)
-
- def OnCancel(self, evt):
- self.Close()
-
-
-app = wx.PySimpleApp(redirect=True)
-frm = MyFrame()
-frm.Show()
-app.MainLoop()
diff --git a/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.xrc b/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.xrc
deleted file mode 100644
index c1d211fba2..0000000000
--- a/wxPython/samples/wxPIA_book/Chapter-18/xrcsample.xrc
+++ /dev/null
@@ -1,94 +0,0 @@
-
-